diff options
| author | George Hazan <ghazan@miranda.im> | 2018-09-05 13:16:46 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-09-05 13:16:46 +0300 |
| commit | 484a6d3c8e5caacf5b3e292cfb36b403d0fcbc22 (patch) | |
| tree | 17f65fe535068fc5b609aef7383d1f05e0f491ea | |
| parent | 1f0cb379ea0d2c2373d3fd29532350551a42869f (diff) | |
separate setting for the NSIS path
| -rw-r--r-- | tools/build_scripts/a_SetVar32.bat.sample | 1 | ||||
| -rw-r--r-- | tools/build_scripts/a_SetVar64.bat.sample | 1 | ||||
| -rw-r--r-- | tools/build_scripts/z6_CompileInstallers.bat | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tools/build_scripts/a_SetVar32.bat.sample b/tools/build_scripts/a_SetVar32.bat.sample index 60def50208..68297c6586 100644 --- a/tools/build_scripts/a_SetVar32.bat.sample +++ b/tools/build_scripts/a_SetVar32.bat.sample @@ -12,4 +12,5 @@ set Errors=..\z_Errors.txt set NoErrors=..\z_No_Errors.txt set CompressIt=%SourceDir%\tools\7-zip\7z.exe set ZipIt=%SourceDir%\tools\7-zip\7z.exe a -r -tzip +set ISCC="%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe" set WinSCP=%SourceDir%\tools\WinSCP\WinSCP.com diff --git a/tools/build_scripts/a_SetVar64.bat.sample b/tools/build_scripts/a_SetVar64.bat.sample index f370a53054..25a6872c57 100644 --- a/tools/build_scripts/a_SetVar64.bat.sample +++ b/tools/build_scripts/a_SetVar64.bat.sample @@ -12,4 +12,5 @@ set Errors=..\z_Errors64.txt set NoErrors=..\z_No_Errors64.txt set CompressIt=%SourceDir%\tools\7-zip\7z.exe set ZipIt=%SourceDir%\tools\7-zip\7z.exe a -r -tzip +set ISCC="%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe" set WinSCP=%SourceDir%\tools\WinSCP\WinSCP.com diff --git a/tools/build_scripts/z6_CompileInstallers.bat b/tools/build_scripts/z6_CompileInstallers.bat index c474413af0..11263bf824 100644 --- a/tools/build_scripts/z6_CompileInstallers.bat +++ b/tools/build_scripts/z6_CompileInstallers.bat @@ -8,9 +8,9 @@ copy /V /Y ..\..\build\build.no tmp\build.no pushd tmp for /F "tokens=1,2,3 delims= " %%i in (build.no) do set MirVer=%%i.%%j.%%k popd -"%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe" /Dptx86 /DAppVer=%MirVer% /O"Output" "InnoNG_32\MirandaNG.iss" -"%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe" /DAppVer=%MirVer% /O"Output" "InnoNG_64\MirandaNG.iss" +%ISCC% /Dptx86 /DAppVer=%MirVer% /O"Output" "InnoNG_32\MirandaNG.iss" +%ISCC% /DAppVer=%MirVer% /O"Output" "InnoNG_64\MirandaNG.iss" call cleanup.bat copy /V /Y Output\miranda-ng-alpha-latest*.exe "%ArchDistr%\" rd /S /Q Output -popd
\ No newline at end of file +popd |