From 98a94b4933280f1d9cfe9e8b7c8d704d063c3741 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 6 Sep 2013 10:22:30 +0000 Subject: Installer: Optimizations, 7z.exe added, created bath file for creating Inno setup compatible script that compiles without passing parameters to compiler git-svn-id: http://svn.miranda-ng.org/main/trunk@5961 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../Common/GenerateInnoGuiCompatScript.bat | 44 +++++++++++++++ tools/installer_ng/Tools/7z.exe | Bin 0 -> 168448 bytes tools/installer_ng/Tools/wget.exe | Bin 0 -> 401408 bytes tools/installer_ng/createstructure.bat | 59 ++++++++------------- tools/installer_ng/getuil.bat | 9 +--- tools/installer_ng/make.bat | 24 ++++++--- tools/installer_ng/readme.txt | 1 - tools/installer_ng/wget.exe | Bin 401408 -> 0 bytes 8 files changed, 84 insertions(+), 53 deletions(-) create mode 100644 tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat create mode 100644 tools/installer_ng/Tools/7z.exe create mode 100644 tools/installer_ng/Tools/wget.exe delete mode 100644 tools/installer_ng/wget.exe diff --git a/tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat b/tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat new file mode 100644 index 0000000000..dc97c96507 --- /dev/null +++ b/tools/installer_ng/Common/GenerateInnoGuiCompatScript.bat @@ -0,0 +1,44 @@ +@echo off +set GetVer=for /F "tokens=1,2,3 delims= " %%i in (build.no) do set MirVer=%%i.%%j.%%k +set BomRem=http://miranda-ng.org/distr/installer/bom_remove.exe +set BomAdd=http://miranda-ng.org/distr/installer/bom_add.exe +for %%* in (.) do set InnoX=%%~n* +rem Get version +..\Tools\wget.exe -O build.no http://svn.miranda-ng.org/main/trunk/build/build.no +%GetVer% +del /F /Q build.no +rem end + +rem Create Inno setup compatible script that compiles without passing parameters to compiler +if %InnoX% == InnoNG_32 ( + ..\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 AppVer "%MirVer%" >> MirandaNG32.iss + echo.>> MirandaNG32.iss + type MirandaNG.iss >> 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 ( + ..\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.>> MirandaNG64.iss + type MirandaNG.iss >> 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 +) +rem end + +rem Delete bat file +del "%~f0 +rem end \ No newline at end of file diff --git a/tools/installer_ng/Tools/7z.exe b/tools/installer_ng/Tools/7z.exe new file mode 100644 index 0000000000..19fb44541b Binary files /dev/null and b/tools/installer_ng/Tools/7z.exe differ diff --git a/tools/installer_ng/Tools/wget.exe b/tools/installer_ng/Tools/wget.exe new file mode 100644 index 0000000000..f2a11c17dd Binary files /dev/null and b/tools/installer_ng/Tools/wget.exe differ diff --git a/tools/installer_ng/createstructure.bat b/tools/installer_ng/createstructure.bat index 8d979fb9d9..29419034db 100644 --- a/tools/installer_ng/createstructure.bat +++ b/tools/installer_ng/createstructure.bat @@ -10,43 +10,30 @@ xcopy Common\* InnoNG_64 /I /S /V /Y rem end rem Download -wget -O tmp\MNG_Sounds.7z http://miranda-ng.org/distr/addons/Sounds/MNG_Sounds.7z -wget -O tmp\miranda-ng-alpha-latest.7z http://miranda-ng.org/distr/miranda-ng-alpha-latest.7z -wget -O tmp\miranda-ng-alpha-latest_x64.7z http://miranda-ng.org/distr/miranda-ng-alpha-latest_x64.7z -wget -O tmp\clist_blind_x32.zip http://miranda-ng.org/x32/Plugins/clist_blind.zip -wget -O tmp\clist_blind_x64.zip http://miranda-ng.org/x64/Plugins/clist_blind.zip -wget -O tmp\scriver_x32.zip http://miranda-ng.org/x32/Plugins/scriver.zip -wget -O tmp\scriver_x64.zip http://miranda-ng.org/x64/Plugins/scriver.zip -wget -O tmp\langpack_czech.zip http://miranda-ng.org/x32/langpack_czech.zip -wget -O tmp\langpack_german.zip http://miranda-ng.org/x32/langpack_german.zip -wget -O tmp\langpack_polish.zip http://miranda-ng.org/x32/langpack_polish.zip -wget -O tmp\langpack_russian.zip http://miranda-ng.org/x32/langpack_russian.zip -wget -O InnoNG_32\Installer\vcredist_x86.exe http://download.microsoft.com/download/C/6/D/C6D0FD4E-9E53-4897-9B91-836EBA2AACD3/vcredist_x86.exe -wget -O InnoNG_64\Installer\vcredist_x64.exe http://download.microsoft.com/download/A/8/0/A80747C3-41BD-45DF-B505-E9710D2744E0/vcredist_x64.exe +Tools\wget.exe -O tmp\MNG_Sounds.7z http://miranda-ng.org/distr/addons/Sounds/MNG_Sounds.7z +Tools\wget.exe -O tmp\miranda-ng-alpha-latest.7z http://miranda-ng.org/distr/miranda-ng-alpha-latest.7z +Tools\wget.exe -O tmp\miranda-ng-alpha-latest_x64.7z http://miranda-ng.org/distr/miranda-ng-alpha-latest_x64.7z +Tools\wget.exe -O tmp\clist_blind_x32.zip http://miranda-ng.org/x32/Plugins/clist_blind.zip +Tools\wget.exe -O tmp\clist_blind_x64.zip http://miranda-ng.org/x64/Plugins/clist_blind.zip +Tools\wget.exe -O tmp\scriver_x32.zip http://miranda-ng.org/x32/Plugins/scriver.zip +Tools\wget.exe -O tmp\scriver_x64.zip http://miranda-ng.org/x64/Plugins/scriver.zip +Tools\wget.exe -O tmp\langpack_czech.zip http://miranda-ng.org/x32/langpack_czech.zip +Tools\wget.exe -O tmp\langpack_german.zip http://miranda-ng.org/x32/langpack_german.zip +Tools\wget.exe -O tmp\langpack_polish.zip http://miranda-ng.org/x32/langpack_polish.zip +Tools\wget.exe -O tmp\langpack_russian.zip http://miranda-ng.org/x32/langpack_russian.zip +Tools\wget.exe -O InnoNG_32\Installer\vcredist_x86.exe http://download.microsoft.com/download/C/6/D/C6D0FD4E-9E53-4897-9B91-836EBA2AACD3/vcredist_x86.exe +Tools\wget.exe -O InnoNG_64\Installer\vcredist_x64.exe http://download.microsoft.com/download/A/8/0/A80747C3-41BD-45DF-B505-E9710D2744E0/vcredist_x64.exe rem end rem Extract -if defined ProgramFiles(x86) ( - "%ProgramW6432%\7-zip\7z.exe" x tmp\miranda-ng-alpha-latest.7z -y -oInnoNG_32\Files - "%ProgramW6432%\7-zip\7z.exe" x tmp\clist_blind_x32.zip -y -oInnoNG_32\Files - "%ProgramW6432%\7-zip\7z.exe" x tmp\scriver_x32.zip -y -oInnoNG_32\Files - "%ProgramW6432%\7-zip\7z.exe" x tmp\miranda-ng-alpha-latest_x64.7z -y -oInnoNG_64\Files - "%ProgramW6432%\7-zip\7z.exe" x tmp\clist_blind_x64.zip -y -oInnoNG_64\Files - "%ProgramW6432%\7-zip\7z.exe" x tmp\scriver_x64.zip -y -oInnoNG_64\Files - "%ProgramW6432%\7-zip\7z.exe" x tmp\MNG_Sounds.7z -y -oInnoNG_32\Files - "%ProgramW6432%\7-zip\7z.exe" x tmp\MNG_Sounds.7z -y -oInnoNG_64\Files - "%ProgramW6432%\7-zip\7z.exe" x tmp\lang*.zip -y -oInnoNG_32\Files - "%ProgramW6432%\7-zip\7z.exe" x tmp\lang*.zip -y -oInnoNG_64\Files -) else ( - "%ProgramFiles%\7-zip\7z.exe" x tmp\miranda-ng-alpha-latest.7z -y -oInnoNG_32\Files - "%ProgramFiles%\7-zip\7z.exe" x tmp\clist_blind_x32.zip -y -oInnoNG_32\Files - "%ProgramFiles%\7-zip\7z.exe" x tmp\scriver_x32.zip -y -oInnoNG_32\Files - "%ProgramFiles%\7-zip\7z.exe" x tmp\miranda-ng-alpha-latest_x64.7z -y -oInnoNG_64\Files - "%ProgramFiles%\7-zip\7z.exe" x tmp\clist_blind_x64.zip -y -oInnoNG_64\Files - "%ProgramFiles%\7-zip\7z.exe" x tmp\scriver_x64.zip -y -oInnoNG_64\Files - "%ProgramFiles%\7-zip\7z.exe" x tmp\MNG_Sounds.7z -y -oInnoNG_32\Files - "%ProgramFiles%\7-zip\7z.exe" x tmp\MNG_Sounds.7z -y -oInnoNG_64\Files - "%ProgramFiles%\7-zip\7z.exe" x tmp\lang*.zip -y -oInnoNG_32\Files - "%ProgramFiles%\7-zip\7z.exe" x tmp\lang*.zip -y -oInnoNG_64\Files -) +Tools\7z.exe x tmp\miranda-ng-alpha-latest.7z -y -oInnoNG_32\Files +Tools\7z.exe x tmp\clist_blind_x32.zip -y -oInnoNG_32\Files +Tools\7z.exe x tmp\scriver_x32.zip -y -oInnoNG_32\Files +Tools\7z.exe x tmp\miranda-ng-alpha-latest_x64.7z -y -oInnoNG_64\Files +Tools\7z.exe x tmp\clist_blind_x64.zip -y -oInnoNG_64\Files +Tools\7z.exe x tmp\scriver_x64.zip -y -oInnoNG_64\Files +Tools\7z.exe x tmp\MNG_Sounds.7z -y -oInnoNG_32\Files +Tools\7z.exe x tmp\MNG_Sounds.7z -y -oInnoNG_64\Files +Tools\7z.exe x tmp\lang*.zip -y -oInnoNG_32\Files +Tools\7z.exe x tmp\lang*.zip -y -oInnoNG_64\Files rem end \ No newline at end of file diff --git a/tools/installer_ng/getuil.bat b/tools/installer_ng/getuil.bat index e2f4792ead..87183449ed 100644 --- a/tools/installer_ng/getuil.bat +++ b/tools/installer_ng/getuil.bat @@ -1,12 +1,5 @@ @echo off rem Download tools needed for compiling installer mkdir util - -if defined ProgramFiles(x86) ( - wget -O util\7z920-x64.msi http://downloads.sourceforge.net/sevenzip/7z920-x64.msi -) else ( - wget -O util\7z920.msi http://downloads.sourceforge.net/sevenzip/7z920.msi -) - -wget -P util http://www.jrsoftware.org/download.php/ispack-unicode.exe +Tools\wget.exe -P util http://www.jrsoftware.org/download.php/ispack-unicode.exe rem end \ No newline at end of file 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 diff --git a/tools/installer_ng/readme.txt b/tools/installer_ng/readme.txt index 6bf3312f1f..547ebdfbe1 100644 --- a/tools/installer_ng/readme.txt +++ b/tools/installer_ng/readme.txt @@ -2,7 +2,6 @@ 1. Run getutil.bat and it will download the needed tools to 'util' folder, install them or if you want to do it manually: - a. Download and install 7-Zip from - http://www.7-zip.org/ (make sure that you are downloading x64 version if you have 64-bit Windows) b. Download and install Inno Setup QuickStart Pack unicode from - http://www.jrsoftware.org/download.php/ispack-unicode.exe 3. Run make.bat diff --git a/tools/installer_ng/wget.exe b/tools/installer_ng/wget.exe deleted file mode 100644 index f2a11c17dd..0000000000 Binary files a/tools/installer_ng/wget.exe and /dev/null differ -- cgit v1.2.3