Skip to content

Commit 7336394

Browse files
Caball009Chapter5780
Caball009
authored and
Chapter5780
committed
feat(version): Add functions to get Git short hash string (TheSuperHackers#2243)
1 parent 8c72289 commit 7336394

File tree

4 files changed

+72
-0
lines changed

4 files changed

+72
-0
lines changed

‎Generals/Code/GameEngine/Include/Common/version.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ class Version
6666
AsciiString getAsciiGitTagOrHash() const; ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
6767
UnicodeString getUnicodeGitTagOrHash() const; ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
6868

69+
AsciiString getAsciiGitShortHash() const; ///< Returns the git head commit short hash. Is prefixed with ~ if there were uncommitted changes.
70+
UnicodeString getUnicodeGitShortHash() const; ///< Returns the git head commit short hash. Is prefixed with ~ if there were uncommitted changes.
71+
6972
AsciiString getAsciiGitCommitTime() const; ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
7073
UnicodeString getUnicodeGitCommitTime() const; ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
7174

@@ -95,6 +98,9 @@ class Version
9598
static AsciiString buildAsciiGitTagOrHash();
9699
static UnicodeString buildUnicodeGitTagOrHash();
97100

101+
static AsciiString buildAsciiGitShortHash();
102+
static UnicodeString buildUnicodeGitShortHash();
103+
98104
static AsciiString buildAsciiGitCommitTime();
99105
static UnicodeString buildUnicodeGitCommitTime();
100106

@@ -109,9 +115,11 @@ class Version
109115
AsciiString m_buildDate;
110116
AsciiString m_asciiGitCommitCount;
111117
AsciiString m_asciiGitTagOrHash;
118+
AsciiString m_asciiGitShortHash;
112119
AsciiString m_asciiGitCommitTime;
113120
UnicodeString m_unicodeGitCommitCount;
114121
UnicodeString m_unicodeGitTagOrHash;
122+
UnicodeString m_unicodeGitShortHash;
115123
UnicodeString m_unicodeGitCommitTime;
116124
Bool m_showFullVersion;
117125
};

‎Generals/Code/GameEngine/Source/Common/version.cpp‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ Version::Version()
4545
m_buildLocation = AsciiString::TheEmptyString;
4646
m_asciiGitCommitCount = buildAsciiGitCommitCount();
4747
m_asciiGitTagOrHash = buildAsciiGitTagOrHash();
48+
m_asciiGitShortHash = buildAsciiGitShortHash();
4849
m_asciiGitCommitTime = buildAsciiGitCommitTime();
4950
m_unicodeGitCommitCount = buildUnicodeGitCommitCount();
5051
m_unicodeGitTagOrHash = buildUnicodeGitTagOrHash();
52+
m_unicodeGitShortHash = buildUnicodeGitShortHash();
5153
m_unicodeGitCommitTime = buildUnicodeGitCommitTime();
5254
#if defined(RTS_DEBUG)
5355
m_showFullVersion = TRUE;
@@ -235,6 +237,16 @@ UnicodeString Version::getUnicodeGitTagOrHash() const
235237
return m_unicodeGitTagOrHash;
236238
}
237239

240+
AsciiString Version::getAsciiGitShortHash() const
241+
{
242+
return m_asciiGitShortHash;
243+
}
244+
245+
UnicodeString Version::getUnicodeGitShortHash() const
246+
{
247+
return m_unicodeGitShortHash;
248+
}
249+
238250
AsciiString Version::getAsciiGitCommitTime() const
239251
{
240252
return m_asciiGitCommitTime;
@@ -404,6 +416,22 @@ UnicodeString Version::buildUnicodeGitTagOrHash()
404416
return str;
405417
}
406418

419+
AsciiString Version::buildAsciiGitShortHash()
420+
{
421+
AsciiString str;
422+
str.format("%s%s",
423+
GitUncommittedChanges ? "~" : "",
424+
GitShortSHA1);
425+
return str;
426+
}
427+
428+
UnicodeString Version::buildUnicodeGitShortHash()
429+
{
430+
UnicodeString str;
431+
str.translate(buildAsciiGitShortHash());
432+
return str;
433+
}
434+
407435
AsciiString Version::buildAsciiGitCommitTime()
408436
{
409437
const Int len = 19;

‎GeneralsMD/Code/GameEngine/Include/Common/version.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ class Version
6666
AsciiString getAsciiGitTagOrHash() const; ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
6767
UnicodeString getUnicodeGitTagOrHash() const; ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
6868

69+
AsciiString getAsciiGitShortHash() const; ///< Returns the git head commit short hash. Is prefixed with ~ if there were uncommitted changes.
70+
UnicodeString getUnicodeGitShortHash() const; ///< Returns the git head commit short hash. Is prefixed with ~ if there were uncommitted changes.
71+
6972
AsciiString getAsciiGitCommitTime() const; ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
7073
UnicodeString getUnicodeGitCommitTime() const; ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
7174

@@ -95,6 +98,9 @@ class Version
9598
static AsciiString buildAsciiGitTagOrHash();
9699
static UnicodeString buildUnicodeGitTagOrHash();
97100

101+
static AsciiString buildAsciiGitShortHash();
102+
static UnicodeString buildUnicodeGitShortHash();
103+
98104
static AsciiString buildAsciiGitCommitTime();
99105
static UnicodeString buildUnicodeGitCommitTime();
100106

@@ -109,9 +115,11 @@ class Version
109115
AsciiString m_buildDate;
110116
AsciiString m_asciiGitCommitCount;
111117
AsciiString m_asciiGitTagOrHash;
118+
AsciiString m_asciiGitShortHash;
112119
AsciiString m_asciiGitCommitTime;
113120
UnicodeString m_unicodeGitCommitCount;
114121
UnicodeString m_unicodeGitTagOrHash;
122+
UnicodeString m_unicodeGitShortHash;
115123
UnicodeString m_unicodeGitCommitTime;
116124
Bool m_showFullVersion;
117125
};

‎GeneralsMD/Code/GameEngine/Source/Common/version.cpp‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ Version::Version()
4545
m_buildLocation = AsciiString::TheEmptyString;
4646
m_asciiGitCommitCount = buildAsciiGitCommitCount();
4747
m_asciiGitTagOrHash = buildAsciiGitTagOrHash();
48+
m_asciiGitShortHash = buildAsciiGitShortHash();
4849
m_asciiGitCommitTime = buildAsciiGitCommitTime();
4950
m_unicodeGitCommitCount = buildUnicodeGitCommitCount();
5051
m_unicodeGitTagOrHash = buildUnicodeGitTagOrHash();
52+
m_unicodeGitShortHash = buildUnicodeGitShortHash();
5153
m_unicodeGitCommitTime = buildUnicodeGitCommitTime();
5254
#if defined(RTS_DEBUG)
5355
m_showFullVersion = TRUE;
@@ -235,6 +237,16 @@ UnicodeString Version::getUnicodeGitTagOrHash() const
235237
return m_unicodeGitTagOrHash;
236238
}
237239

240+
AsciiString Version::getAsciiGitShortHash() const
241+
{
242+
return m_asciiGitShortHash;
243+
}
244+
245+
UnicodeString Version::getUnicodeGitShortHash() const
246+
{
247+
return m_unicodeGitShortHash;
248+
}
249+
238250
AsciiString Version::getAsciiGitCommitTime() const
239251
{
240252
return m_asciiGitCommitTime;
@@ -404,6 +416,22 @@ UnicodeString Version::buildUnicodeGitTagOrHash()
404416
return str;
405417
}
406418

419+
AsciiString Version::buildAsciiGitShortHash()
420+
{
421+
AsciiString str;
422+
str.format("%s%s",
423+
GitUncommittedChanges ? "~" : "",
424+
GitShortSHA1);
425+
return str;
426+
}
427+
428+
UnicodeString Version::buildUnicodeGitShortHash()
429+
{
430+
UnicodeString str;
431+
str.translate(buildAsciiGitShortHash());
432+
return str;
433+
}
434+
407435
AsciiString Version::buildAsciiGitCommitTime()
408436
{
409437
const Int len = 19;

0 commit comments

Comments
 (0)