From b88b795c0b8f08a4530726cbcea2994782d064d4 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 6 Sep 2013 11:08:47 +0000 Subject: Installer: make_all.bat for fully automatic compilation, make_interactive.bat for interactive mode git-svn-id: http://svn.miranda-ng.org/main/trunk@5963 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- tools/installer_ng/Tools/getuil.bat | 4 --- tools/installer_ng/Tools/getutil.bat | 4 +++ tools/installer_ng/compile.bat | 28 +++++++++++++++ tools/installer_ng/getuil.bat | 5 --- tools/installer_ng/make_all.bat | 61 +++------------------------------ tools/installer_ng/make_interactive.bat | 53 ++++++++++++++++++++++++++++ tools/installer_ng/readme.txt | 4 +-- 7 files changed, 91 insertions(+), 68 deletions(-) delete mode 100644 tools/installer_ng/Tools/getuil.bat create mode 100644 tools/installer_ng/Tools/getutil.bat create mode 100644 tools/installer_ng/compile.bat delete mode 100644 tools/installer_ng/getuil.bat create mode 100644 tools/installer_ng/make_interactive.bat (limited to 'tools') diff --git a/tools/installer_ng/Tools/getuil.bat b/tools/installer_ng/Tools/getuil.bat deleted file mode 100644 index fc6ee7382d..0000000000 --- a/tools/installer_ng/Tools/getuil.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/Tools/getutil.bat b/tools/installer_ng/Tools/getutil.bat new file mode 100644 index 0000000000..fc6ee7382d --- /dev/null +++ b/tools/installer_ng/Tools/getutil.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/compile.bat b/tools/installer_ng/compile.bat new file mode 100644 index 0000000000..c578496d53 --- /dev/null +++ b/tools/installer_ng/compile.bat @@ -0,0 +1,28 @@ +@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 Make +if defined ProgramFiles(x86) ( + "%ProgramFiles(x86)%\%Compile32% + "%ProgramFiles(x86)%\%Compile64% +) else ( + "%ProgramFiles%\%Compile32% + "%ProgramFiles%\%Compile64% +) +rem end \ No newline at end of file diff --git a/tools/installer_ng/getuil.bat b/tools/installer_ng/getuil.bat deleted file mode 100644 index 87183449ed..0000000000 --- a/tools/installer_ng/getuil.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -rem Download tools needed for compiling installer -mkdir util -Tools\wget.exe -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_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 diff --git a/tools/installer_ng/make_interactive.bat b/tools/installer_ng/make_interactive.bat new file mode 100644 index 0000000000..aac851c113 --- /dev/null +++ b/tools/installer_ng/make_interactive.bat @@ -0,0 +1,53 @@ +@echo off +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! +call createstructure.bat +:continue +rem end + +rem Make +echo ------------------------------------------------------------------------------------ +echo ------------------------------------------------------------------------------------ +:again1 +set /p answ=Do you want to compile the installers now? (Y/N): +if /i "%answ:~,1%" EQU "Y" goto compile +if /i "%answ:~,1%" EQU "N" goto moveahead +echo Please type Y for Yes or N for No +goto again1 +:compile +echo Compiling! +call compile.bat +:moveahead +rem end + +rem Cleanup +echo ------------------------------------------------------------------------------------ +echo ------------------------------------------------------------------------------------ +:again2 +set /p ans=Do you want 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 again2 +:cleanup +echo Running cleanup! +call cleanup.bat +:end +rem end \ No newline at end of file diff --git a/tools/installer_ng/readme.txt b/tools/installer_ng/readme.txt index 14a31c5392..fa9cf2eacc 100644 --- a/tools/installer_ng/readme.txt +++ b/tools/installer_ng/readme.txt @@ -4,8 +4,8 @@ b. Download and install Inno Setup QuickStart Pack unicode from - http://www.jrsoftware.org/download.php/ispack-unicode.exe -3. Run make_all.bat +3. 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 -5. Optionally run cleanup.bat if you want to delete all the temporary files and build folders \ No newline at end of file +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 -- cgit v1.2.3