Skip to content

Commit cc24610

Browse files
committed
Update Windows resource files (and add one for bitcoin-tx)
1 parent 18d2832 commit cc24610

File tree

5 files changed

+44
-5
lines changed

5 files changed

+44
-5
lines changed

src/Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,10 @@ bitcoin_tx_SOURCES = bitcoin-tx.cpp
347347
bitcoin_tx_CPPFLAGS = $(BITCOIN_INCLUDES)
348348
bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
349349

350+
if TARGET_WINDOWS
351+
bitcoin_tx_SOURCES += bitcoin-tx-res.rc
352+
endif
353+
350354
bitcoin_tx_LDADD = \
351355
$(LIBBITCOIN_UNIVALUE) \
352356
$(LIBBITCOIN_COMMON) \

src/bitcoin-cli-res.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ BEGIN
1717
BLOCK "040904E4" // U.S. English - multilingual (hex)
1818
BEGIN
1919
VALUE "CompanyName", "Bitcoin"
20-
VALUE "FileDescription", "Bitcoin-cli (OSS RPC client for Bitcoin)"
20+
VALUE "FileDescription", "bitcoin-cli (JSON-RPC client for Bitcoin Core)"
2121
VALUE "FileVersion", VER_FILEVERSION_STR
2222
VALUE "InternalName", "bitcoin-cli"
2323
VALUE "LegalCopyright", COPYRIGHT_STR
2424
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
2525
VALUE "OriginalFilename", "bitcoin-cli.exe"
26-
VALUE "ProductName", "Bitcoin-cli"
26+
VALUE "ProductName", "bitcoin-cli"
2727
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
2828
END
2929
END

src/bitcoin-tx-res.rc

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#include <windows.h> // needed for VERSIONINFO
2+
#include "clientversion.h" // holds the needed client version information
3+
4+
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
5+
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
6+
#define VER_FILEVERSION VER_PRODUCTVERSION
7+
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
8+
9+
VS_VERSION_INFO VERSIONINFO
10+
FILEVERSION VER_FILEVERSION
11+
PRODUCTVERSION VER_PRODUCTVERSION
12+
FILEOS VOS_NT_WINDOWS32
13+
FILETYPE VFT_APP
14+
BEGIN
15+
BLOCK "StringFileInfo"
16+
BEGIN
17+
BLOCK "040904E4" // U.S. English - multilingual (hex)
18+
BEGIN
19+
VALUE "CompanyName", "Bitcoin"
20+
VALUE "FileDescription", "bitcoin-tx (CLI Bitcoin transaction editor utility)"
21+
VALUE "FileVersion", VER_FILEVERSION_STR
22+
VALUE "InternalName", "bitcoin-tx"
23+
VALUE "LegalCopyright", COPYRIGHT_STR
24+
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
25+
VALUE "OriginalFilename", "bitcoin-tx.exe"
26+
VALUE "ProductName", "bitcoin-tx"
27+
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
28+
END
29+
END
30+
31+
BLOCK "VarFileInfo"
32+
BEGIN
33+
VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal)
34+
END
35+
END

src/bitcoind-res.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ BEGIN
1717
BLOCK "040904E4" // U.S. English - multilingual (hex)
1818
BEGIN
1919
VALUE "CompanyName", "Bitcoin"
20-
VALUE "FileDescription", "Bitcoind (OSS daemon/client for Bitcoin)"
20+
VALUE "FileDescription", "bitcoind (Bitcoin node with a JSON-RPC server)"
2121
VALUE "FileVersion", VER_FILEVERSION_STR
2222
VALUE "InternalName", "bitcoind"
2323
VALUE "LegalCopyright", COPYRIGHT_STR
2424
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
2525
VALUE "OriginalFilename", "bitcoind.exe"
26-
VALUE "ProductName", "Bitcoind"
26+
VALUE "ProductName", "bitcoind"
2727
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
2828
END
2929
END

src/qt/res/bitcoin-qt-res.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ BEGIN
1919
BLOCK "040904E4" // U.S. English - multilingual (hex)
2020
BEGIN
2121
VALUE "CompanyName", "Bitcoin"
22-
VALUE "FileDescription", "Bitcoin Core (OSS GUI client for Bitcoin)"
22+
VALUE "FileDescription", "Bitcoin Core (GUI node for Bitcoin)"
2323
VALUE "FileVersion", VER_FILEVERSION_STR
2424
VALUE "InternalName", "bitcoin-qt"
2525
VALUE "LegalCopyright", COPYRIGHT_STR

0 commit comments

Comments
 (0)