feat(version): Add short Git hash string to Version class (Generals).

Fixed Zero Hour version.

Author: Caball009

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

@@ -66,6 +66,9 @@ class Version
 	AsciiString getAsciiGitTagOrHash() const;          ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
 	UnicodeString getUnicodeGitTagOrHash() const;      ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
 
+	AsciiString getAsciiGitShortHash() const;          ///< Returns the git head commit short hash. Is prefixed with ~ if there were uncommitted changes.
+	UnicodeString getUnicodeGitShortHash() const;      ///< Returns the git head commit short hash. Is prefixed with ~ if there were uncommitted changes.
+
 	AsciiString getAsciiGitCommitTime() const;         ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
 	UnicodeString getUnicodeGitCommitTime() const;     ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
 
@@ -95,6 +98,9 @@ class Version
 	static AsciiString buildAsciiGitTagOrHash();
 	static UnicodeString buildUnicodeGitTagOrHash();
 
+	static AsciiString buildAsciiGitShortHash();
+	static UnicodeString buildUnicodeGitShortHash();
+
 	static AsciiString buildAsciiGitCommitTime();
 	static UnicodeString buildUnicodeGitCommitTime();
 
@@ -109,9 +115,11 @@ class Version
 	AsciiString m_buildDate;
 	AsciiString m_asciiGitCommitCount;
 	AsciiString m_asciiGitTagOrHash;
+	AsciiString m_asciiGitShortHash;
 	AsciiString m_asciiGitCommitTime;
 	UnicodeString m_unicodeGitCommitCount;
 	UnicodeString m_unicodeGitTagOrHash;
+	UnicodeString m_unicodeGitShortHash;
 	UnicodeString m_unicodeGitCommitTime;
 	Bool m_showFullVersion;
 };

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

@@ -45,9 +45,11 @@ Version::Version()
 	m_buildLocation = AsciiString::TheEmptyString;
 	m_asciiGitCommitCount = buildAsciiGitCommitCount();
 	m_asciiGitTagOrHash = buildAsciiGitTagOrHash();
+	m_asciiGitShortHash = buildAsciiGitShortHash();
 	m_asciiGitCommitTime = buildAsciiGitCommitTime();
 	m_unicodeGitCommitCount = buildUnicodeGitCommitCount();
 	m_unicodeGitTagOrHash = buildUnicodeGitTagOrHash();
+	m_unicodeGitShortHash = buildUnicodeGitShortHash();
 	m_unicodeGitCommitTime = buildUnicodeGitCommitTime();
 #if defined(RTS_DEBUG)
 	m_showFullVersion = TRUE;
@@ -235,6 +237,16 @@ UnicodeString Version::getUnicodeGitTagOrHash() const
 	return m_unicodeGitTagOrHash;
 }
 
+AsciiString Version::getAsciiGitShortHash() const
+{
+	return m_asciiGitShortHash;
+}
+
+UnicodeString Version::getUnicodeGitShortHash() const
+{
+	return m_unicodeGitShortHash;
+}
+
 AsciiString Version::getAsciiGitCommitTime() const
 {
 	return m_asciiGitCommitTime;
@@ -404,6 +416,22 @@ UnicodeString Version::buildUnicodeGitTagOrHash()
 	return str;
 }
 
+AsciiString Version::buildAsciiGitShortHash()
+{
+	AsciiString str;
+	str.format("%s%s",
+		GitUncommittedChanges ? "~" : "",
+		GitShortSHA1);
+	return str;
+}
+
+UnicodeString Version::buildUnicodeGitShortHash()
+{
+	UnicodeString str;
+	str.translate(buildAsciiGitShortHash());
+	return str;
+}
+
 AsciiString Version::buildAsciiGitCommitTime()
 {
 	const Int len = 19;

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

@@ -409,6 +409,13 @@ AsciiString Version::buildAsciiGitTagOrHash()
 	return str;
 }
 
+UnicodeString Version::buildUnicodeGitTagOrHash()
+{
+	UnicodeString str;
+	str.translate(buildAsciiGitTagOrHash());
+	return str;
+}
+
 AsciiString Version::buildAsciiGitShortHash()
 {
 	AsciiString str;
@@ -425,13 +432,6 @@ UnicodeString Version::buildUnicodeGitShortHash()
 	return str;
 }
 
-UnicodeString Version::buildUnicodeGitTagOrHash()
-{
-	UnicodeString str;
-	str.translate(buildAsciiGitTagOrHash());
-	return str;
-}
-
 AsciiString Version::buildAsciiGitCommitTime()
 {
 	const Int len = 19;