From 0ec8633c790b40a705ef7d9a6a6cc9bf2be2519c Mon Sep 17 00:00:00 2001 From: aerkefiende Date: Sat, 17 Nov 2012 19:50:36 +0000 Subject: [PATCH] updated windows packaging git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6929 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/vcpp/buildEnv/build_1_exportSVN.bat | 3 ++- source/vcpp/buildEnv/build_2_prepareACdirectory.bat | 3 --- source/vcpp/buildEnv/build_3_createInstaller.bat | 6 +++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source/vcpp/buildEnv/build_1_exportSVN.bat b/source/vcpp/buildEnv/build_1_exportSVN.bat index 297a680c..61c9ea60 100644 --- a/source/vcpp/buildEnv/build_1_exportSVN.bat +++ b/source/vcpp/buildEnv/build_1_exportSVN.bat @@ -1,2 +1,3 @@ -svn export https://actiongame.svn.sourceforge.net/svnroot/actiongame/trunk/ac ac +svn export svn://svn.code.sf.net/p/actiongame/code/trunk/ac ac +svn export --force svn://svn.code.sf.net/p/actiongame/code/ac_website/htdocs/docs ac\docs pause \ No newline at end of file diff --git a/source/vcpp/buildEnv/build_2_prepareACdirectory.bat b/source/vcpp/buildEnv/build_2_prepareACdirectory.bat index 1db4485a..c77ad3f4 100644 --- a/source/vcpp/buildEnv/build_2_prepareACdirectory.bat +++ b/source/vcpp/buildEnv/build_2_prepareACdirectory.bat @@ -20,9 +20,6 @@ rmdir /S /Q %acdir%\bin_unix rem remove source files (those are available in the source pkg) rmdir /S /Q %acdir%\source -rem remove doc tools -rmdir /S /Q %acdir%\docs\autogen - rem copy shadow files copy /Y %workingacdir%\packages\models\playermodels\shadows.dat %acdir%\packages\models\playermodels\shadows.dat copy /Y %workingacdir%\packages\models\misc\gib01\shadows.dat %acdir%\packages\models\misc\gib01\shadows.dat diff --git a/source/vcpp/buildEnv/build_3_createInstaller.bat b/source/vcpp/buildEnv/build_3_createInstaller.bat index 5f0ff6a4..bb86eb1d 100644 --- a/source/vcpp/buildEnv/build_3_createInstaller.bat +++ b/source/vcpp/buildEnv/build_3_createInstaller.bat @@ -1,2 +1,6 @@ -"%programfiles%\NSIS\makensis.exe" ac.nsi +IF EXIST "%programfiles%\NSIS\makensis.exe" ( + "%programfiles%\NSIS\makensis.exe" ac.nsi +) ELSE ( + "%programfiles(x86)%\NSIS\makensis.exe" ac.nsi +) pause \ No newline at end of file