1 files changed, 4 insertions, 57 deletions
diff --git a/tools/installer_ng/make_all.bat b/tools/installer_ng/make_all.bat
index df4dba4771..b0008c5091 100644
--- a/tools/installer_ng/make_all.bat
+++ b/tools/installer_ng/make_all.bat
@@ -1,65 +1,12 @@
 @echo off
-set GetVer=for /F "tokens=1,2,3 delims= " %%i in (build.no) do set MirVer=%%i.%%j.%%k
-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"
-rem Get version
-if exist ..\..\build\build.no goto localgetver
-if not exist tmp mkdir tmp
-Tools\wget.exe -O tmp\build.no http://svn.miranda-ng.org/main/trunk/build/build.no
-pushd tmp
-%GetVer%
-popd
-goto esclocal
-:localgetver
-pushd ..\..\build
-%GetVer%
-popd
-:esclocal
-rem end
-
-rem Get archives if needed
-echo ------------------------------------------------------------------------------------
-echo ------------------------------------------------------------------------------------
-:again
-set /p answer=Do you want to create folder structure and download new components? (Y/N):
-if /i "%answer:~,1%" EQU "Y" goto download
-if /i "%answer:~,1%" EQU "N" goto chk32
-echo Please type Y for Yes or N for No
-goto again
-:chk32
-if not exist InnoNG_32 (goto error) else (goto chk64)
-:chk64
-if not exist InnoNG_64 (goto error) else (goto continue)
-:error
-echo Some of the components are missing, please run script again and agree to create folder structure and download new components!
-pause
-goto end
-:download
-echo Creating folders and downloading components!
+rem Get archives
 call createstructure.bat
-:continue
 rem end
 
 rem Make
-if defined ProgramFiles(x86) (
-	"%ProgramFiles(x86)%\%Compile32%
-	"%ProgramFiles(x86)%\%Compile64%
-) else (
-	"%ProgramFiles%\%Compile32%
-	"%ProgramFiles%\%Compile64%
-)
+call compile.bat
 rem end
 
-rem Cleanup
-echo ------------------------------------------------------------------------------------
-echo ------------------------------------------------------------------------------------
-:again1
-set /p ans=Do you wish to delete temp files and build folders? (Y/N):
-if /i "%ans:~,1%" EQU "Y" goto cleanup
-if /i "%ans:~,1%" EQU "N" goto end
-echo Please type Y for Yes or N for No
-goto again1
-:cleanup
-echo Running cleanup!
+rem Cleqnup
 call cleanup.bat
-:end
-\ No newline at end of file
+rem end
+\ No newline at end of file