diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-09-04 23:37:21 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-09-04 23:37:21 +0000 |
| commit | c748f7223837c86474715a0eef172b7498763b62 (patch) | |
| tree | a3fcd3af6fb48c42953aad4ae7402b3f082a6fc1 | |
| parent | 4a8e39ad31fa4057e0192e06b2362eeae3686f77 (diff) | |
- Installer: Get version from 'build.no'
git-svn-id: http://svn.miranda-ng.org/main/trunk@5949 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -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
|