Installer: Reorganized

git-svn-id: http://svn.miranda-ng.org/main/trunk@5962 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 7 insertions, 3 deletions

diff --git a/tools/installer_ng/Tools/getuil.bat b/tools/installer_ng/Tools/getuil.bat
new file mode 100644
index 0000000000..fc6ee7382d
--- /dev/null
+++ b/tools/installer_ng/Tools/getuil.bat
@@ -0,0 +1,4 @@
+@echo off

+rem Download tools needed for compiling installer

+wget.exe -O ispack-unicode.exe http://www.jrsoftware.org/download.php/ispack-unicode.exe

+rem end
\ No newline at end of file
diff --git a/tools/installer_ng/cleanup.bat b/tools/installer_ng/cleanup.bat
index 4ae8ab619c..8c6e99253b 100644
--- a/tools/installer_ng/cleanup.bat
+++ b/tools/installer_ng/cleanup.bat
@@ -1,7 +1,7 @@
 @echo off

 rem Cleanup

 if exist tmp rd /S /Q tmp

-if exist util rd /S /Q util

 if exist InnoNG_32 rd /S /Q InnoNG_32

 if exist InnoNG_64 rd /S /Q InnoNG_64

+if exist Tools\ispack*.exe del /F /Q Tools\ispack*.exe

 rem end
\ No newline at end of file
diff --git a/tools/installer_ng/make.bat b/tools/installer_ng/make_all.bat
index df4dba4771..df4dba4771 100644
--- a/tools/installer_ng/make.bat
+++ b/tools/installer_ng/make_all.bat
diff --git a/tools/installer_ng/readme.txt b/tools/installer_ng/readme.txt
index 547ebdfbe1..14a31c5392 100644
--- a/tools/installer_ng/readme.txt
+++ b/tools/installer_ng/readme.txt
@@ -1,10 +1,10 @@
       How to compile Miranda NG installer:

 

-1. Run getutil.bat and it will download the needed tools to 'util' folder, install them or if you want to do it manually:

+1. Run Tools\getutil.bat and it will download the needed tools to 'Tools' folder, install them or if you want to do it manually:

    

    b. Download and install Inno Setup QuickStart Pack unicode from - http://www.jrsoftware.org/download.php/ispack-unicode.exe

 

-3. Run make.bat

+3. Run make_all.bat

 

 4. Collect the compiled installer files from Output folder