Add nsis support to the qmake script

u-235 · u-235 · commit 7e67cbf6f493 · 2024-05-30T21:55:59.000+03:00
diff --git a/common.pri b/common.pri
@@ -11,6 +11,8 @@ CONFIG(debug, debug|release) {
     DEFINES *= QT_NO_DEBUG_OUTPUT # QT_NO_INFO_OUTPUT
 }
 
+APP_BINS = $${PROJECT_ROOT_PATH}/bin/$${BUILD_FLAG}
+
 CONFIG *= c++11
 CONFIG -= debug_and_release debug_and_release_target
 
@@ -22,7 +24,7 @@ LANG_PATH = $${PROJECT_ROOT_PATH}/lang
 LANG_LIST = pl ca de fi cs_CZ es nl ru
 
 !CONFIG(staticlib) {
-    DESTDIR = $${PROJECT_ROOT_PATH}/bin/$${BUILD_FLAG}
+    DESTDIR = $$APP_BINS
 }
 
 !defined(PREFIX, var) {
diff --git a/gcodeworkshop_top.pro b/gcodeworkshop_top.pro
@@ -5,6 +5,7 @@ SUBDIRS = 3rdparty gcodeshared addons gcodeworkshop gcodefileserver
 
 
 include(common.pri)
+include(install/install.pri)
 
 QMAKE_EXTRA_TARGETS += lupdate
 lupdate.depends = lupdateGCodeWorkShop lupdateKdiff3
diff --git a/install/install.pri b/install/install.pri
@@ -0,0 +1,4 @@
+
+!defined(INSTALLER_DIR, var):INSTALLER_DIR = $$shadowed($${PROJECT_ROOT_PATH})
+
+win32:include(windows/windows.pri)
diff --git a/install/windows/windows.pri b/install/windows/windows.pri
@@ -0,0 +1,21 @@
+
+APP_ARCH = $$QMAKE_HOST.arch
+
+CXX_RUNTIME = $$system(where $$QMAKE_CXX)
+CXX_RUNTIME = $$first(CXX_RUNTIME)
+CXX_RUNTIME = $$dirname(CXX_RUNTIME)
+
+QMAKE_EXTRA_TARGETS += nsis
+
+mingw:NSIS_EXTRA_FILES = "$${PWD}/nsis/mingw.nsi"
+
+nsis.commands = makensis \
+    -DAPP_ARCH=$$APP_ARCH \
+    -DINSTALLER_FILE="$${INSTALLER_DIR}/GCodeWorkShop_$${APP_ARCH}_Setup.exe" \
+    -DPROJECT_ROOT="$$PROJECT_ROOT_PATH" \
+    -DAPP_BINS="$$APP_BINS" \
+    -DCXX_RUNTIME="$$CXX_RUNTIME" \
+    -DQT_HOST_BINS="$$[QT_HOST_BINS]" \
+    -DQT_HOST_DATA="$$[QT_HOST_DATA]" \
+    "$${PWD}/nsis/app.nsi" \
+    "$${NSIS_EXTRA_FILES}"

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ CONFIG(debug, debug\|release) {`
`11`	`11`	`DEFINES *= QT_NO_DEBUG_OUTPUT # QT_NO_INFO_OUTPUT`
`12`	`12`	`}`
`13`	`13`
	`14`	`+APP_BINS = $${PROJECT_ROOT_PATH}/bin/$${BUILD_FLAG}`
	`15`	`+`
`14`	`16`	`CONFIG *= c++11`
`15`	`17`	`CONFIG -= debug_and_release debug_and_release_target`
`16`	`18`
`@@ -22,7 +24,7 @@ LANG_PATH = $${PROJECT_ROOT_PATH}/lang`
`22`	`24`	`LANG_LIST = pl ca de fi cs_CZ es nl ru`
`23`	`25`
`24`	`26`	`!CONFIG(staticlib) {`
`25`		`- DESTDIR = $${PROJECT_ROOT_PATH}/bin/$${BUILD_FLAG}`
	`27`	`+ DESTDIR = $$APP_BINS`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`!defined(PREFIX, var) {`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +!defined(INSTALLER_DIR, var):INSTALLER_DIR = $$shadowed($${PROJECT_ROOT_PATH})
++
 +win32:include(windows/windows.pri)