summaryrefslogtreecommitdiff
path: root/tools/installer_ng/createstructure.bat
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-09-06 10:22:30 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-09-06 10:22:30 +0000
commit98a94b4933280f1d9cfe9e8b7c8d704d063c3741 (patch)
tree5a64040cc73f6685fe1fdd8c87cef92b64e90315 /tools/installer_ng/createstructure.bat
parent0562a8528e465d22b81fde700b63699f35fcf5a7 (diff)
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
Diffstat (limited to 'tools/installer_ng/createstructure.bat')
-rw-r--r--tools/installer_ng/createstructure.bat59
1 files changed, 23 insertions, 36 deletions
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