X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fversion.cpp;h=e5d592d68a06b5298b91cda500e43e8f8e50f662;hb=4a6759691d71bf2a7d2a0a9e4710f0887e66ab02;hp=0c1e8bfa8028715886caac6d6265c016bcd4ee0d;hpb=b87c0fc4403040185b625d1b21bbff0cb7c828d7;p=novacoin.git diff --git a/src/version.cpp b/src/version.cpp index 0c1e8bf..e5d592d 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying -// file license.txt or http://www.opensource.org/licenses/mit-license.php. +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include #include "version.h" @@ -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: @@ -33,28 +60,31 @@ 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. +#define GIT_ARCHIVE 1 #ifdef GIT_ARCHIVE -# define GIT_COMMIT_ID "$Format:%h$" +# define GIT_COMMIT_ID "32a928e" # define GIT_COMMIT_DATE "$Format:%cD" #endif -#define STRINGIFY(s) #s +#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_COMMIT(maj,min,rev,build,commit) \ - "v" STRINGIFY(maj) "." STRINGIFY(min) "." STRINGIFY(rev) "." STRINGIFY(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);