summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-09-03 07:52:56 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-09-03 07:52:56 +0000
commit31eac592209aa65e99141ab36f7f3ca1fb1d5641 (patch)
tree71f0f37300a0726d5041358cb89e736beb3645ac
parentdd1a7eb05b9997ba08bce9d08817a8ec56884ac4 (diff)
- more automated process
git-svn-id: http://svn.miranda-ng.org/main/trunk@5912 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--tools/installer_ng/cleanup.bat26
-rw-r--r--tools/installer_ng/getuil.bat12
-rw-r--r--tools/installer_ng/make.bat25
-rw-r--r--tools/installer_ng/readme.txt12
4 files changed, 47 insertions, 28 deletions
diff --git a/tools/installer_ng/cleanup.bat b/tools/installer_ng/cleanup.bat
new file mode 100644
index 0000000000..953c401ea6
--- /dev/null
+++ b/tools/installer_ng/cleanup.bat
@@ -0,0 +1,26 @@
+@echo off
+rem Cleanup
+rd /S /Q tmp
+rd /S /Q util
+del /F /S /Q vcredist*.exe
+
+pushd InnoNG_32\Files
+rd /S /Q Core
+rd /S /Q Icons
+rd /S /Q Plugins
+del /F /Q *.ini
+del /F /Q *.txt
+del /F /Q *.dll
+del /F /Q *.exe
+popd
+
+pushd InnoNG_64\Files
+rd /S /Q Core
+rd /S /Q Icons
+rd /S /Q Plugins
+del /F /Q *.ini
+del /F /Q *.txt
+del /F /Q *.dll
+del /F /Q *.exe
+popd
+rem end \ No newline at end of file
diff --git a/tools/installer_ng/getuil.bat b/tools/installer_ng/getuil.bat
new file mode 100644
index 0000000000..e2f4792ead
--- /dev/null
+++ b/tools/installer_ng/getuil.bat
@@ -0,0 +1,12 @@
+@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
+rem end \ No newline at end of file
diff --git a/tools/installer_ng/make.bat b/tools/installer_ng/make.bat
index cf401d7e12..4a0bb47ebe 100644
--- a/tools/installer_ng/make.bat
+++ b/tools/installer_ng/make.bat
@@ -45,29 +45,4 @@ if defined ProgramFiles(x86) (
"%ProgramFiles%\Inno Setup 5\Compil32.exe" /cc "InnoNG_32\MirandaNG.iss"
"%ProgramFiles%\Inno Setup 5\Compil32.exe" /cc "InnoNG_64\MirandaNG.iss"
)
-rem end
-
-rem Cleanup
-rd /S /Q tmp
-del /F /S /Q vcredist*.exe
-
-pushd InnoNG_32\Files
-rd /S /Q Core
-rd /S /Q Icons
-rd /S /Q Plugins
-del /F /Q *.ini
-del /F /Q *.txt
-del /F /Q *.dll
-del /F /Q *.exe
-popd
-
-pushd InnoNG_64\Files
-rd /S /Q Core
-rd /S /Q Icons
-rd /S /Q Plugins
-del /F /Q *.ini
-del /F /Q *.txt
-del /F /Q *.dll
-del /F /Q *.exe
-popd
rem end \ No newline at end of file
diff --git a/tools/installer_ng/readme.txt b/tools/installer_ng/readme.txt
index 13d0f891df..bcdda9b6a5 100644
--- a/tools/installer_ng/readme.txt
+++ b/tools/installer_ng/readme.txt
@@ -1,6 +1,12 @@
How to compile Miranda NG installer:
-1. Install 7-Zip from - http://www.7-zip.org/ (make sure that you are downloading x64 version if you have 64-bit Windows)
-2. Install Inno Setup QuickStart Pack unicode from - http://www.jrsoftware.org/isdl.php
+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
-4. Collect the compiled installer files from Output folder \ No newline at end of file
+
+4. Collect the compiled installer files from Output folder
+
+5. Run cleanup.bat if you want to delete all the temporary files \ No newline at end of file