v1.7.11 (#538)

* v1.7.11

* Remove client version workaround

* Restore previous defining of CLIENT_VERSION

* Remove BUILD_VERSION

* Remove BUILD_VERSION from genbuild.sh

build_msvc/defi_config.h

@@ -14,10 +14,10 @@
 #define CLIENT_VERSION_MAJOR 1
 
 /* Minor version */
-#define CLIENT_VERSION_MINOR 0
+#define CLIENT_VERSION_MINOR 7
 
 /* Build revision */
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 11
 
 /* Copyright holder(s) before %s replacement */
 #define COPYRIGHT_HOLDERS "The %s Developers"
@@ -29,7 +29,7 @@
 #define COPYRIGHT_HOLDERS_SUBSTITUTION "DeFi Blockchain"
 
 /* Copyright year */
-#define COPYRIGHT_YEAR 2020
+#define COPYRIGHT_YEAR 2021
 
 /* Define to 1 to enable wallet functions */
 #define ENABLE_WALLET 1

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 7)
-define(_CLIENT_VERSION_REVISION, 10)
+define(_CLIENT_VERSION_REVISION, 11)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

make.sh

@@ -166,7 +166,7 @@ docker_build() {
         echo "> building: ${img}"
         local docker_file="${dockerfiles_dir}/${target}.dockerfile"
         echo "> docker build: ${img}"
-        docker build --build-arg BUILD_VERSION=${IMAGE_VERSION} -f "${docker_file}" -t "${img}" "${docker_context}"
+        docker build -f "${docker_file}" -t "${img}" "${docker_context}"
     done
 }
 

share/genbuild.sh

@@ -39,9 +39,7 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$
     git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
 fi
 
-if [ -n "$BUILD_VERSION" ]; then
-    NEWINFO="#define BUILD_DESC \"$BUILD_VERSION\""
-elif [ -n "$DESC" ]; then
+if [ -n "$DESC" ]; then
     NEWINFO="#define BUILD_DESC \"$DESC\""
 elif [ -n "$SUFFIX" ]; then
     NEWINFO="#define BUILD_SUFFIX $SUFFIX"

src/clientversion.cpp

@@ -86,17 +86,6 @@ std::string FormatFullVersion()
     return CLIENT_BUILD;
 }
 
-int GetClientVersion()
-{
-    // C++11 guarantees thread safe static initialization
-    static const int version = []() {
-        int major = 0, minor = 0, rev = 0;
-        sscanf(BUILD_DESC, "v%d.%d.%d", &major, &minor, &rev);
-        return major * 1000000 + minor * 10000 + rev * 100;
-    }();
-    return version;
-}
-
 /**
  * Format the subversion field according to BIP 14 spec (https://github.com/bitcoin/bips/blob/master/bip-0014.mediawiki)
  */

src/clientversion.h

@@ -35,12 +35,15 @@
 #include <string>
 #include <vector>
 
-#define CLIENT_VERSION GetClientVersion()
+static const int CLIENT_VERSION =
+        1000000 * CLIENT_VERSION_MAJOR
+        +   10000 * CLIENT_VERSION_MINOR
+        +     100 * CLIENT_VERSION_REVISION
+        +       1 * CLIENT_VERSION_BUILD;
 
 extern const std::string CLIENT_NAME;
 extern const std::string CLIENT_BUILD;
 
-int GetClientVersion();
 std::string FormatFullVersion();
 std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments);