make_install.bat changed way to detect target architecture.
--HG-- branch : develop
This commit is contained in:
parent
21585bf773
commit
ac52e54221
|
@ -1,17 +1,7 @@
|
||||||
rem script helps create installer
|
rem script helps create installer
|
||||||
|
|
||||||
rem detect windows version
|
|
||||||
ver | find "6.1" > nul
|
|
||||||
|
|
||||||
IF ERRORLEVEL = 1 GOTO ARCHITECTURE
|
|
||||||
IF ERRORLEVEL = 0 GOTO WIN7
|
|
||||||
|
|
||||||
:WIN7
|
|
||||||
chcp 65001
|
|
||||||
|
|
||||||
:ARCHITECTURE
|
|
||||||
rem find target architecture
|
rem find target architecture
|
||||||
reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set ARCHITECTURE=32BIT || set ARCHITECTURE=64BIT
|
IF "%PROCESSOR_ARCHITECTURE%"=="x86" (set ARCHITECTURE=32BIT) else (ARCHITECTURE=64BIT)
|
||||||
|
|
||||||
rem Path to Inno Setup according to architecture
|
rem Path to Inno Setup according to architecture
|
||||||
if %ARCHITECTURE%==32BIT set nsis_path="C:/Program Files/Inno Setup 5/iscc.exe"
|
if %ARCHITECTURE%==32BIT set nsis_path="C:/Program Files/Inno Setup 5/iscc.exe"
|
||||||
|
@ -20,11 +10,21 @@ if %ARCHITECTURE%==64BIT set nsis_path="C:/Program Files (x86)/Inno Setup 5/iscc
|
||||||
if not exist %nsis_path% (
|
if not exist %nsis_path% (
|
||||||
SET package_error="Package was not created!"
|
SET package_error="Package was not created!"
|
||||||
SET /P promt="Coudn't find Inno Setup. Do you want to continue?[Y\N]"
|
SET /P promt="Coudn't find Inno Setup. Do you want to continue?[Y\N]"
|
||||||
IF "%promt%" == "Y" GOTO PREPARE
|
IF "%promt%" == "Y" GOTO CONTINUE
|
||||||
IF "%promt%" == "y" GOTO PREPARE
|
IF "%promt%" == "y" GOTO CONTINUE
|
||||||
ELSE GOTO ONEXIT
|
ELSE GOTO ONEXIT
|
||||||
)
|
)
|
||||||
|
|
||||||
|
:CONTINUE
|
||||||
|
rem detect windows version
|
||||||
|
ver | find "6.1" > nul
|
||||||
|
|
||||||
|
IF ERRORLEVEL = 1 GOTO PREPARE
|
||||||
|
IF ERRORLEVEL = 0 GOTO WIN7
|
||||||
|
|
||||||
|
:WIN7
|
||||||
|
chcp 65001
|
||||||
|
|
||||||
:PREPARE
|
:PREPARE
|
||||||
cd ..
|
cd ..
|
||||||
cd
|
cd
|
||||||
|
@ -77,3 +77,4 @@ exit /b 1
|
||||||
echo Done! %package_error%
|
echo Done! %package_error%
|
||||||
@pause
|
@pause
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user