X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fversion.cpp;h=54e32025b6c37fbf883449d667a92bb62f9c6324;hb=5a7a2125b6b4ed7d3ea55f333d0cf2345bd1d916;hp=60b7aae2e598204fe324c2755c46e88d6b3d30b1;hpb=e10622d1297e638109bbf58c35ad008f7acbae7c;p=novacoin.git

diff --git a/src/version.cpp b/src/version.cpp
index 60b7aae..54e3202 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -11,8 +11,32 @@
 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
+#ifdef __INTEL_COMPILER
+//code specific to intel compiler
+#define CL_NAME   "-icpc"
+#elif _MSC_VER
+//code specific to MSVC compiler
+#define CL_NAME   "-msvc"
+#elif __clang__
+//code specific to clang compiler
+#define CL_NAME   "-clang"
+#elif __MINGW32__
+//code specific to mingw compiler
+#define CL_NAME   "-mingw"
+#elif __GNUC__
+//code specific to gnu compiler
+#define CL_NAME   "-gcc"
+#else
+#define CL_NAME   "-genericcl"
+//others
+#endif
 
 // The following part of the code determines the CLIENT_BUILD variable.
 // Several mechanisms are used for this:
@@ -33,28 +57,34 @@ const std::string CLIENT_NAME("Satoshi");
 #    include "build.h"
 #endif
 
-// git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$
+// git will put "#define GIT_ARCHIVE 1" on the next line inside archives.
 #ifdef GIT_ARCHIVE
-#    define GIT_COMMIT_ID "$Format:%h$"
-#    define GIT_COMMIT_DATE "$Format:%cD"
+#define GIT_COMMIT_DATE "$Format:%cD$"
 #endif
 
-#define STRINGIFY(s) #s
+#define GIT_ARCHIVE 1
+#ifdef GIT_ARCHIVE
+#define GIT_COMMIT_ID "32a928e"
+#endif
 
-#define BUILD_DESC_FROM_COMMIT(maj,min,rev,build,commit) \
-    "v" STRINGIFY(maj) "." STRINGIFY(min) "." STRINGIFY(rev) "." STRINGIFY(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" STRINGIFY(maj) "." STRINGIFY(min) "." STRINGIFY(rev) "." STRINGIFY(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(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_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(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD)
+#        define BUILD_DESC BUILD_DESC_FROM_UNKNOWN(DISPLAY_VERSION_MAJOR, DISPLAY_VERSION_MINOR, DISPLAY_VERSION_REVISION)
 #    endif
 #endif
 
+#ifdef _MSC_VER
+#undef GIT_COMMIT_DATE
+#endif
+
 #ifndef BUILD_DATE
 #    ifdef GIT_COMMIT_DATE
 #        define BUILD_DATE GIT_COMMIT_DATE
@@ -63,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);