Installer: fully automatic, no need to install any tools

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

6 files changed, 10 insertions, 20 deletions

diff --git a/tools/installer_ng/Tools/7z.dll b/tools/installer_ng/Tools/7z.dll
new file mode 100644
index 0000000000..5152efb7b2
--- /dev/null
+++ b/tools/installer_ng/Tools/7z.dll
diff --git a/tools/installer_ng/Tools/getutil.bat b/tools/installer_ng/Tools/getutil.bat
deleted file mode 100644
index fc6ee7382d..0000000000
--- a/tools/installer_ng/Tools/getutil.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@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 8c6e99253b..e5017d1cb3 100644
--- a/tools/installer_ng/cleanup.bat
+++ b/tools/installer_ng/cleanup.bat
@@ -3,5 +3,5 @@ rem Cleanup
 if exist tmp rd /S /Q tmp

 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

+if exist Tools\InnoSetup5 rd /S /Q Tools\InnoSetup5

 rem end
\ No newline at end of file
diff --git a/tools/installer_ng/compile.bat b/tools/installer_ng/compile.bat
index 5570d018d8..d964d05f50 100644
--- a/tools/installer_ng/compile.bat
+++ b/tools/installer_ng/compile.bat
@@ -17,8 +17,8 @@ popd
 rem end

 

 rem Set compiler variables

-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"

+set Compile32=Tools\InnoSetup5\ISCC.exe /Dptx86 /DAppVer=%MirVer% /O"Output" "InnoNG_32\MirandaNG.iss"

+set Compile64=Tools\InnoSetup5\ISCC.exe /DAppVer=%MirVer% /O"Output" "InnoNG_64\MirandaNG.iss"

 rem end

 

 :check32

@@ -28,13 +28,8 @@ if not exist InnoNG_64 (goto compileerror) else (goto compile)
 

 rem Make

 :compile

-if defined ProgramFiles(x86) (

-	"%ProgramFiles(x86)%\%Compile32%

-	"%ProgramFiles(x86)%\%Compile64%

-) else (

-	"%ProgramFiles%\%Compile32%

-	"%ProgramFiles%\%Compile64%

-)

+%Compile32%

+%Compile64%

 rem end

 

 rem Error handling

diff --git a/tools/installer_ng/createstructure.bat b/tools/installer_ng/createstructure.bat
index 29419034db..96b7b53e53 100644
--- a/tools/installer_ng/createstructure.bat
+++ b/tools/installer_ng/createstructure.bat
@@ -10,6 +10,7 @@ xcopy Common\* InnoNG_64 /I /S /V /Y
 rem end

 

 rem Download

+Tools\wget.exe -O tmp\InnoSetup5.7z http://miranda-ng.org/distr/installer/InnoSetup5.7z

 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

@@ -26,6 +27,7 @@ Tools\wget.exe -O InnoNG_64\Installer\vcredist_x64.exe http://download.microsoft
 rem end

 

 rem Extract

+Tools\7z.exe x tmp\InnoSetup5.7z -y -oTools

 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

diff --git a/tools/installer_ng/readme.txt b/tools/installer_ng/readme.txt
index fa9cf2eacc..62dbf0e674 100644
--- a/tools/installer_ng/readme.txt
+++ b/tools/installer_ng/readme.txt
@@ -1,11 +1,8 @@
       How to compile Miranda NG installer:

 

-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_all.bat (will download, compile and cleanup all) or make_interactive.bat for user interactive mode

+1. Run make_all.bat (will download, compile and cleanup all) or make_interactive.bat for user interactive mode.

 

-4. Collect the compiled installer files from Output folder

+2. Collect the compiled installer files from Output folder.

 

-5. Optionally run cleanup.bat if you want to delete all the temporary files and build folders (if make_all.bat didn't do it for you already)
\ No newline at end of file
+3. Optionally run cleanup.bat if you want to delete all the temporary files and build folders (if make_all.bat didn't do it for you already).
\ No newline at end of file