How many stable builds i could have released...

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

2 files changed, 29 insertions, 11 deletions

diff --git a/tools/installer_ng_stable/compile.bat b/tools/installer_ng_stable/compile.bat
index ff30bef414..abbec751a7 100644
--- a/tools/installer_ng_stable/compile.bat
+++ b/tools/installer_ng_stable/compile.bat
@@ -9,22 +9,38 @@ set Mirver=%ver1%.%ver2%
 popd

 rem end

 

-rem Download and extract compiler

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

-..\7-zip\7z.exe x tmp\InnoSetup5.7z -y -oTools

-rem end

-

 rem Set compiler variables

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

-set Compile64=Tools\InnoSetup5\ISCC.exe /DAppVer=%MirVer% "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

 

-rem Get archives if needed

-if not exist InnoNG_32 call createstructure.bat

-if not exist InnoNG_64 call createstructure.bat

-rem end

+:check32

+if not exist InnoNG_32 (goto compileerror) else (goto check64)

+:check64

+if not exist InnoNG_64 (goto compileerror) else (goto compile)

 

 rem Make

+:compile

 %Compile32%

 %Compile64%

+rem end

+

+rem Error handling

+if errorlevel 1 goto :compileerror

+goto end

+:compileerror

+rem Get archives if needed

+cls

+:again3

+set /p ans1=Something went wrong... Do you want to re-create folder structure and re-download components? (Y/N):

+if /i "%ans1:~,1%" EQU "Y" goto download

+if /i "%ans1:~,1%" EQU "N" goto end

+echo Please type Y for Yes or N for No

+goto again3

+:download

+echo Creating folders and downloading components!

+call createstructure.bat

+goto check32

+pause

+:end

 rem end
\ No newline at end of file
diff --git a/tools/installer_ng_stable/createstructure.bat b/tools/installer_ng_stable/createstructure.bat
index 5a012c0912..e8f34f66d0 100644
--- a/tools/installer_ng_stable/createstructure.bat
+++ b/tools/installer_ng_stable/createstructure.bat
@@ -22,6 +22,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\miranda-ng-v%MirVer%.7z http://miranda-ng.org/distr/stable/miranda-ng-v%MirVer%.7z

 Tools\wget.exe -O tmp\miranda-ng-v%MirVer%_x64.7z http://miranda-ng.org/distr/stable/miranda-ng-v%MirVer%_x64.7z

 Tools\wget.exe -O tmp\MNG_Sounds.7z http://miranda-ng.org/distr/addons/Sounds/MNG_Sounds.7z

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

 

 rem Extract

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

 ..\7-zip\7z.exe x tmp\miranda-ng-v%MirVer%.7z -y -oInnoNG_32\Files

 ..\7-zip\7z.exe x tmp\clist_blind_x32.zip -y -oInnoNG_32\Files

 ..\7-zip\7z.exe x tmp\scriver_x32.zip -y -oInnoNG_32\Files