Write git information to .h file pre-build

sleepyhead/SleepLib/common.cpp

@@ -9,12 +9,14 @@
 #include <QDateTime>
 #include <QDir>
 #include <QThread>
+
 #ifdef _MSC_VER
 #include <QtZlib/zlib.h>
 #else
 #include <zlib.h>
 #endif
 
+#include "git_info.h"
 #include "version.h"
 #include "profiles.h"
 
@@ -28,11 +30,9 @@ const QString getDeveloperName()
 const QString getAppName()
 {
     QString name = STR_AppName;
-#ifdef GIT_BRANCH
-    if ((QString(GIT_BRANCH) != "master") || (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) || (ReleaseStatus.compare("beta", Qt::CaseInsensitive)==0)))) {
-        name += "-"+QString(GIT_BRANCH);
+    if ((GIT_BRANCH != "master") || (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) || (ReleaseStatus.compare("beta", Qt::CaseInsensitive)==0)))) {
+        name += "-"+GIT_BRANCH;
     }
-#endif
     return name;
 }
 

sleepyhead/aboutdialog.cpp

@@ -15,6 +15,7 @@
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
 #include "common_gui.h"
+#include "git_info.h"
 
 
 AboutDialog::AboutDialog(QWidget *parent) :
@@ -27,7 +28,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
     ui->relnotesText->setHtml(getRelnotes());
     ui->versionLabel->setText(VersionString);
 
-    QString gitrev = QString(GIT_REVISION);
+    QString gitrev = GIT_REVISION;
 
     if (!gitrev.isEmpty()) {
         gitrev = tr("Revision: %1").arg(QString("<a href='https://gitlab.com/sleepyhead/sleepyhead-code/commit/%1'>%1</a>").arg(gitrev))+"<br/>"

sleepyhead/common_gui.cpp

@@ -14,6 +14,7 @@
 
 #include "SleepLib/common.h"
 #include "common_gui.h"
+#include "git_info.h"
 
 #ifndef BUILD_WITH_MSVC
 # include <unistd.h>
@@ -77,12 +78,10 @@ QString getBranchVersion()
 {
     QString version = STR_TR_AppVersion;
     version += " [";
-#ifdef GIT_REVISION
-    if (QString(GIT_BRANCH) != "master") {
-        version += QString(GIT_BRANCH)+"-";
+    if (GIT_BRANCH != "master") {
+        version += GIT_BRANCH+"-";
     }
-    version += QString(GIT_REVISION) +" ";
-#endif
+    version += GIT_REVISION +" ";
     version += getGraphicsEngine()+"]";
 
     return version;

sleepyhead/sleepyhead.pro

@@ -47,27 +47,23 @@ unix:!macx:!haiku {
 
 TEMPLATE = app
 
-# GIT_VERSION = $$system(git describe --tags --long --abbrev=6 --dirty="*")
 
+gitinfotarget.target = git_info.h
+gitinfotarget.depends = FORCE
 
-exists(../.git):{
-    if (*-msvc*):!equals(TEMPLATE_PREFIX, "vc") {
-        GIT_COMMAND = git -C \"$$_PRO_FILE_PWD_\"
-        GIT_BRANCH=$$system($$GIT_COMMAND rev-parse --abbrev-ref HEAD)
-        GIT_REVISION=$$system($$GIT_COMMAND rev-parse --short HEAD)
-        DEFINES += GIT_BRANCH=\\\"$$GIT_BRANCH\\\"
-        DEFINES += GIT_REVISION=\\\"$$GIT_REVISION\\\"
-        message ("Building $$GIT_BRANCH branch $$GIT_REVISION")
-    } else {
-        DEFINES += GIT_BRANCH="\\\"$(shell git -C \""$$_PRO_FILE_PWD_"\" rev-parse --abbrev-ref HEAD)\\\""
-        DEFINES += GIT_REVISION="\\\"$(shell git -C \""$$_PRO_FILE_PWD_"\" rev-parse --short HEAD)\\\""
-    }
-
+win32 {
+    system("$$_PRO_FILE_PWD_/update_gitinfo.bat");
+    gitinfotarget.commands = $$_PRO_FILE_PWD_/update_gitinfo.bat
 } else {
-    DEFINES += GIT_BRANCH=\\\"UNKNOWN\\\"
-    DEFINES += GIT_REVISION=\\\"UNKNOWN\\\"
+    system("$$_PRO_FILE_PWD_/update_gitinfo.sh");
+    gitinfotarget.commands = $$_PRO_FILE_PWD_/update_gitinfo.sh
 }
 
+PRE_TARGETDEPS += git_info.h
+QMAKE_EXTRA_TARGETS += gitinfotarget
+
+
+
 #Comment out for official builds
 DEFINES += BETA_BUILD
 

sleepyhead/update_gitinfo.bat

@@ -0,0 +1,15 @@
+@echo off
+setlocal
+set DIR=%~dp0
+
+echo Updating %DIR%git_info.h
+
+for /f %%i in ('git -C %DIR% rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i
+for /f %%i in ('git -C %DIR% rev-parse --short HEAD') do set GIT_REVISION=%%i
+
+if "%GIT_BRANCH"=="" set GIT_BRANCH="Unknown";
+if "%GIT_REVIISION"=="" set GIT_REVISION="Unknown";
+
+echo // This is an auto generated file > %DIR%git_info.h
+echo const QString GIT_BRANCH="%GIT_BRANCH%"; >> %DIR%git_info.h
+echo const QString GIT_REVISION="%GIT_REVISION%"; >> %DIR%git_info.h

sleepyhead/update_gitinfo.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+echo Updating $DIR/git_info.h
+
+GIT_BRANCH=`git -C $DIR rev-parse --abbrev-ref HEAD`
+GIT_REVISION=`git -C $DIR rev-parse --short HEAD`
+
+[ -z "$GIT_BRANCH" ] &&	GIT_BRANCH="Unknown";
+[ -z "$GIT_REVISION" ] && GIT_REVISION="Unknown";
+
+echo // This is an auto generated file > $DIR/git_info.h
+echo const QString GIT_BRANCH=\"$GIT_BRANCH\"\; >> $DIR/git_info.h
+echo const QString GIT_REVISION=\"$GIT_REVISION\"\; >> $DIR/git_info.h