Merge bitcoin#22724: windres: use PACKAGE_VERSION rather than buildin…

…g more version numbers f12fbad windres: use PACKAGE_VERSION rather than building more version numbers (fanquake) Pull request description: Rather than defining more strings, reuse PACKAGE_VERSION, which is already available. We also already use PACKAGE_VERSION for `ProductVersion` and `FileVersion` in setup.nsi. ACKs for top commit: MarcoFalke: cr ACK f12fbad laanwj: Code review ACK f12fbad Tree-SHA512: b74a37cbba105d208d4da9264d295d7e052009fdd6b0ed54a0d9968bbe2deeba1766d6d310438b2939a81555faa0cbd67d5e53f0c8a2de669ce56353c1c67d22
PastaPastaPasta · Sep 27, 2024 · 7bb1d0e · 7bb1d0e
1 parent 6bee8e2
commit 7bb1d0e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 20 deletions.
diff --git a/src/dash-cli-res.rc b/src/dash-cli-res.rc
@@ -2,9 +2,7 @@
 #include "clientversion.h"       // holds the needed client version information
 
 #define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
-#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
 #define VER_FILEVERSION        VER_PRODUCTVERSION
-#define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
@@ -18,13 +16,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName",        "Dash"
             VALUE "FileDescription",    "dash-cli (JSON-RPC client for " PACKAGE_NAME ")"
-            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "FileVersion",        PACKAGE_VERSION
             VALUE "InternalName",       "dash-cli"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
             VALUE "OriginalFilename",   "dash-cli.exe"
             VALUE "ProductName",        "dash-cli"
-            VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
+            VALUE "ProductVersion",     PACKAGE_VERSION
         END
     END
 

diff --git a/src/dash-tx-res.rc b/src/dash-tx-res.rc
@@ -2,9 +2,7 @@
 #include "clientversion.h"       // holds the needed client version information
 
 #define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
-#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
 #define VER_FILEVERSION        VER_PRODUCTVERSION
-#define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
@@ -18,13 +16,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName",        "Dash"
             VALUE "FileDescription",    "dash-tx (CLI Dash transaction editor utility)"
-            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "FileVersion",        PACKAGE_VERSION
             VALUE "InternalName",       "dash-tx"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
             VALUE "OriginalFilename",   "dash-tx.exe"
             VALUE "ProductName",        "dash-tx"
-            VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
+            VALUE "ProductVersion",     PACKAGE_VERSION
         END
     END
 

diff --git a/src/dash-wallet-res.rc b/src/dash-wallet-res.rc
@@ -2,9 +2,7 @@
 #include "clientversion.h"       // holds the needed client version information
 
 #define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
-#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
 #define VER_FILEVERSION        VER_PRODUCTVERSION
-#define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
@@ -18,13 +16,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName",        "Dash Core"
             VALUE "FileDescription",    "dash-wallet (CLI tool for " PACKAGE_NAME " wallets)"
-            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "FileVersion",        PACKAGE_VERSION
             VALUE "InternalName",       "dash-wallet"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
             VALUE "OriginalFilename",   "dash-wallet.exe"
             VALUE "ProductName",        "dash-wallet"
-            VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
+            VALUE "ProductVersion",     PACKAGE_VERSION
         END
     END
 

diff --git a/src/dashd-res.rc b/src/dashd-res.rc
@@ -2,9 +2,7 @@
 #include "clientversion.h"       // holds the needed client version information
 
 #define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
-#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
 #define VER_FILEVERSION        VER_PRODUCTVERSION
-#define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
@@ -18,13 +16,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName",        "Dash"
             VALUE "FileDescription",    "dashd (Dash node with a JSON-RPC server)"
-            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "FileVersion",        PACKAGE_VERSION
             VALUE "InternalName",       "dashd"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
             VALUE "OriginalFilename",   "dashd.exe"
             VALUE "ProductName",        "dashd"
-            VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
+            VALUE "ProductVersion",     PACKAGE_VERSION
         END
     END
 

diff --git a/src/qt/res/dash-qt-res.rc b/src/qt/res/dash-qt-res.rc
@@ -5,9 +5,7 @@ IDI_ICON2 ICON DISCARDABLE "icons/dash_testnet.ico"
 #include "../../clientversion.h" // holds the needed client version information
 
 #define VER_PRODUCTVERSION     CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
-#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
 #define VER_FILEVERSION        VER_PRODUCTVERSION
-#define VER_FILEVERSION_STR    VER_PRODUCTVERSION_STR
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
@@ -21,13 +19,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName",        "Dash"
             VALUE "FileDescription",    PACKAGE_NAME " (GUI node for Dash)"
-            VALUE "FileVersion",        VER_FILEVERSION_STR
+            VALUE "FileVersion",        PACKAGE_VERSION
             VALUE "InternalName",       "dash-qt"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
             VALUE "OriginalFilename",   "dash-qt.exe"
             VALUE "ProductName",        PACKAGE_NAME
-            VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
+            VALUE "ProductVersion",     PACKAGE_VERSION
         END
     END