Add build time and git head strings to CBuildConfig

refs #902
This commit is contained in:
Roland Winklmeier
2017-03-10 22:16:42 +01:00
committed by Mathew Sutcliffe
parent eea6c31e7b
commit 15b50791ef
4 changed files with 28 additions and 0 deletions

View File

@@ -17,4 +17,13 @@ SOURCES += *.cpp
DESTDIR = $$DestRoot/lib
OTHER_FILES += buildconfig_gen.cpp.in
win32: GIT_BIN = $$system($$(SYSTEMROOT)\system32\where git 2> nul)
else: GIT_BIN = $$system(which git 2> /dev/null)
isEmpty(GIT_BIN) {
GIT_HEAD_SHA1="<unknown>"
} else {
GIT_HEAD_SHA1=$$system(git rev-parse --short HEAD)
}
load(common_post)

View File

@@ -367,6 +367,12 @@ namespace BlackConfig
}
}
const QString &BlackConfig::CBuildConfig::buildDateAndTime()
{
static const QString buildDateAndTime( __DATE__ " " __TIME__ );
return buildDateAndTime;
}
bool CVersion::isNewerVersion(const QString &versionString)
{
if (versionString.isEmpty()) { return false; }

View File

@@ -150,6 +150,12 @@ namespace BlackConfig
//! Vatsim client key
static const QString &vatsimPrivateKey(); // defined in buildconfig_gen.cpp.in
//! Returns SHA-1 of git HEAD at build time
static const QString &gitHeadSha1();
//! Returns the build date and time as string
static const QString &buildDateAndTime();
};
//! Version

View File

@@ -144,6 +144,13 @@ const QString &BlackConfig::CBuildConfig::vatsimPrivateKey()
return pk;
}
const QString &BlackConfig::CBuildConfig::gitHeadSha1()
{
static const QString gitHeadSha1(\"$$GIT_HEAD_SHA1\");
Q_ASSERT(!gitHeadSha1.isEmpty());
return gitHeadSha1;
}
const QString &BlackConfig::CVersion::version()
{
static const QString version(\"$$BLACK_VERSION\");