diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-09-08 09:35:38 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-09-08 09:35:38 +0000 |
| commit | b6e7c9e209229907fcc4bac4ebb4def2fbe6054d (patch) | |
| tree | 1906b58ef05d9ecb06a2ed3fc54894ad0e9d57f9 /tools | |
| parent | 6ca4228beddb214bf7de4e26ce079977b0ca4bd9 (diff) | |
- Installer: GenerateInnoGuiCompatScript.bat optimization
git-svn-id: http://svn.miranda-ng.org/main/trunk@6016 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat b/tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat index 7659f5a892..995857e89a 100644 --- a/tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat +++ b/tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat @@ -20,30 +20,27 @@ rem end rem Create Inno setup compatible script that compiles without passing parameters to compiler
if %InnoX% == InnoNG_32 (
if exist MirandaNG32.iss del /F /Q MirandaNG32.iss
- ..\Tools\wget.exe -O utf-8_32.vbs http://miranda-ng.org/distr/installer/utf-8_32.vbs
..\Tools\wget.exe -O bom_remove.exe %BomRem%
..\Tools\wget.exe -O bom_add.exe %BomAdd%
bom_remove.exe MirandaNG.iss
- cscript utf-8_32.vbs
+ echo #define ptx86 > MirandaNG32.iss
echo #define AppVer "%MirVer%" >> MirandaNG32.iss
echo.>> MirandaNG32.iss
type MirandaNG.iss >> MirandaNG32.iss
+ bom_add.exe MirandaNG32.iss
bom_add.exe MirandaNG.iss
- del /f /q utf-8_32.vbs
del /f /q bom_remove.exe
del /f /q bom_add.exe
) else if %InnoX% == InnoNG_64 (
if exist MirandaNG64.iss del /F /Q MirandaNG64.iss
- ..\Tools\wget.exe -O utf-8_64.vbs http://miranda-ng.org/distr/installer/utf-8_64.vbs
..\Tools\wget.exe -O bom_remove.exe %BomRem%
..\Tools\wget.exe -O bom_add.exe %BomAdd%
bom_remove.exe MirandaNG.iss
- cscript utf-8_64.vbs
- echo #define AppVer "%MirVer%" >> MirandaNG64.iss
+ echo #define AppVer "%MirVer%" > MirandaNG64.iss
echo.>> MirandaNG64.iss
type MirandaNG.iss >> MirandaNG64.iss
+ bom_add.exe MirandaNG64.iss
bom_add.exe MirandaNG.iss
- del /f /q utf-8_64.vbs
del /f /q bom_remove.exe
del /f /q bom_add.exe
)
|