From 05b4e5e9a39aff44c5a211b2ea0134ff937c5252 Mon Sep 17 00:00:00 2001 From: Jammyjamjamman Date: Thu, 25 Jan 2018 21:28:40 +0000 Subject: [PATCH] fixed build-mg script by making it no longer look for and update game data. Now it just gets the deps and builds the game. --- mk/windows/build-mg-2015.bat | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) mode change 100644 => 100755 mk/windows/build-mg-2015.bat diff --git a/mk/windows/build-mg-2015.bat b/mk/windows/build-mg-2015.bat old mode 100644 new mode 100755 index f1944efe1..569d89b85 --- a/mk/windows/build-mg-2015.bat +++ b/mk/windows/build-mg-2015.bat @@ -81,18 +81,19 @@ goto GITSECTION :GITSECTION rem Update from GIT to latest rev +rem Code commented out so that script functions. ECHO -------------------------------- -Echo Updating Code from GIT to latest Revision... +Echo Updating Code from GIT to latest Revision (WARNING! NO LONGER UPDATES!)... cd ..\..\ -set GIT_NORM_BRANCH=. -for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\*[^(]*([^) d]*[ ]*detached"') do @set GIT_NORM_BRANCH=%%a -if "%GIT_NORM_BRANCH%" == "." git pull -cd data\glest_game -set GIT_NORM_BRANCH=. -for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\*[^(]*([^) d]*[ ]*detached"') do @set GIT_NORM_BRANCH=%%a -if "%GIT_NORM_BRANCH%" == "." git pull -cd ..\..\ -git submodule update +rem set GIT_NORM_BRANCH=. +rem for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\*[^(]*([^) d]*[ ]*detached"') do @set GIT_NORM_BRANCH=%%a +rem if "%GIT_NORM_BRANCH%" == "." git pull +rem cd data\glest_game +rem set GIT_NORM_BRANCH=. +rem for /f "delims=" %%a in ('git branch ^| findstr /rc:"^\*[^(]*([^) d]*[ ]*detached"') do @set GIT_NORM_BRANCH=%%a +rem if "%GIT_NORM_BRANCH%" == "." git pull +rem cd ..\..\ +rem git submodule update set GITVERSION_SHA1=. set GITVERSION_REV=.