Merge branch 'bump-ver-to-1.9.0.1' into 'dev'

Bump BCH Unlimited version 1.9.0.1

See merge request bitcoinunlimited/BCHUnlimited!2335

configure.ac

@@ -12,7 +12,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 9)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 0)  # version 99 here indicates an unreleased version
+define(_CLIENT_VERSION_BUILD, 1)  # version 99 here indicates an unreleased version
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2020)

src/clientversion.h

@@ -18,7 +18,7 @@
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 9
 #define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 0 // BU set version 99 to indicate an unreleased version
+#define CLIENT_VERSION_BUILD 1 // BU set version 99 to indicate an unreleased version
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

src/test/net_tests.cpp

@@ -223,10 +223,16 @@ BOOST_AUTO_TEST_CASE(test_userAgent)
     int *ptemp = &temp;
     std::string arch = (sizeof(ptemp) == 4) ? "32bit" : "64bit";
     mapArgs["-uacomment"] = uacomments[0];
+    std::string client_name(CLIENT_NAME);
 
-    const std::string versionMessage =
-        "/BCH Unlimited:" + std::to_string(CLIENT_VERSION_MAJOR) + "." + std::to_string(CLIENT_VERSION_MINOR) + "." +
-        std::to_string(CLIENT_VERSION_REVISION) + "(" + uacomments[0] + "; " + arch + ")/";
+    std::string versionMessage = "/" + client_name + ":" + std::to_string(CLIENT_VERSION_MAJOR) + "." +
+                                 std::to_string(CLIENT_VERSION_MINOR) + "." + std::to_string(CLIENT_VERSION_REVISION);
+
+    if (std::to_string(CLIENT_VERSION_BUILD) != "0")
+    {
+        versionMessage = versionMessage + "." + std::to_string(CLIENT_VERSION_BUILD);
+    }
+    versionMessage = versionMessage + "(" + uacomments[0] + "; " + arch + ")/";
 
     BOOST_CHECK_EQUAL(FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, uacomments), versionMessage);
 }