aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct path to NSIS on Win x64.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-02-16 20:55:52 +02:00
parent 69bb0f4d9b
commit 39c88a812e
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/make_install.bat
View File

@ -1,7 +1,12 @@
rem script helps create installer
rem Path to NSIS
set nsis_path="C:\Program Files\NSIS\makensisw.exe"
rem find target architecture
reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set ARCHITECTURE=32BIT || set ARCHITECTURE=64BIT
rem Path to NSIS according to architecture
if %ARCHITECTURE%==32BIT set nsis_path="C:\Program Files\NSIS\makensisw.exe"
if %ARCHITECTURE%==64BIT set nsis_path="C:\Program Files (x86)\NSIS\makensisw.exe"
if not exist %nsis_path% (
SET /P promt="Coudn't find NSIS. Do you want to continue?[Y\N]"
IF "%promt%" == "Y" GOTO PREPARE
@ -50,4 +55,4 @@ echo Failed to make the first run qmake!
exit /b 1
:ONEXIT
echo Done!
@pause
@pause

6
src/app/valentina/valentina.pro
View File

@ -431,7 +431,11 @@ win32:*-g++ {
package_printsupport.files += $$[QT_INSTALL_PLUGINS]/printsupport/windowsprintersupport.dll
INSTALLS += package_printsupport
NSIS_MAKENSISW = "C:/Program Files/NSIS/makensisw.exe"
contains(QT_ARCH, i386) {
NSIS_MAKENSISW = "C:/Program Files/NSIS/makensisw.exe"
} else {
NSIS_MAKENSISW = "C:/Program Files (x86)/NSIS/makensisw.exe"
}
exists($$NSIS_MAKENSISW) {
package_nsis.path = $${OUT_PWD}/../../../package