windows: Use predefined `RC_INVOKED` macro instead of custom one #32633

hebasto commented at 7:13 PM on May 28, 2025: member

See: https://learn.microsoft.com/en-us/windows/win32/menurc/predefined-macros.

hebasto added the label Windows on May 28, 2025

hebasto added the label Build system on May 28, 2025

DrahtBot commented at 7:13 PM on May 28, 2025: contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32633.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	hodlinator, fanquake

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

hodlinator approved

hodlinator commented at 7:39 PM on May 28, 2025: contributor

crACK b97fc15df593d42296015218db197f377a71461c

The custom WINDRES_PREPROC #define was only read in clientversion.h. The built-in RC_INVOKED #define in the resource compiler is more straight forward to use to skip over sections of files that compiler does not support.

fanquake commented at 10:08 AM on May 29, 2025: member

This needs rebasing for #32634; otherwise, I'm not sure how a release build of this was tested, given the Windows Guix build is broken in this branch.

windows: Use predefined `RC_INVOKED` macro instead of custom one 55f1c2ac8b

hebasto force-pushed on May 29, 2025

hebasto commented at 10:19 AM on May 29, 2025: member

This needs rebasing for #32634; otherwise, I'm not sure how a release build of this was tested, given the Windows Guix build is broken in this branch.

Sure! Rebased.

hodlinator approved

hodlinator commented at 11:32 AM on May 29, 2025: contributor

re-ACK 55f1c2ac8beb5ebebcaef0707d8cc3003e41d80e

Built x86_64-w64-mingw32 Guix build locally.

hebasto commented at 12:38 PM on May 29, 2025: member

My Guix build:

aarch64
90c59c671509f759cc862b4376b374ff36707a323eda619fed3f91cf322c0de5  guix-build-55f1c2ac8beb/output/aarch64-linux-gnu/SHA256SUMS.part
890e9ac6b9c445bc1fe799378d3c7f6a9ac3c6c2d650e70d1a251a23cca88394  guix-build-55f1c2ac8beb/output/aarch64-linux-gnu/bitcoin-55f1c2ac8beb-aarch64-linux-gnu-debug.tar.gz
13e21adc0e0f487e19649d468753c3565f60b20d5e021576cd27cdf6aad16640  guix-build-55f1c2ac8beb/output/aarch64-linux-gnu/bitcoin-55f1c2ac8beb-aarch64-linux-gnu.tar.gz
ee0faf9e0a05969973fd54b9c0ba15e4732779eacc5a374f637d835aa7aac62c  guix-build-55f1c2ac8beb/output/arm-linux-gnueabihf/SHA256SUMS.part
16338ed05163322b77f24f55e9ad41f2094d43f2fe08732c2d079ee3c93f022a  guix-build-55f1c2ac8beb/output/arm-linux-gnueabihf/bitcoin-55f1c2ac8beb-arm-linux-gnueabihf-debug.tar.gz
c7f94d171815bc172fb648520a34b8ba102d2e9843f2441ff28db2ea2dfa0b05  guix-build-55f1c2ac8beb/output/arm-linux-gnueabihf/bitcoin-55f1c2ac8beb-arm-linux-gnueabihf.tar.gz
0537630d6459a0f01f8fc45a7f5df88dc3a021f267cea47225df58647aa135e2  guix-build-55f1c2ac8beb/output/arm64-apple-darwin/SHA256SUMS.part
d7ae6b796114cc730123fb693f6a4cbc5c37220798fc345884e8998b50e8ad77  guix-build-55f1c2ac8beb/output/arm64-apple-darwin/bitcoin-55f1c2ac8beb-arm64-apple-darwin-codesigning.tar.gz
e5b1efdb1fa628457280cccc7a77c56e6845cff7678f19a4a13be1aceb9a2080  guix-build-55f1c2ac8beb/output/arm64-apple-darwin/bitcoin-55f1c2ac8beb-arm64-apple-darwin-unsigned.tar.gz
38305b66ec2919f3d9a7f79164da59609da8f7af08db3194374c3cd396e75d0a  guix-build-55f1c2ac8beb/output/arm64-apple-darwin/bitcoin-55f1c2ac8beb-arm64-apple-darwin-unsigned.zip
512632ba356a2e858091dca086221a1d16b9b3318cb44c0b513dde6548379888  guix-build-55f1c2ac8beb/output/dist-archive/bitcoin-55f1c2ac8beb.tar.gz
d7b2a957c0a793ceb1c513a5c44e216559947b0d73e7871892842c878869d94f  guix-build-55f1c2ac8beb/output/powerpc64-linux-gnu/SHA256SUMS.part
898d2168b6448b01d1d4f5440e0b7b080d05257ccf1ea4296e7a56cb568be689  guix-build-55f1c2ac8beb/output/powerpc64-linux-gnu/bitcoin-55f1c2ac8beb-powerpc64-linux-gnu-debug.tar.gz
85dbd50d13f3350953e177ce8338c0dd5668debfe3fd38e13ee43e1b61b4a431  guix-build-55f1c2ac8beb/output/powerpc64-linux-gnu/bitcoin-55f1c2ac8beb-powerpc64-linux-gnu.tar.gz
77693014db6da1e0e4ffd5f8af926d4c8a281cab4ccc275f4cd56d790e66fa6e  guix-build-55f1c2ac8beb/output/riscv64-linux-gnu/SHA256SUMS.part
5fe0bfd79022152cf2d0580f73edc757f739d96023cce8c2697395367260ee0b  guix-build-55f1c2ac8beb/output/riscv64-linux-gnu/bitcoin-55f1c2ac8beb-riscv64-linux-gnu-debug.tar.gz
f61d537f49292f2d293dd54ecae08abdbb7dd0ecc21b6f78e2e30775d9881207  guix-build-55f1c2ac8beb/output/riscv64-linux-gnu/bitcoin-55f1c2ac8beb-riscv64-linux-gnu.tar.gz
8c2cdf03900513286e0ed2d2954394f264d10e0092a44d6875c1c50f26bdc706  guix-build-55f1c2ac8beb/output/x86_64-apple-darwin/SHA256SUMS.part
863c6d852a80a4f256feeda2866611b9a8b4e901df5c40e0df5c478d1e8080fc  guix-build-55f1c2ac8beb/output/x86_64-apple-darwin/bitcoin-55f1c2ac8beb-x86_64-apple-darwin-codesigning.tar.gz
6d99c5aa3f56520119e6ae059359fd460c6f2b50e9d563e0dc9d23bf9a4a1ee6  guix-build-55f1c2ac8beb/output/x86_64-apple-darwin/bitcoin-55f1c2ac8beb-x86_64-apple-darwin-unsigned.tar.gz
665558381ee12901c5b1e7de9606f5123bee81b0ea8d3ca82b9202556ee02887  guix-build-55f1c2ac8beb/output/x86_64-apple-darwin/bitcoin-55f1c2ac8beb-x86_64-apple-darwin-unsigned.zip
5af8e1f2ee0b81d33a28f3bddefe84f8e69a810bf520a08b75fbb92fb17c0012  guix-build-55f1c2ac8beb/output/x86_64-linux-gnu/SHA256SUMS.part
c733984b5a957ed96edfd70e597ab2716d04d12b59d11c0a969c5d05fb77f8b9  guix-build-55f1c2ac8beb/output/x86_64-linux-gnu/bitcoin-55f1c2ac8beb-x86_64-linux-gnu-debug.tar.gz
edeffd0d66afa84690948d1d831b896aef2b73f1495f75b7bccca2e88e50a444  guix-build-55f1c2ac8beb/output/x86_64-linux-gnu/bitcoin-55f1c2ac8beb-x86_64-linux-gnu.tar.gz
18079f9eaa6b541fc2d4d425de55e10a8fec1fc7a549f4ac7dcf25275d632e0e  guix-build-55f1c2ac8beb/output/x86_64-w64-mingw32/SHA256SUMS.part
0d548fc0b8de0a087644930b52e8ef8b6fce93e73e1a4ff30076efee9075993e  guix-build-55f1c2ac8beb/output/x86_64-w64-mingw32/bitcoin-55f1c2ac8beb-win64-codesigning.tar.gz
50dfa21fba79537a7f1ddb9e870931f72fc96cc5888a70695c6fb9392f043c37  guix-build-55f1c2ac8beb/output/x86_64-w64-mingw32/bitcoin-55f1c2ac8beb-win64-debug.zip
d5050fd62d81535a2c074f61a5d5aba6e83ecfe60451db8d60cea6c0e98654aa  guix-build-55f1c2ac8beb/output/x86_64-w64-mingw32/bitcoin-55f1c2ac8beb-win64-setup-unsigned.exe
0640a1c640e827d76c43ab76d415ad417125067b1fbecc87a8235a3bcea7fbcf  guix-build-55f1c2ac8beb/output/x86_64-w64-mingw32/bitcoin-55f1c2ac8beb-win64-unsigned.zip

fanquake commented at 12:49 PM on May 29, 2025: member

Guix Build (win):

512632ba356a2e858091dca086221a1d16b9b3318cb44c0b513dde6548379888  guix-build-55f1c2ac8beb/output/dist-archive/bitcoin-55f1c2ac8beb.tar.gz
18079f9eaa6b541fc2d4d425de55e10a8fec1fc7a549f4ac7dcf25275d632e0e  guix-build-55f1c2ac8beb/output/x86_64-w64-mingw32/SHA256SUMS.part
0d548fc0b8de0a087644930b52e8ef8b6fce93e73e1a4ff30076efee9075993e  guix-build-55f1c2ac8beb/output/x86_64-w64-mingw32/bitcoin-55f1c2ac8beb-win64-codesigning.tar.gz
50dfa21fba79537a7f1ddb9e870931f72fc96cc5888a70695c6fb9392f043c37  guix-build-55f1c2ac8beb/output/x86_64-w64-mingw32/bitcoin-55f1c2ac8beb-win64-debug.zip
d5050fd62d81535a2c074f61a5d5aba6e83ecfe60451db8d60cea6c0e98654aa  guix-build-55f1c2ac8beb/output/x86_64-w64-mingw32/bitcoin-55f1c2ac8beb-win64-setup-unsigned.exe
0640a1c640e827d76c43ab76d415ad417125067b1fbecc87a8235a3bcea7fbcf  guix-build-55f1c2ac8beb/output/x86_64-w64-mingw32/bitcoin-55f1c2ac8beb-win64-unsigned.zip

fanquake approved

fanquake commented at 12:50 PM on May 29, 2025: member

ACK 55f1c2ac8beb5ebebcaef0707d8cc3003e41d80e

fanquake merged this on May 29, 2025

fanquake closed this on May 29, 2025

hebasto deleted the branch on May 29, 2025

sedited referenced this in commit f236a50dc1 on Jun 14, 2025

yuvicc referenced this in commit 069643f094 on Jul 6, 2025

yuvicc referenced this in commit 22f55cf11d on Aug 26, 2025

bug-castercv502 referenced this in commit cfdba67027 on Sep 28, 2025

stickies-v referenced this in commit a19c56cd7c on Nov 4, 2025

Kino1994 referenced this in commit 7d3d6da6ff on Jun 28, 2026

BigcoinBGC referenced this in commit ce38a44f31 on Jun 30, 2026

bitcoin locked this on Jul 30, 2026