Skip to content

Commit 1062df8

Browse files
committed
Merge bitcoin/bitcoin#32634: build: Add resource file and manifest to bitcoin.exe
dbb2d4c windows: Add application manifest to `bitcoin.exe` (Hennadii Stepanov) df82c2d windows: Add resource file for `bitcoin.exe` (Hennadii Stepanov) Pull request description: This PR is a follow up to bitcoin/bitcoin#31375, which: 1. Adds a resource file for `bitcoin.exe` for consistency with other Windows executables. 2. Adds an application manifest to `bitcoin.exe`, which has been required for release binaries since bitcoin/bitcoin#32396. ACKs for top commit: davidgumberg: ACK bitcoin/bitcoin@dbb2d4c hodlinator: ACK dbb2d4c Tree-SHA512: 853c9e578bfd74bfd2e1f0fa39f978638723c8e061456caa165fca6f10497517f9503ae12dfb88e7229a02de593ccf22126f3362ca0d75c74becbb727e80c9ad
2 parents 370c592 + dbb2d4c commit 1062df8

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed

src/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,8 @@ target_link_libraries(bitcoin_node
335335
# Bitcoin wrapper executable that can call other executables.
336336
if(BUILD_BITCOIN_BIN)
337337
add_executable(bitcoin bitcoin.cpp)
338+
add_windows_resources(bitcoin bitcoin-res.rc)
339+
add_windows_application_manifest(bitcoin)
338340
target_link_libraries(bitcoin core_interface bitcoin_util)
339341
install_binary_component(bitcoin)
340342
endif()

src/bitcoin-res.rc

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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_BUILD
5+
#define VER_FILEVERSION VER_PRODUCTVERSION
6+
7+
VS_VERSION_INFO VERSIONINFO
8+
FILEVERSION VER_FILEVERSION
9+
PRODUCTVERSION VER_PRODUCTVERSION
10+
FILEOS VOS_NT_WINDOWS32
11+
FILETYPE VFT_APP
12+
BEGIN
13+
BLOCK "StringFileInfo"
14+
BEGIN
15+
BLOCK "040904E4" // U.S. English - multilingual (hex)
16+
BEGIN
17+
VALUE "CompanyName", "Bitcoin"
18+
VALUE "FileDescription", "bitcoin (Bitcoin wrapper executable that can call other executables)"
19+
VALUE "FileVersion", CLIENT_VERSION_STRING
20+
VALUE "InternalName", "bitcoin"
21+
VALUE "LegalCopyright", COPYRIGHT_STR
22+
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
23+
VALUE "OriginalFilename", "bitcoin.exe"
24+
VALUE "ProductName", "bitcoin"
25+
VALUE "ProductVersion", CLIENT_VERSION_STRING
26+
END
27+
END
28+
29+
BLOCK "VarFileInfo"
30+
BEGIN
31+
VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal)
32+
END
33+
END

0 commit comments

Comments
 (0)