Skip to content

Replace Version with Git Hash #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
greymeister wants to merge 5 commits into from
Closed

Replace Version with Git Hash #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eefee1c
Use git to create a macro with the ref of the current branch and add …
greymeister Nov 23, 2022
6e6b50c
Add git hash for GameVersion.cpp to VS2019 project
greymeister Nov 24, 2022
2a06d07
Merge branch 'master' into git-hash-version
greymeister Jan 10, 2023
5a68a2a
Merge branch 'master' into git-hash-version
greymeister Jan 11, 2023
1b4c6bb
Fix merge with variable rename.
greymeister Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
build/
lib/
.vs/
.idea/
.idea/
bin/
rev.h
11 changes: 8 additions & 3 deletions GameVersion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#include "Types.h"
#include "GameVersion.h"
#include "Types.h"
#include "GameVersion.h"
// 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
Expand Down Expand Up @@ -51,7 +56,7 @@

#endif

CHAR8 czVersionString[16] = { "@Version@" };
CHAR8 czVersionString[16] = { GIT_HASH_STR };
CHAR16 zBuildInformation[256] = { L"@Build@" };

// SAVE_GAME_VERSION is defined in header, change it there
35 changes: 35 additions & 0 deletions ja2_VS2017.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>echo | set /p _=#define GIT_HASH &gt; rev.h
git rev-parse --short=10 HEAD &gt;&gt; rev.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Create Git Short Hash Macro</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'">
<ClCompile>
Expand All @@ -163,6 +170,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>echo | set /p _=#define GIT_HASH &gt; rev.h
git rev-parse --short=10 HEAD &gt;&gt; rev.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Create Git Short Hash Macro</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
Expand All @@ -186,6 +200,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>echo | set /p _=#define GIT_HASH &gt; rev.h
git rev-parse --short=10 HEAD &gt;&gt; rev.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Create Git Short Hash Macro</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MapEditor|Win32'">
<ClCompile>
Expand All @@ -209,6 +230,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>echo | set /p _=#define GIT_HASH &gt; rev.h
git rev-parse --short=10 HEAD &gt;&gt; rev.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Create Git Short Hash Macro</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WithDebugInfo|Win32'">
<ClCompile>
Expand All @@ -232,6 +260,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>echo | set /p _=#define GIT_HASH &gt; rev.h
git rev-parse --short=10 HEAD &gt;&gt; rev.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Create Git Short Hash Macro</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="aniviewscreen.cpp" />
Expand Down
35 changes: 35 additions & 0 deletions ja2_VS2019.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>echo | set /p _=#define GIT_HASH &gt; rev.h
git rev-parse --short=10 HEAD &gt;&gt; rev.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Create Git Short Hash Macro</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
Expand Down Expand Up @@ -305,6 +312,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>echo | set /p _=#define GIT_HASH &gt; rev.h
git rev-parse --short=10 HEAD &gt;&gt; rev.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Create Git Short Hash Macro</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|x64'">
<ClCompile>
Expand Down Expand Up @@ -352,6 +366,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>echo | set /p _=#define GIT_HASH &gt; rev.h
git rev-parse --short=10 HEAD &gt;&gt; rev.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Create Git Short Hash Macro</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
Expand Down Expand Up @@ -403,6 +424,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>echo | set /p _=#define GIT_HASH &gt; rev.h
git rev-parse --short=10 HEAD &gt;&gt; rev.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Create Git Short Hash Macro</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MapEditor|x64'">
<ClCompile>
Expand Down Expand Up @@ -449,6 +477,13 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>echo | set /p _=#define GIT_HASH &gt; rev.h
git rev-parse --short=10 HEAD &gt;&gt; rev.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Create Git Short Hash Macro</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WithDebugInfo|x64'">
<ClCompile>
Expand Down