Add git commit hash into the version string

AI/BattleAI/CMakeLists.txt

@@ -1,6 +1,10 @@
 project(battleAI)
 cmake_minimum_required(VERSION 2.6)
 
+include(GetGitRevisionDescription)
+get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+add_definitions(-DGIT_SHA1="${GIT_SHA1}")
+
 include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib)
 
 set(battleAI_SRCS

AI/EmptyAI/CMakeLists.txt

@@ -1,6 +1,10 @@
 project(emptyAI)
 cmake_minimum_required(VERSION 2.6)
 
+include(GetGitRevisionDescription)
+get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+add_definitions(-DGIT_SHA1="${GIT_SHA1}")
+
 include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib)
 
 set(emptyAI_SRCS

AI/StupidAI/CMakeLists.txt

@@ -1,12 +1,16 @@
 project(stupidAI)
 cmake_minimum_required(VERSION 2.6)
 
+include(GetGitRevisionDescription)
+get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+add_definitions(-DGIT_SHA1="${GIT_SHA1}")
+
 include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib)
 
 set(stupidAI_SRCS
 		StdInc.cpp
-        StupidAI.cpp
-        main.cpp
+		StupidAI.cpp
+		main.cpp
 )
 
 add_library(StupidAI SHARED ${stupidAI_SRCS})

AI/VCAI/CMakeLists.txt

@@ -1,6 +1,10 @@
 project(VCAI)
 cmake_minimum_required(VERSION 2.6)
 
+include(GetGitRevisionDescription)
+get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+add_definitions(-DGIT_SHA1="${GIT_SHA1}")
+
 if (FL_FOUND)
     include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib ${FL_INCLUDE_DIRS})
 else()

CMakeLists.txt

@@ -341,4 +341,3 @@ else()
 endif()
 
 INCLUDE(CPack)
-

client/CMakeLists.txt

@@ -1,6 +1,10 @@
 project(vcmiclient)
 cmake_minimum_required(VERSION 2.6)
 
+include(GetGitRevisionDescription)
+get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+add_definitions(-DGIT_SHA1="${GIT_SHA1}")
+
 include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib)
 include_directories(${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR})
 include_directories(${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS})

lib/CMakeLists.txt

@@ -1,6 +1,10 @@
 project(libvcmi)
 cmake_minimum_required(VERSION 2.6)
 
+include(GetGitRevisionDescription)
+get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+add_definitions(-DGIT_SHA1="${GIT_SHA1}")
+
 include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/lib)
 include_directories(${Boost_INCLUDE_DIRS} ${SDL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 

lib/GameConstants.h

@@ -14,7 +14,7 @@
 
 namespace GameConstants
 {
-	const std::string VCMI_VERSION = "VCMI 0.98h";
+	const std::string VCMI_VERSION = "VCMI 0.98h " GIT_SHA1;
 
 	const int BFIELD_WIDTH = 17;
 	const int BFIELD_HEIGHT = 11;

lib/VCMI_Lib.cpp

@@ -63,17 +63,17 @@ void LibClasses::loadFilesystem()
 	CStopWatch loadTime;
 
 	CResourceHandler::initialize();
-	logGlobal->infoStream()<<"\t Initialization: "<<loadTime.getDiff();
+	logGlobal->infoStream()<<"\tInitialization: "<<loadTime.getDiff();
 
 	CResourceHandler::load("config/filesystem.json");
-	logGlobal->infoStream()<<"\t Data loading: "<<loadTime.getDiff();
+	logGlobal->infoStream()<<"\tData loading: "<<loadTime.getDiff();
 
 	modh = new CModHandler();
 	logGlobal->infoStream()<<"\tMod handler: "<<loadTime.getDiff();
 
 	modh->loadMods();
 	modh->loadModFilesystems();
-	logGlobal->infoStream()<<"\t Mod filesystems: "<<loadTime.getDiff();
+	logGlobal->infoStream()<<"\tMod filesystems: "<<loadTime.getDiff();
 
 	logGlobal->infoStream()<<"Basic initialization: "<<totalTime.getDiff();
 }

server/CMakeLists.txt

@@ -1,6 +1,10 @@
 project(vcmiserver)
 cmake_minimum_required(VERSION 2.6)
 
+include(GetGitRevisionDescription)
+get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+add_definitions(-DGIT_SHA1="${GIT_SHA1}")
+
 include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib)
 include_directories(${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
 

test/CMakeLists.txt

@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 2.6)
 
+include(GetGitRevisionDescription)
+get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+add_definitions(-DGIT_SHA1="${GIT_SHA1}")
+
 enable_testing()
 include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/test)
 include_directories(${Boost_INCLUDE_DIRS})