Added GitInfoStore class depending on mixxx-lib to calculate the dirty state

3 files changed, 53 insertions, 10 deletions

diff --git a/src/util/gitinfostore.cpp b/src/util/gitinfostore.cpp
new file mode 100644
index 0000000000..49b10764b0
--- /dev/null
+++ b/src/util/gitinfostore.cpp
@@ -0,0 +1,37 @@
+#include "util/gitinfostore.h"
+
+#define GIT_INFO
+#include "gitinfo.h"
+
+//static
+const char* GitInfoStore::branch() {
+	return GIT_BRANCH;
+};
+
+//static
+const char* GitInfoStore::describe() {
+	return GIT_DESCRIBE;
+};
+
+//static
+const char* GitInfoStore::date() {
+	return GIT_COMMIT_DATE;       
+};
+
+//static
+int GitInfoStore::commitCount() {
+#ifdef GIT_COMMIT_COUNT
+	return GIT_COMMIT_COUNT;
+#else
+    return 0;
+#endif
+};
+
+//static
+bool GitInfoStore::dirty() {
+#ifdef GIT_DIRTY
+	return true;
+#else 
+    return false;	
+#endif
+};
diff --git a/src/util/gitinfostore.h b/src/util/gitinfostore.h
new file mode 100644
index 0000000000..d72a955ed4
--- /dev/null
+++ b/src/util/gitinfostore.h
@@ -0,0 +1,10 @@
+#pragma once
+
+class GitInfoStore {
+  public:
+    static const char* branch();
+    static const char* describe();
+    static const char* date();
+    int commitCount();
+    static bool dirty();
+};
diff --git a/src/util/versionstore.cpp b/src/util/versionstore.cpp
index de86c2a3ed..5b07ef5b82 100644
--- a/src/util/versionstore.cpp
+++ b/src/util/versionstore.cpp
@@ -29,8 +29,7 @@
 #include <vorbis/codec.h>
 
 #include "version.h"
-#define VERSION_STORE
-#include "gitinfo.h"
+#include "util/gitinfostore.h"
 
 namespace {
 
@@ -38,9 +37,6 @@ const QVersionNumber kMixxxVersionNumber = QVersionNumber(
         MIXXX_VERSION_MAJOR, MIXXX_VERSION_MINOR, MIXXX_VERSION_PATCH);
 const QString kMixxxVersionSuffix = QString(MIXXX_VERSION_SUFFIX);
 const QString kMixxx = QStringLiteral("Mixxx");
-const QString kGitBranch = QString(GIT_BRANCH);
-const QString kGitDescribe = QString(GIT_DESCRIBE);
-const QDateTime kGitCommitDate = QDateTime::fromString(GIT_COMMIT_DATE, Qt::ISODate);
 const QString kBuildFlags = QString(MIXXX_BUILD_FLAGS);
 
 } // namespace
@@ -65,7 +61,7 @@ QString VersionStore::versionSuffix() {
 }
 
 QDateTime VersionStore::date() {
-    return kGitCommitDate;
+    return QDateTime::fromString(GitInfoStore::date(), Qt::ISODate);
 }
 
 // static
@@ -114,24 +110,24 @@ QString VersionStore::platform() {
 
 // static
 QString VersionStore::gitBranch() {
-    return kGitBranch;
+    return GitInfoStore::branch();
 }
 
 // static
 QString VersionStore::gitDescribe() {
-    return kGitDescribe;
+    return GitInfoStore::describe();
 }
 
 // static
 QString VersionStore::gitVersion() {
-    QString gitVersion = VersionStore::gitDescribe();
+    QString gitVersion = GitInfoStore::describe();
     if (gitVersion.isEmpty()) {
         gitVersion = QStringLiteral("unknown");
     }
 
     QString gitBranch = VersionStore::gitBranch();
     if (!gitBranch.isEmpty()) {
-        gitVersion.append(QStringLiteral(" (") + gitBranch + QStringLiteral(" branch)"));
+        gitVersion.append(QStringLiteral(" (") + gitBranch + QChar(')'));
     }
 
     return gitVersion;