From 8f52eb85b3c39601704560263722a86b2265da05 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 10 Nov 2017 20:39:25 +0000 Subject: Versioning final version --- xmrstak/version.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 xmrstak/version.cpp (limited to 'xmrstak/version.cpp') diff --git a/xmrstak/version.cpp b/xmrstak/version.cpp new file mode 100644 index 0000000..2308580 --- /dev/null +++ b/xmrstak/version.cpp @@ -0,0 +1,53 @@ +#include "version.hpp" + +//! 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" + +#if defined(_WIN32) +#define OS_TYPE "win" +#elif defined(__APPLE__) +#define OS_TYPE "mac" +#elif defined(__FreeBSD__) +#define OS_TYPE "bsd" +#elif defined(__linux__) +#define OS_TYPE "lin" +#else +#define OS_TYPE "unk" +#endif + +#if !defined(CONF_NO_CUDA) && !defined(CONF_NO_OPENCL) +#define BACKEND_TYPE "cpu-nvidia-amd" +#elif !defined(CONF_NO_OPENCL) +#define BACKEND_TYPE "cpu-amd" +#elif !defined(CONF_NO_CUDA) +#define BACKEND_TYPE "cpu-nvidia" +#else +#define BACKEND_TYPE "cpu" +#endif + +#if defined(CONF_NO_AEON) +#define COIN_TYPE "monero" +#elif defined(CONF_NO_MONERO) +#define COIN_TYPE "aeon" +#else +#define COIN_TYPE "aeon-monero" +#endif + +#define VERSION_LONG XMR_STAK_NAME "/" XMR_STAK_VERSION "/" GIT_COMMIT_HASH "/" GIT_BRANCH "/" OS_TYPE "/" BACKEND_TYPE "/" COIN_TYPE "/" +#define VERSION_SHORT XMR_STAK_NAME " " XMR_STAK_VERSION " " GIT_COMMIT_HASH + +const char ver_long[] = VERSION_LONG; +const char ver_short[] = VERSION_SHORT; -- cgit v1.1 From 062287ad4740fd4ea7365f188d2a31c43b489ab5 Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Sat, 11 Nov 2017 21:43:51 +0100 Subject: fix compile - generate define `BACKEND_TYPE` type in CMake - fix comile because `GIT_COMMIT_HASH` is no string --- xmrstak/version.cpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'xmrstak/version.cpp') diff --git a/xmrstak/version.cpp b/xmrstak/version.cpp index 2308580..3cecc8f 100644 --- a/xmrstak/version.cpp +++ b/xmrstak/version.cpp @@ -2,15 +2,19 @@ //! 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$" +#define GIT_COMMIT_HASH $Format:%h$ #endif #ifndef GIT_COMMIT_HASH -#define GIT_COMMIT_HASH "0000000" +#define GIT_COMMIT_HASH 0000000 #endif #ifndef GIT_BRANCH -#define GIT_BRANCH "unknown" +#define GIT_BRANCH unknown +#endif + +#ifndef BACKEND_TYPE +#define BACKEND_TYPE unknown #endif #define XMR_STAK_NAME "xmr-stak" @@ -28,16 +32,6 @@ #define OS_TYPE "unk" #endif -#if !defined(CONF_NO_CUDA) && !defined(CONF_NO_OPENCL) -#define BACKEND_TYPE "cpu-nvidia-amd" -#elif !defined(CONF_NO_OPENCL) -#define BACKEND_TYPE "cpu-amd" -#elif !defined(CONF_NO_CUDA) -#define BACKEND_TYPE "cpu-nvidia" -#else -#define BACKEND_TYPE "cpu" -#endif - #if defined(CONF_NO_AEON) #define COIN_TYPE "monero" #elif defined(CONF_NO_MONERO) @@ -46,8 +40,11 @@ #define COIN_TYPE "aeon-monero" #endif -#define VERSION_LONG XMR_STAK_NAME "/" XMR_STAK_VERSION "/" GIT_COMMIT_HASH "/" GIT_BRANCH "/" OS_TYPE "/" BACKEND_TYPE "/" COIN_TYPE "/" -#define VERSION_SHORT XMR_STAK_NAME " " XMR_STAK_VERSION " " GIT_COMMIT_HASH +#define XMRSTAK_PP_TOSTRING1(str) #str +#define XMRSTAK_PP_TOSTRING(str) XMRSTAK_PP_TOSTRING1(str) + +#define VERSION_LONG XMR_STAK_NAME "/" XMR_STAK_VERSION "/" XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH) "/" XMRSTAK_PP_TOSTRING(GIT_BRANCH) "/" OS_TYPE "/" XMRSTAK_PP_TOSTRING(BACKEND_TYPE) "/" COIN_TYPE "/" +#define VERSION_SHORT XMR_STAK_NAME " " XMR_STAK_VERSION " " XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH) const char ver_long[] = VERSION_LONG; const char ver_short[] = VERSION_SHORT; -- cgit v1.1 From b48ca65c0bfd9b9ccda1083d2955c75ff9c10092 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 13 Nov 2017 19:56:41 +0000 Subject: Add version to web and json --- xmrstak/version.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'xmrstak/version.cpp') diff --git a/xmrstak/version.cpp b/xmrstak/version.cpp index 3cecc8f..3b8a19d 100644 --- a/xmrstak/version.cpp +++ b/xmrstak/version.cpp @@ -45,6 +45,8 @@ #define VERSION_LONG XMR_STAK_NAME "/" XMR_STAK_VERSION "/" XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH) "/" XMRSTAK_PP_TOSTRING(GIT_BRANCH) "/" OS_TYPE "/" XMRSTAK_PP_TOSTRING(BACKEND_TYPE) "/" COIN_TYPE "/" #define VERSION_SHORT XMR_STAK_NAME " " XMR_STAK_VERSION " " XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH) +#define VERSION_HTML "v" XMR_STAK_VERSION "-" XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH) const char ver_long[] = VERSION_LONG; const char ver_short[] = VERSION_SHORT; +const char ver_html[] = VERSION_HTML; -- cgit v1.1