From 15b50791ef34d820ed8aac389c0d0f61fa614444 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Fri, 10 Mar 2017 22:16:42 +0100
Subject: [PATCH] Add build time and git head strings to CBuildConfig

refs #902
---
 src/blackconfig/blackconfig.pro        | 9 +++++++++
 src/blackconfig/buildconfig.cpp        | 6 ++++++
 src/blackconfig/buildconfig.h          | 6 ++++++
 src/blackconfig/buildconfig_gen.cpp.in | 7 +++++++
 4 files changed, 28 insertions(+)

diff --git a/src/blackconfig/blackconfig.pro b/src/blackconfig/blackconfig.pro
index f20a5c877..67a9ab6e0 100644
--- a/src/blackconfig/blackconfig.pro
+++ b/src/blackconfig/blackconfig.pro
@@ -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)
diff --git a/src/blackconfig/buildconfig.cpp b/src/blackconfig/buildconfig.cpp
index 63ac2ac88..e3f0f4743 100644
--- a/src/blackconfig/buildconfig.cpp
+++ b/src/blackconfig/buildconfig.cpp
@@ -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; }
diff --git a/src/blackconfig/buildconfig.h b/src/blackconfig/buildconfig.h
index 69501874b..aa2b7925c 100644
--- a/src/blackconfig/buildconfig.h
+++ b/src/blackconfig/buildconfig.h
@@ -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
diff --git a/src/blackconfig/buildconfig_gen.cpp.in b/src/blackconfig/buildconfig_gen.cpp.in
index 4031890b7..18aea9293 100644
--- a/src/blackconfig/buildconfig_gen.cpp.in
+++ b/src/blackconfig/buildconfig_gen.cpp.in
@@ -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\");