Skip to content

Commit 0f0352e

Browse files
xezonxezon
committed
Demystify code names
1 parent 87ea8e8 commit 0f0352e

File tree

3 files changed

+43
-43
lines changed

3 files changed

+43
-43
lines changed

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,18 @@ class Version
5959
AsciiString getAsciiBuildUser() const; ///< Return a string with the build user
6060
UnicodeString getUnicodeBuildUser() const; ///< Return a string with the build user. Is decorated with localized string
6161

62-
static Int getGitRevision(); ///< Returns the total git commit count as a number
63-
static time_t getGitCommitTime(); ///< Returns the last git commit time as a UTC timestamp
64-
static const char* getGitCommitAuthorName(); ///< Returns the last git commit author name
62+
static Int getGitCommitCount(); ///< Returns the git commit count as a number
63+
static time_t getGitCommitTime(); ///< Returns the git head commit time as a UTC timestamp
64+
static const char* getGitCommitAuthorName(); ///< Returns the git head commit author name
6565

66-
AsciiString getAsciiGitRevision() const; ///< Returns the total git commit count. Is prefixed with ~ if there were uncommitted changes.
67-
UnicodeString getUnicodeGitRevision() const; ///< Returns the total git commit count. Is prefixed with ~ if there were uncommitted changes.
66+
AsciiString getAsciiGitCommitCount() const; ///< Returns the git commit count. Is prefixed with ~ if there were uncommitted changes.
67+
UnicodeString getUnicodeGitCommitCount() const; ///< Returns the git commit count. Is prefixed with ~ if there were uncommitted changes.
6868

69-
AsciiString getAsciiGitVersion() const; ///< Returns the last git commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
70-
UnicodeString getUnicodeGitVersion() const; ///< Returns the last git commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
69+
AsciiString getAsciiGitTagOrHash() const; ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
70+
UnicodeString getUnicodeGitTagOrHash() const; ///< Returns the git head commit tag or hash. Is prefixed with ~ if there were uncommitted changes.
7171

72-
AsciiString getAsciiGitCommitTime() const; ///< Returns the last git commit time in YYYY-mm-dd HH:MM:SS format
73-
UnicodeString getUnicodeGitCommitTime() const; ///< Returns the last git commit time in YYYY-mm-dd HH:MM:SS format
72+
AsciiString getAsciiGitCommitTime() const; ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
73+
UnicodeString getUnicodeGitCommitTime() const; ///< Returns the git head commit time in YYYY-mm-dd HH:MM:SS format
7474

7575
AsciiString getAsciiGameAndGitVersion() const; ///< Returns the game and git version
7676
UnicodeString getUnicodeGameAndGitVersion() const; ///< Returns the game and git version. Is decorated with localized string
@@ -86,11 +86,11 @@ class Version
8686
AsciiString buildTime, AsciiString buildDate);
8787

8888
private:
89-
static AsciiString buildAsciiGitRevision();
90-
static UnicodeString buildUnicodeGitRevision();
89+
static AsciiString buildAsciiGitCommitCount();
90+
static UnicodeString buildUnicodeGitCommitCount();
9191

92-
static AsciiString buildAsciiGitVersion();
93-
static UnicodeString buildUnicodeGitVersion();
92+
static AsciiString buildAsciiGitTagOrHash();
93+
static UnicodeString buildUnicodeGitTagOrHash();
9494

9595
static AsciiString buildAsciiGitCommitTime();
9696
static UnicodeString buildUnicodeGitCommitTime();
@@ -104,11 +104,11 @@ class Version
104104
AsciiString m_buildUser;
105105
AsciiString m_buildTime;
106106
AsciiString m_buildDate;
107-
AsciiString m_asciiGitRevision;
108-
AsciiString m_asciiGitVersion;
107+
AsciiString m_asciiGitCommitCount;
108+
AsciiString m_asciiGitTagOrHash;
109109
AsciiString m_asciiGitCommitTime;
110-
UnicodeString m_unicodeGitRevision;
111-
UnicodeString m_unicodeGitVersion;
110+
UnicodeString m_unicodeGitCommitCount;
111+
UnicodeString m_unicodeGitTagOrHash;
112112
UnicodeString m_unicodeGitCommitTime;
113113
Bool m_showFullVersion;
114114
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ void GameEngine::init()
265265
DEBUG_LOG(("Build date: %s\n", TheVersion->getAsciiBuildTime().str()));
266266
DEBUG_LOG(("Build location: %s\n", TheVersion->getAsciiBuildLocation().str()));
267267
DEBUG_LOG(("Build user: %s\n", TheVersion->getAsciiBuildUser().str()));
268-
DEBUG_LOG(("Build git revision: %s\n", TheVersion->getAsciiGitRevision().str()));
269-
DEBUG_LOG(("Build git version: %s\n", TheVersion->getAsciiGitVersion().str()));
268+
DEBUG_LOG(("Build git revision: %s\n", TheVersion->getAsciiGitCommitCount().str()));
269+
DEBUG_LOG(("Build git version: %s\n", TheVersion->getAsciiGitTagOrHash().str()));
270270
DEBUG_LOG(("Build git commit time: %s\n", TheVersion->getAsciiGitCommitTime().str()));
271271
DEBUG_LOG(("Build git commit author: %s\n", Version::getGitCommitAuthorName()));
272272
DEBUG_LOG(("================================================================================\n"));

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ Version::Version()
4343
m_localBuildNum = 0;
4444
m_buildUser = AsciiString::TheEmptyString;
4545
m_buildLocation = AsciiString::TheEmptyString;
46-
m_asciiGitRevision = buildAsciiGitRevision();
47-
m_asciiGitVersion = buildAsciiGitVersion();
46+
m_asciiGitCommitCount = buildAsciiGitCommitCount();
47+
m_asciiGitTagOrHash = buildAsciiGitTagOrHash();
4848
m_asciiGitCommitTime = buildAsciiGitCommitTime();
49-
m_unicodeGitRevision = buildUnicodeGitRevision();
50-
m_unicodeGitVersion = buildUnicodeGitVersion();
49+
m_unicodeGitCommitCount = buildUnicodeGitCommitCount();
50+
m_unicodeGitTagOrHash = buildUnicodeGitTagOrHash();
5151
m_unicodeGitCommitTime = buildUnicodeGitCommitTime();
5252
#if defined RTS_DEBUG || defined RTS_INTERNAL
5353
m_showFullVersion = TRUE;
@@ -208,7 +208,7 @@ UnicodeString Version::getUnicodeBuildUser() const
208208
return build;
209209
}
210210

211-
Int Version::getGitRevision()
211+
Int Version::getGitCommitCount()
212212
{
213213
return GitRevision;
214214
}
@@ -223,24 +223,24 @@ const char* Version::getGitCommitAuthorName()
223223
return GitCommitAuthorName;
224224
}
225225

226-
AsciiString Version::getAsciiGitRevision() const
226+
AsciiString Version::getAsciiGitCommitCount() const
227227
{
228-
return m_asciiGitRevision;
228+
return m_asciiGitCommitCount;
229229
}
230230

231-
UnicodeString Version::getUnicodeGitRevision() const
231+
UnicodeString Version::getUnicodeGitCommitCount() const
232232
{
233-
return m_unicodeGitRevision;
233+
return m_unicodeGitCommitCount;
234234
}
235235

236-
AsciiString Version::getAsciiGitVersion() const
236+
AsciiString Version::getAsciiGitTagOrHash() const
237237
{
238-
return m_asciiGitVersion;
238+
return m_asciiGitTagOrHash;
239239
}
240240

241-
UnicodeString Version::getUnicodeGitVersion() const
241+
UnicodeString Version::getUnicodeGitTagOrHash() const
242242
{
243-
return m_unicodeGitVersion;
243+
return m_unicodeGitTagOrHash;
244244
}
245245

246246
AsciiString Version::getAsciiGitCommitTime() const
@@ -260,14 +260,14 @@ AsciiString Version::getAsciiGameAndGitVersion() const
260260
{
261261
str.format("%s R %s %s",
262262
getAsciiVersion().str(),
263-
getAsciiGitRevision().str(),
264-
getAsciiGitVersion().str());
263+
getAsciiGitCommitCount().str(),
264+
getAsciiGitTagOrHash().str());
265265
}
266266
else
267267
{
268268
str.format("%s R %s",
269269
getAsciiVersion().str(),
270-
getAsciiGitRevision().str());
270+
getAsciiGitCommitCount().str());
271271
}
272272
return str;
273273
}
@@ -279,14 +279,14 @@ UnicodeString Version::getUnicodeGameAndGitVersion() const
279279
{
280280
str.format(L"%s R %s %s",
281281
getUnicodeVersion().str(),
282-
getUnicodeGitRevision().str(),
283-
getUnicodeGitVersion().str());
282+
getUnicodeGitCommitCount().str(),
283+
getUnicodeGitTagOrHash().str());
284284
}
285285
else
286286
{
287287
str.format(L"%s R %s",
288288
getUnicodeVersion().str(),
289-
getUnicodeGitRevision().str());
289+
getUnicodeGitCommitCount().str());
290290
}
291291
return str;
292292
}
@@ -318,7 +318,7 @@ UnicodeString Version::getUnicodeBuildUserOrGitCommitAuthorName() const
318318
return str;
319319
}
320320

321-
AsciiString Version::buildAsciiGitRevision()
321+
AsciiString Version::buildAsciiGitCommitCount()
322322
{
323323
AsciiString str;
324324
str.format("%s%d",
@@ -327,7 +327,7 @@ AsciiString Version::buildAsciiGitRevision()
327327
return str;
328328
}
329329

330-
UnicodeString Version::buildUnicodeGitRevision()
330+
UnicodeString Version::buildUnicodeGitCommitCount()
331331
{
332332
UnicodeString str;
333333
str.format(L"%s%d",
@@ -336,7 +336,7 @@ UnicodeString Version::buildUnicodeGitRevision()
336336
return str;
337337
}
338338

339-
AsciiString Version::buildAsciiGitVersion()
339+
AsciiString Version::buildAsciiGitTagOrHash()
340340
{
341341
AsciiString str;
342342
str.format("%s%s",
@@ -345,10 +345,10 @@ AsciiString Version::buildAsciiGitVersion()
345345
return str;
346346
}
347347

348-
UnicodeString Version::buildUnicodeGitVersion()
348+
UnicodeString Version::buildUnicodeGitTagOrHash()
349349
{
350350
UnicodeString str;
351-
str.translate(buildAsciiGitVersion());
351+
str.translate(buildAsciiGitTagOrHash());
352352
return str;
353353
}
354354

0 commit comments

Comments
 (0)