diff options
| -rw-r--r-- | tools/installer_ng/MirandaNG.iss | 2 | ||||
| -rw-r--r-- | tools/installer_ng/make.bat | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/installer_ng/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss index 981d0af588..0af0e7886e 100644 --- a/tools/installer_ng/MirandaNG.iss +++ b/tools/installer_ng/MirandaNG.iss @@ -19,7 +19,7 @@ #endif
[Setup]
-AppVersion=0.94.5
+AppVersion={#AppVer}
AppName=Miranda NG
AppVerName=Miranda NG {#SetupSetting("AppVersion")}
AppPublisher=Miranda NG Team
diff --git a/tools/installer_ng/make.bat b/tools/installer_ng/make.bat index 23c12c3836..c025bb6f4e 100644 --- a/tools/installer_ng/make.bat +++ b/tools/installer_ng/make.bat @@ -1,4 +1,8 @@ @echo off
+rem Get version
+for /F "tokens=1,2,3 delims= " %%i in (..\..\build\build.no) do set MirVer=%%i.%%j.%%k
+rem end
+
rem Create directories and copy script
mkdir tmp
mkdir InnoNG_32
@@ -53,11 +57,11 @@ rem end rem Make
if defined ProgramFiles(x86) (
- "%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe" /Dptx86 /O"Output" "InnoNG_32\MirandaNG.iss"
- "%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe" /O"Output" "InnoNG_64\MirandaNG.iss"
+ "%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"
) else (
- "%ProgramFiles%\Inno Setup 5\ISCC.exe" /Dptx86 /O"Output" "InnoNG_32\MirandaNG.iss"
- "%ProgramFiles%\Inno Setup 5\ISCC.exe" /O"Output" "InnoNG_64\MirandaNG.iss"
+ "%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"
)
rem end
|