From eefee1cb833434348ce15cd266dc26a714698bdd Mon Sep 17 00:00:00 2001 From: Greymeister Date: Wed, 23 Nov 2022 12:05:17 -0800 Subject: [PATCH 1/3] Use git to create a macro with the ref of the current branch and add to GameVersion.cpp --- .gitignore | 1 + GameVersion.cpp | 8 +++++++- ja2_VS2017.vcxproj | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 494724f84..950b71243 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build/ lib/ .vs/ +rev.h diff --git a/GameVersion.cpp b/GameVersion.cpp index 0260d7b79..6c03048a6 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -4,6 +4,12 @@ #include "Types.h" #include "GameVersion.h" #endif + +// Get Git Hash for local version +#include "rev.h" +#define STRINGIFY_(x) #x +#define STRINGIFY(x) STRINGIFY_(x) +#define GIT_HASH_STR STRINGIFY(GIT_HASH) // // Keeps track of the game version @@ -55,7 +61,7 @@ #endif -CHAR8 czVersionNumber[16] = { "Local build" }; +CHAR8 czVersionNumber[16] = { GIT_HASH_STR }; CHAR16 zTrackingNumber[16] = { L"Z" }; CHAR16 zRevisionNumber[16] = { L"" }; diff --git a/ja2_VS2017.vcxproj b/ja2_VS2017.vcxproj index b7734d38a..73a196e9b 100644 --- a/ja2_VS2017.vcxproj +++ b/ja2_VS2017.vcxproj @@ -144,6 +144,13 @@ false false + + echo | set /p _=#define GIT_HASH > rev.h +git rev-parse --short=10 HEAD >> rev.h + + + Create Git Short Hash Macro + @@ -163,6 +170,13 @@ false false + + echo | set /p _=#define GIT_HASH > rev.h +git rev-parse --short=10 HEAD >> rev.h + + + Create Git Short Hash Macro + @@ -186,6 +200,13 @@ false false + + echo | set /p _=#define GIT_HASH > rev.h +git rev-parse --short=10 HEAD >> rev.h + + + Create Git Short Hash Macro + @@ -209,6 +230,13 @@ false false + + echo | set /p _=#define GIT_HASH > rev.h +git rev-parse --short=10 HEAD >> rev.h + + + Create Git Short Hash Macro + @@ -232,6 +260,13 @@ false false + + echo | set /p _=#define GIT_HASH > rev.h +git rev-parse --short=10 HEAD >> rev.h + + + Create Git Short Hash Macro + From 6e6b50cbbec887cfd61fe56a2880d8f5632790eb Mon Sep 17 00:00:00 2001 From: Greymeister Date: Thu, 24 Nov 2022 14:03:28 -0800 Subject: [PATCH 2/3] Add git hash for GameVersion.cpp to VS2019 project --- .gitignore | 1 + ja2_VS2019.vcxproj | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/.gitignore b/.gitignore index 950b71243..d4fa0cb94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build/ lib/ .vs/ +bin/ rev.h diff --git a/ja2_VS2019.vcxproj b/ja2_VS2019.vcxproj index 6140ccaf9..177a9d2ae 100644 --- a/ja2_VS2019.vcxproj +++ b/ja2_VS2019.vcxproj @@ -267,6 +267,13 @@ false false + + echo | set /p _=#define GIT_HASH > rev.h +git rev-parse --short=10 HEAD >> rev.h + + + Create Git Short Hash Macro + @@ -305,6 +312,13 @@ false false + + echo | set /p _=#define GIT_HASH > rev.h +git rev-parse --short=10 HEAD >> rev.h + + + Create Git Short Hash Macro + @@ -352,6 +366,13 @@ false false + + echo | set /p _=#define GIT_HASH > rev.h +git rev-parse --short=10 HEAD >> rev.h + + + Create Git Short Hash Macro + @@ -403,6 +424,13 @@ false false + + echo | set /p _=#define GIT_HASH > rev.h +git rev-parse --short=10 HEAD >> rev.h + + + Create Git Short Hash Macro + @@ -449,6 +477,13 @@ false false + + echo | set /p _=#define GIT_HASH > rev.h +git rev-parse --short=10 HEAD >> rev.h + + + Create Git Short Hash Macro + From 1b4c6bbf3caabf7adeff8b2d13dc13c0a37f71f2 Mon Sep 17 00:00:00 2001 From: Greymeister Date: Tue, 10 Jan 2023 20:56:16 -0800 Subject: [PATCH 3/3] Fix merge with variable rename. --- GameVersion.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index b6bfb9b67..42ca5f0d0 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -56,7 +56,7 @@ #endif -CHAR8 czVersionNumber[16] = { GIT_HASH_STR }; +CHAR8 czVersionString[16] = { GIT_HASH_STR }; CHAR16 zBuildInformation[256] = { L"@Build@" }; // SAVE_GAME_VERSION is defined in header, change it there