From 696310f11059631296ec6b478732a5187956e7a2 Mon Sep 17 00:00:00 2001 From: driAn Date: Tue, 7 Oct 2008 16:30:57 +0000 Subject: [PATCH] installer: query installation type git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2866 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/vcpp/buildEnv/ac.nsi | 4 ++-- source/vcpp/buildEnv/release_Installer_Cur.bat | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 source/vcpp/buildEnv/release_Installer_Cur.bat diff --git a/source/vcpp/buildEnv/ac.nsi b/source/vcpp/buildEnv/ac.nsi index 64819630..686e33a5 100644 --- a/source/vcpp/buildEnv/ac.nsi +++ b/source/vcpp/buildEnv/ac.nsi @@ -597,8 +597,8 @@ Section "Visual C++ redistributable runtime" VCPP ; Pop $R0 ; StrCmp $R0 "success" installVc - MessageBox MB_OK|MB_ICONEXCLAMATION "Download failed: $R0$\rPlease download and install the Microsoft Visual C++ 2005 SP1 Redistributable Package (x86) from http://download.microsoft.com after Setup." - Goto done + ; MessageBox MB_OK|MB_ICONEXCLAMATION "Download failed: $R0$\rPlease download and install the Microsoft Visual C++ 2005 SP1 Redistributable Package (x86) from http://download.microsoft.com after Setup." + ; Goto done installVc: ExecWait '"$INSTDIR\bin_win32\vcredist_x86.exe" /q' diff --git a/source/vcpp/buildEnv/release_Installer_Cur.bat b/source/vcpp/buildEnv/release_Installer_Cur.bat new file mode 100644 index 00000000..68c2b825 --- /dev/null +++ b/source/vcpp/buildEnv/release_Installer_Cur.bat @@ -0,0 +1,11 @@ +set exportDir=ac + +rem purge old directory +del /S /Q %exportDir% + +rem call build processes +call build_1_exportCVS.bat +call build_2_prepareACdirectory.bat +call build_3_createInstaller.bat + +pause