From 0bae47a75488e2fd1bcab8b141976763e4d81e95 Mon Sep 17 00:00:00 2001
From: Unknown <fireice2@o2.pl>
Date: Fri, 10 Nov 2017 19:19:07 +0000
Subject: Define GIT_COMMIT_HASH via cmake or git archive

---
 xmrstak/version.hpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'xmrstak/version.hpp')

diff --git a/xmrstak/version.hpp b/xmrstak/version.hpp
index 44214c8..4267c75 100644
--- a/xmrstak/version.hpp
+++ b/xmrstak/version.hpp
@@ -1,4 +1,17 @@
 #pragma once
 
+//! git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$
+#if defined(GIT_ARCHIVE) && !defined(GIT_COMMIT_HASH)
+#define GIT_COMMIT_HASH "$Format:%h$"
+#endif
+
+#ifndef GIT_COMMIT_HASH
+#define GIT_COMMIT_HASH "0000000"
+#endif
+
+#ifndef GIT_BRANCH
+#define GIT_BRANCH "unknown"
+#endif
+
 #define XMR_STAK_NAME "xmr-stak"
 #define XMR_STAK_VERSION "2.0.0-predev"
-- 
cgit v1.1


From 8f52eb85b3c39601704560263722a86b2265da05 Mon Sep 17 00:00:00 2001
From: Unknown <fireice2@o2.pl>
Date: Fri, 10 Nov 2017 20:39:25 +0000
Subject: Versioning final version

---
 xmrstak/version.hpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'xmrstak/version.hpp')

diff --git a/xmrstak/version.hpp b/xmrstak/version.hpp
index 4267c75..72df50b 100644
--- a/xmrstak/version.hpp
+++ b/xmrstak/version.hpp
@@ -1,17 +1,17 @@
 #pragma once
 
-//! git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$
-#if defined(GIT_ARCHIVE) && !defined(GIT_COMMIT_HASH)
-#define GIT_COMMIT_HASH "$Format:%h$"
-#endif
+#include <string>
+#include "donate-level.hpp"
 
-#ifndef GIT_COMMIT_HASH
-#define GIT_COMMIT_HASH "0000000"
-#endif
+extern const char ver_long[];
+extern const char ver_short[];
 
-#ifndef GIT_BRANCH
-#define GIT_BRANCH "unknown"
-#endif
+inline std::string get_version_str()
+{
+	return std::string(ver_long) + std::to_string(uint(fDevDonationLevel * 1000)) ;
+}
 
-#define XMR_STAK_NAME "xmr-stak"
-#define XMR_STAK_VERSION "2.0.0-predev"
+inline std::string get_version_str_short()
+{
+	return std::string(ver_short);
+}
-- 
cgit v1.1


From 71c4e937aeb0a202ea577b52656b68002ba33291 Mon Sep 17 00:00:00 2001
From: Unknown <fireice2@o2.pl>
Date: Fri, 10 Nov 2017 20:51:25 +0000
Subject: fix win build

---
 xmrstak/version.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'xmrstak/version.hpp')

diff --git a/xmrstak/version.hpp b/xmrstak/version.hpp
index 72df50b..2bf38d5 100644
--- a/xmrstak/version.hpp
+++ b/xmrstak/version.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <inttypes.h>
 #include <string>
 #include "donate-level.hpp"
 
@@ -8,7 +9,7 @@ extern const char ver_short[];
 
 inline std::string get_version_str()
 {
-	return std::string(ver_long) + std::to_string(uint(fDevDonationLevel * 1000)) ;
+	return std::string(ver_long) + std::to_string(uint32_t(fDevDonationLevel * 1000)) ;
 }
 
 inline std::string get_version_str_short()
-- 
cgit v1.1


From b48ca65c0bfd9b9ccda1083d2955c75ff9c10092 Mon Sep 17 00:00:00 2001
From: Unknown <fireice2@o2.pl>
Date: Mon, 13 Nov 2017 19:56:41 +0000
Subject: Add version to web and json

---
 xmrstak/version.hpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'xmrstak/version.hpp')

diff --git a/xmrstak/version.hpp b/xmrstak/version.hpp
index 2bf38d5..cdf82f3 100644
--- a/xmrstak/version.hpp
+++ b/xmrstak/version.hpp
@@ -6,6 +6,7 @@
 
 extern const char ver_long[];
 extern const char ver_short[];
+extern const char ver_html[];
 
 inline std::string get_version_str()
 {
-- 
cgit v1.1