From f38362d62bedfa8a34e07b9f63ffc7b117f98e33 Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Fri, 8 May 2015 11:53:46 -0400
Subject: [PATCH] windows: clean-up .pro files for automatic compilation and
packaging
Refs #70870
Change-Id: Ifa38ea9eb245df13c1b95b8e788181384e660f87
---
RingWinClient.pro | 57 +++++++++++++++++++++++++++++++++++++----------
ring.wxs | 8 +++----
2 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/RingWinClient.pro b/RingWinClient.pro
index 5d42735..b01996b 100644
--- a/RingWinClient.pro
+++ b/RingWinClient.pro
@@ -8,16 +8,21 @@ QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets svg
-VERSION = 0.1.0
+VERSION = 0.1.1
DEFINES += VERSION=\\\"$$VERSION\\\"
+BUILD=$${BUILD}
+
TARGET = RingClientWindows
TEMPLATE = app
QMAKE_CXXFLAGS += -std=c++11
-CONFIG += console
+contains(BUILD, Debug) {
+ QMAKE_STRIP = echo
+ CONFIG += console
+}
SOURCES += main.cpp\
mainwindow.cpp \
@@ -64,10 +69,9 @@ FORMS += mainwindow.ui \
win32: LIBS += -lole32 -luuid -lshlwapi
-INCLUDEPATH += /home/edric/Documents/CrossWorkspace/ring/binArch/include/libringclient
+INCLUDEPATH += $${RING}/include/libringclient
-win32: LIBS += -L/home/edric/Documents/CrossWorkspace/ring/binArch/lib/ -lringclient
-linux: LIBS += -L/usr/local/lib/ -lringclient
+LIBS += -L$${RING}/lib/ -lringclient
RESOURCES += \
ressources.qrc
@@ -79,13 +83,42 @@ DISTFILES += \
License.rtf \
ringtones/konga.ul
-RINGTONES.files = ringtones
-release:RINGTONES.path = $$OUT_PWD/release
+win32 {
+
+ RINGTONES.files = ringtones
+ RINGTONES.path = $$OUT_PWD/release
+
+ PACKAGING.files = ring.wxs
+ PACKAGING.path = $$OUT_PWD/release
+
+ LICENSE.files = License.rtf
+ LICENSE.path = $$OUT_PWD/release
+
+ RUNTIMEDIR=/usr/i686-w64-mingw32/bin/
+
+ RUNTIME.files = $${RING}/bin/libring.dll $${RING}/bin/libringclient.dll
+ RUNTIME.path = $$OUT_PWD/release
+
+ QTRUNTIME.files = $$RUNTIMEDIR/Qt5Core.dll $$RUNTIMEDIR/Qt5Widgets.dll \
+ $$RUNTIMEDIR/Qt5Gui.dll $$RUNTIMEDIR/Qt5Svg.dll
+ QTRUNTIME.path = $$OUT_PWD/release
+
+ QTDEPSRUNTIME.files = $$RUNTIMEDIR/zlib1.dll $$RUNTIMEDIR/iconv.dll \
+ $$RUNTIMEDIR/libfreetype-6.dll $$RUNTIMEDIR/libglib-2.0-0.dll \
+ $$RUNTIMEDIR/libharfbuzz-0.dll \
+ $$RUNTIMEDIR/libintl-8.dll $$RUNTIMEDIR/libpcre-1.dll \
+ $$RUNTIMEDIR/libpcre16-0.dll $$RUNTIMEDIR/libpng16-16.dll
+ QTDEPSRUNTIME.path = $$OUT_PWD/release
+
+ QTPLATFORMS.files = $$(QTDIR)/plugins/platforms/qwindows.dll
+ QTPLATFORMS.path = $$OUT_PWD/release/platforms
+
+ LIBSTD.files = $$RUNTIMEDIR/libgcc_s_sjlj-1.dll $$RUNTIMEDIR/libstdc++-6.dll \
+ $$RUNTIMEDIR/libwinpthread-1.dll
+ LIBSTD.path = $$OUT_PWD/release
-PACKAGING.files = ring.wxs
-release:PACKAGING.path = $$OUT_PWD/release
+ INSTALLS += RINGTONES PACKAGING LICENSE RUNTIME QTRUNTIME QTDEPSRUNTIME \
+ QTPLATFORMS LIBSTD
+}
-LICENSE.files = License.rtf
-release:LICENSE.path = $$OUT_PWD/release
-INSTALLS += RINGTONES PACKAGING LICENSE
diff --git a/ring.wxs b/ring.wxs
index 94d8793..764e6f4 100644
--- a/ring.wxs
+++ b/ring.wxs
@@ -1,14 +1,14 @@
<?xml version='1.0' encoding='windows-1252'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
- <Product Name='Ring 0.1.0' Id='9D33885D-6992-4A9B-82B5-7AC3834CF61E' UpgradeCode='E7C93227-949A-4F55-9058-509AA1126A3E'
- Language='1033' Codepage='1252' Version='0.1.0' Manufacturer='Savoir-Faire Linux'>
+ <Product Name='Ring' Id='9D33885D-6992-4A9B-82B5-7AC3834CF61E' UpgradeCode='E7C93227-949A-4F55-9058-509AA1126A3E'
+ Language='1033' Codepage='1252' Version='0.1.1' Manufacturer='Savoir-Faire Linux'>
- <Package Id='*' Keywords='Installer' Description="Ring 0.1.0 Installer"
+ <Package Id='*' Keywords='Installer' Description="Ring Installer"
Manufacturer='Savoir-Faire Linux'
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<Media Id='1' Cabinet='Ring.cab' EmbedCab='yes' DiskPrompt='USB' />
- <Property Id='DiskPrompt' Value="Ring 0.1.0 Installer" />
+ <Property Id='DiskPrompt' Value="Ring Installer" />
<Directory Id='TARGETDIR' Name='SourceDir'>
<Directory Id='ProgramFilesFolder' Name='PFiles'>
<Directory Id='SavoirFaireLinux' Name='Savoir-Faire Linux'>
--
GitLab