From 889fb36e39181451133b35689de87769207ef4a4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 6 Sep 2018 11:35:31 +0300 Subject: merge with stable --- tools/build_scripts/z3_PackArchivesStable.bat | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/build_scripts/z3_PackArchivesStable.bat b/tools/build_scripts/z3_PackArchivesStable.bat index 4669d80f10..6124afbfa9 100644 --- a/tools/build_scripts/z3_PackArchivesStable.bat +++ b/tools/build_scripts/z3_PackArchivesStable.bat @@ -1,6 +1,14 @@ set tp=%1 -if "%tp%"=="" (echo "please specify target platform 32 or 64!"&&pause&&goto :EOF) -for /F "tokens=1,2,3,4 delims= " %%i in (build\build.no.stable) do set MirVer=%%i.%%j.%%k.%%l +if "%tp%"=="" (echo "please specify target platform 32 or 64!" && pause && goto :EOF) + +for /F "tokens=1,2,3,4 delims= " %%i in (build\build.no.stable) do ( + if "%%l" == "" ( + set MirVer=%%i.%%j.%%k + ) else ( + set MirVer=%%i.%%j.%%k.%%l + ) +) + if /i '%tp%' == '64' set bit=_x64 if /i '%tp%' == '32' set CompileString=..\Tools\InnoSetup5\ISCC.exe /Dptx86 /DAppVer=%MirVer% "MirandaNG.iss" if /i '%tp%' == '64' set CompileString=..\Tools\InnoSetup5\ISCC.exe /DAppVer=%MirVer% "MirandaNG.iss" -- cgit v1.2.3