From c97825d898f5d6de6179df4d1e81ed14b40b6014 Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Mon, 2 Dec 2013 09:45:46 -0800 Subject: [PATCH] - updated windows x64 build to use git revision stamp --- mk/windoze/build-mg-2012.bat | 45 +++++++++++++---------- mk/windoze/vc2012/glest_game.vcxproj | 2 +- mk/windoze/vc2012/megaglest_tests.vcxproj | 1 + 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/mk/windoze/build-mg-2012.bat b/mk/windoze/build-mg-2012.bat index 91e2f7a40..415bf6120 100644 --- a/mk/windoze/build-mg-2012.bat +++ b/mk/windoze/build-mg-2012.bat @@ -50,7 +50,7 @@ ECHO Setting up Visual Studio 2012 environment vars... REM Ensure ultifds HP doesn't mess the build up SET Platform= if "%DevEnvDir%." == "." goto SETVCVARS -GOTO SVNSECTION +GOTO GITSECTION :SETVCVARS @@ -61,45 +61,50 @@ IF EXIST "\Program Files (x86)\Microsoft Visual Studio 11.0\" GOTO VC_64_12 rem IF EXIST "%VS100COMNTOOLS%..\..\" GOTO VC_Common rem IF EXIST "\Program Files\Microsoft Visual Studio 10.0\" GOTO VC_32 rem IF EXIST "\Program Files (x86)\Microsoft Visual Studio 10.0\" GOTO VC_64 -goto SVNSECTION +goto GITSECTION :VC_Common_12 call "%VS110COMNTOOLS%..\..\vc\vcvarsall.bat" %VCVARS_PLATFORM% -goto SVNSECTION +goto GITSECTION :VC_32_12 ECHO 32 bit Windows detected... call "\Program Files\Microsoft Visual Studio 11.0\vc\vcvarsall.bat" %VCVARS_PLATFORM% -goto SVNSECTION +goto GITSECTION :VC_64_12 ECHO 64 bit Windows detected... call "\Program Files (x86)\Microsoft Visual Studio 11.0\vc\vcvarsall.bat" %VCVARS_PLATFORM% -goto SVNSECTION +goto GITSECTION :VC_Common rem call "%VS100COMNTOOLS%..\..\vc\vcvarsall.bat" -goto SVNSECTION +goto GITSECTION :VC_32 ECHO 32 bit Windows detected... rem call "\Program Files\Microsoft Visual Studio 10.0\vc\vcvarsall.bat" -goto SVNSECTION +goto GITSECTION :VC_64 ECHO 64 bit Windows detected... rem call "\Program Files (x86)\Microsoft Visual Studio 10.0\vc\vcvarsall.bat" -goto SVNSECTION +goto GITSECTION -:SVNSECTION -rem Update from SVN to latest rev +:GITSECTION +rem Update from GIT to latest rev ECHO -------------------------------- -Echo Updating Code from SVN to latest Revision... -svn update ..\..\ +Echo Updating Code from GIT to latest Revision... +cd ..\..\ +git pull -set SVNVERSION=. -for /f "delims=" %%a in ('svnversion ..\..\ -n') do @set SVNVERSION=%%a -ECHO Will build using SVN Revision: [%SVNVERSION%] +set GITVERSION_SHA1=. +set GITVERSION_REV=. +set GET_GIT_SHA1="git log -1 --format=%%h" +for /f "delims=" %%a in ('%GET_GIT_SHA1%') do @set GITVERSION_SHA1=%%a +for /f "delims=" %%a in ('git rev-list HEAD --count') do @set GITVERSION_REV=%%a +ECHO Will build using GIT Revision: [%GITVERSION_REV%.%GITVERSION_SHA1%] +cd mk\windoze rem pause ECHO -------------------------------- @@ -127,12 +132,12 @@ rem set CL=/D_USING_V110_SDK71_ %CL% rem set PlatformToolset=v110_xp rem set PlatformToolset=V110 -del ..\..\source\glest_game\facilities\svnversion.h +del ..\..\source\glest_game\facilities\gitversion.h -if not "%SVNVERSION%" == "." set CL=/DSVNVERSIONHEADER -if not "%SVNVERSION%" == "." echo building with CL [%CL%] -if not "%SVNVERSION%" == "." echo #define SVNVERSION "%SVNVERSION%" > ..\..\source\glest_game\facilities\svnversion.h -if not "%SVNVERSION%" == "." copy /b ..\..\source\glest_game\facilities\game_util.cpp +,, +if not "%GITVERSION_SHA1%" == "." set CL=/DGITVERSIONHEADER +if not "%GITVERSION_SHA1%" == "." echo building with CL [%CL%] +if not "%GITVERSION_SHA1%" == "." echo #define GITVERSION "%GITVERSION_REV%.%GITVERSION_SHA1%" > ..\..\source\glest_game\facilities\gitversion.h +if not "%GITVERSION_SHA1%" == "." copy /b ..\..\source\glest_game\facilities\game_util.cpp +,, rem set VisualStudioVersion=11.0 set msBuildMaxCPU= diff --git a/mk/windoze/vc2012/glest_game.vcxproj b/mk/windoze/vc2012/glest_game.vcxproj index fe44bebff..86fc6dcd8 100644 --- a/mk/windoze/vc2012/glest_game.vcxproj +++ b/mk/windoze/vc2012/glest_game.vcxproj @@ -272,7 +272,7 @@ true - dsound.lib;dxguid.lib;glew32s.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;libglest.lib;mmc.lib;lua.lib;xerces-c_static_3.lib;Dbghelp.lib;libpng15.lib;jpeg.lib;zlibstat.lib;sdl.lib;sdlmain.lib;winmm.lib;openal64.lib;iphlpapi.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype244MT.lib;ftgl_static.lib;%(AdditionalDependencies) + dsound.lib;dxguid.lib;glew32s.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;libglest.lib;mmc.lib;lua.lib;xerces-c_static_3.lib;Dbghelp.lib;libpng15.lib;jpeg.lib;zlibstat.lib;sdl.lib;sdlmain.lib;winmm.lib;openal64.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype244MT.lib;ftgl_static.lib;%(AdditionalDependencies) ../../../source/windows_deps_2012/lib;../../../build/$(Configuration)/libglest;$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2012/Microsoft DirectX SDK %28November 2007%29/Lib/x64;%(AdditionalLibraryDirectories) ;%(IgnoreSpecificDefaultLibraries) true diff --git a/mk/windoze/vc2012/megaglest_tests.vcxproj b/mk/windoze/vc2012/megaglest_tests.vcxproj index 509c0683c..56f02c9e2 100644 --- a/mk/windoze/vc2012/megaglest_tests.vcxproj +++ b/mk/windoze/vc2012/megaglest_tests.vcxproj @@ -194,6 +194,7 @@ +