From cf1c71b5e2173cf5bfe94b3794a6776fc9a89946 Mon Sep 17 00:00:00 2001 From: MASM fan Date: Thu, 11 Dec 2014 21:25:27 +0400 Subject: [PATCH] Bump version to 0.5.0 --- src/version.cpp | 12 ++++++------ src/version.h | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/version.cpp b/src/version.cpp index b1398ce..5b501b6 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -40,17 +40,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 diff --git a/src/version.h b/src/version.h index fd6aa43..aa725da 100644 --- a/src/version.h +++ b/src/version.h @@ -50,8 +50,7 @@ static const int BIP0031_VERSION = 60000; static const int MEMPOOL_GD_VERSION = 60002; #define DISPLAY_VERSION_MAJOR 0 -#define DISPLAY_VERSION_MINOR 4 -#define DISPLAY_VERSION_REVISION 4 -#define DISPLAY_VERSION_BUILD 6 +#define DISPLAY_VERSION_MINOR 5 +#define DISPLAY_VERSION_REVISION 0 #endif -- 1.7.1