diff options
Diffstat (limited to 'tools/installer_ng/make.bat')
| -rw-r--r-- | tools/installer_ng/make.bat | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/tools/installer_ng/make.bat b/tools/installer_ng/make.bat index 071fd42d39..df4dba4771 100644 --- a/tools/installer_ng/make.bat +++ b/tools/installer_ng/make.bat @@ -1,12 +1,20 @@ @echo off
-if /i '%1' == 'y' set answer=y
-if /i '%2' == 'y' set ans=y
+set GetVer=for /F "tokens=1,2,3 delims= " %%i in (build.no) do set MirVer=%%i.%%j.%%k
+set Compile32=Inno Setup 5\ISCC.exe" /Dptx86 /DAppVer=%MirVer% /O"Output" "InnoNG_32\MirandaNG.iss"
+set Compile64=Inno Setup 5\ISCC.exe" /DAppVer=%MirVer% /O"Output" "InnoNG_64\MirandaNG.iss"
rem Get version
+if exist ..\..\build\build.no goto localgetver
if not exist tmp mkdir tmp
-wget -O tmp\build.no http://svn.miranda-ng.org/main/trunk/build/build.no
+Tools\wget.exe -O tmp\build.no http://svn.miranda-ng.org/main/trunk/build/build.no
pushd tmp
-for /F "tokens=1,2,3 delims= " %%i in (build.no) do set MirVer=%%i.%%j.%%k
+%GetVer%
popd
+goto esclocal
+:localgetver
+pushd ..\..\build
+%GetVer%
+popd
+:esclocal
rem end
rem Get archives if needed
@@ -34,11 +42,11 @@ rem end rem Make
if defined ProgramFiles(x86) (
- "%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"
+ "%ProgramFiles(x86)%\%Compile32%
+ "%ProgramFiles(x86)%\%Compile64%
) else (
- "%ProgramFiles%\Inno Setup 5\ISCC.exe" /Dptx86 /DAppVer=%MirVer% /O"Output" "InnoNG_32\MirandaNG.iss"
- "%ProgramFiles%\Inno Setup 5\ISCC.exe" /DAppVer=%MirVer% /O"Output" "InnoNG_64\MirandaNG.iss"
+ "%ProgramFiles%\%Compile32%
+ "%ProgramFiles%\%Compile64%
)
rem end
|