Malleable keys: remove version byte

[novacoin.git] / src / version.cpp

diff --git a/src/version.cpp b/src/version.cpp
index b1398ce..e5d592d 100644 (file)
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -11,8 +11,35 @@
 const std::string CLIENT_NAME("Satoshi");
 
 // Client version number
-#define CLIENT_VERSION_SUFFIX   "-beta"
+#ifdef USE_LEVELDB
+#define CLIENT_VERSION_SUFFIX   "-leveldb"
+#else
+#define CLIENT_VERSION_SUFFIX   "-bdb"
+#endif
 
+// Compiler name
+#if defined(__GNUC__) && defined(__INTEL_COMPILER)
+/*code specific to linux icc compiler*/
+#define CL_NAME   "-icc"
+#else
+#ifdef __GNUC__
+/*code for GNU C compiler */
+#define CL_NAME   "-gcc"
+#elif _MSC_VER
+/*usually has the version number in _MSC_VER*/
+/*code specific to MSVC compiler*/
+#define CL_NAME   "-msvc"
+#elif __clang__
+/*code specific to clang compilers*/
+#define CL_NAME   "-clang"
+#elif __MINGW32__
+/*code specific to mingw compilers*/
+#define CL_NAME   "-mingw"
+#else
+#define CL_NAME   "-genericcl"
+/*others*/
+#endif
+#endif
 
 // The following part of the code determines the CLIENT_BUILD variable.
 // Several mechanisms are used for this:
@@ -40,17 +67,17 @@ const std::string CLIENT_NAME("Satoshi");
 #    define GIT_COMMIT_DATE "$Format:%cD"
 #endif
 
-#define BUILD_DESC_FROM_COMMIT(maj,min,rev,build,commit) \
-    "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-g" commit
+#define BUILD_DESC_FROM_COMMIT(maj,min,rev,commit) \
+    "nvc-v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-g" commit
 
-#define BUILD_DESC_FROM_UNKNOWN(maj,min,rev,build) \
-    "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-unk"
+#define BUILD_DESC_FROM_UNKNOWN(maj,min,rev) \
+    "nvc-v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-unk"
 
 #ifndef BUILD_DESC
 #    ifdef GIT_COMMIT_ID
-#        define BUILD_DESC BUILD_DESC_FROM_COMMIT(DISPLAY_VERSION_MAJOR, DISPLAY_VERSION_MINOR, DISPLAY_VERSION_REVISION, DISPLAY_VERSION_BUILD, GIT_COMMIT_ID)
+#        define BUILD_DESC BUILD_DESC_FROM_COMMIT(DISPLAY_VERSION_MAJOR, DISPLAY_VERSION_MINOR, DISPLAY_VERSION_REVISION, GIT_COMMIT_ID)
 #    else
-#        define BUILD_DESC BUILD_DESC_FROM_UNKNOWN(DISPLAY_VERSION_MAJOR, DISPLAY_VERSION_MINOR, DISPLAY_VERSION_REVISION, DISPLAY_VERSION_BUILD)
+#        define BUILD_DESC BUILD_DESC_FROM_UNKNOWN(DISPLAY_VERSION_MAJOR, DISPLAY_VERSION_MINOR, DISPLAY_VERSION_REVISION)
 #    endif
 #endif
 
@@ -66,5 +93,5 @@ const std::string CLIENT_NAME("Satoshi");
 #    endif
 #endif
 
-const std::string CLIENT_BUILD(BUILD_DESC CLIENT_VERSION_SUFFIX);
+const std::string CLIENT_BUILD(BUILD_DESC CLIENT_VERSION_SUFFIX CL_NAME);
 const std::string CLIENT_DATE(BUILD_DATE);