windres: use PACKAGE_VERSION rather than building more version numbers #22724

fanquake commented at 9:55 AM on August 17, 2021: member

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.

windres: use PACKAGE_VERSION rather than building more version numbers

Rather than defining more strings, reuse PACKAGE_VERSION, which is
already available.

We already use PACKAGE_VERSION for `ProductVersion` and `FileVersion` in setup.nsi.

f12fbad5a1

fanquake added the label Build system on Aug 17, 2021

fanquake added the label Windows on Aug 17, 2021

MarcoFalke added the label DrahtBot Guix build requested on Aug 17, 2021

MarcoFalke commented at 12:58 PM on August 17, 2021: member

cr ACK f12fbad5a1852706184082c68655fafad4bb9fe1

fanquake commented at 1:49 AM on August 18, 2021: member

Guix build:

66e4e416537e60bc72502db325eca9f7c122193f85ae50602aab060987b223b2  guix-build-f12fbad5a185/output/aarch64-linux-gnu/SHA256SUMS.part
c0896cf12a2feb9264627147e9dcd7c614685a6335dd2ebd8e67179769896ed3  guix-build-f12fbad5a185/output/aarch64-linux-gnu/bitcoin-f12fbad5a185-aarch64-linux-gnu-debug.tar.gz
9bb50b554f829c2ceb3d8d8e3475b1a8bafad9ebf291fe79b62823ed2075236a  guix-build-f12fbad5a185/output/aarch64-linux-gnu/bitcoin-f12fbad5a185-aarch64-linux-gnu.tar.gz
88ccebd7030c1dd9ecc38303c97704031cff55379cfe07fed7b950870126d2c6  guix-build-f12fbad5a185/output/arm-linux-gnueabihf/SHA256SUMS.part
9bd87c508c4f1a9275fa423b04fc7e6313a8e7345c6bb00c1277447a48975f3b  guix-build-f12fbad5a185/output/arm-linux-gnueabihf/bitcoin-f12fbad5a185-arm-linux-gnueabihf-debug.tar.gz
b9ce8908ff4386991b3a717414bb0430453097f5a3f093be22c898f2cae432d6  guix-build-f12fbad5a185/output/arm-linux-gnueabihf/bitcoin-f12fbad5a185-arm-linux-gnueabihf.tar.gz
4116a4f41fa29c98f06aec62a2978f30ebc494c5914bb3e5224907a56ae88b54  guix-build-f12fbad5a185/output/dist-archive/bitcoin-f12fbad5a185.tar.gz
e09b0641648c4560b1b90508aca2fa49f2e65a9897eb8fcdadf681d1327f8b61  guix-build-f12fbad5a185/output/powerpc64-linux-gnu/SHA256SUMS.part
6c590d736246098c1516fc6093e396d9737dc0a28eb0b23f4df5d4ee84ab23c7  guix-build-f12fbad5a185/output/powerpc64-linux-gnu/bitcoin-f12fbad5a185-powerpc64-linux-gnu-debug.tar.gz
809d49cc29157e0a9de33696019a6bda5f6bdf759757da39c191ec23fe5c3005  guix-build-f12fbad5a185/output/powerpc64-linux-gnu/bitcoin-f12fbad5a185-powerpc64-linux-gnu.tar.gz
925b28b7c597efda7f6fd03b9a91e6bccf20f65936af8f6225f41b87b76ce06a  guix-build-f12fbad5a185/output/powerpc64le-linux-gnu/SHA256SUMS.part
3f7e26e354b12c9cd6322763425c2971328d6c85f6170cfd6134f18f72b55f6a  guix-build-f12fbad5a185/output/powerpc64le-linux-gnu/bitcoin-f12fbad5a185-powerpc64le-linux-gnu-debug.tar.gz
43ac2b08ad5b5e64ff66c80a552f04f6ea8c63f61dd1f0aa7c3c29c401dca05f  guix-build-f12fbad5a185/output/powerpc64le-linux-gnu/bitcoin-f12fbad5a185-powerpc64le-linux-gnu.tar.gz
e7f82e7bad1daf60d12dbc42b2fac49f4c7062e4c9b39cc8f7f6764caf8ca975  guix-build-f12fbad5a185/output/riscv64-linux-gnu/SHA256SUMS.part
fd2026aa9b0bc274c63f1b6194b05b9e11572d9e9b859f75ede9dc2a13002d05  guix-build-f12fbad5a185/output/riscv64-linux-gnu/bitcoin-f12fbad5a185-riscv64-linux-gnu-debug.tar.gz
294c81e9b2b8e44c7a5bb71f70ac63972fdc097fed6d2f6d9c453801e170516a  guix-build-f12fbad5a185/output/riscv64-linux-gnu/bitcoin-f12fbad5a185-riscv64-linux-gnu.tar.gz
2d888256ea1910034d89f7c0e1121dcabb4c1a3919fb35e3c108d3b677cdb472  guix-build-f12fbad5a185/output/x86_64-apple-darwin18/SHA256SUMS.part
56a9a651d0349a19e24e85c4e4e17f83c7e02c0275de1231e404fae4760c2014  guix-build-f12fbad5a185/output/x86_64-apple-darwin18/bitcoin-f12fbad5a185-osx-unsigned.dmg
1849d8045c19111291ecce2e5880ae0a9d1e8a593a55386eb91fd797f0c36f0c  guix-build-f12fbad5a185/output/x86_64-apple-darwin18/bitcoin-f12fbad5a185-osx-unsigned.tar.gz
e4174792350605398f6a72c6a6408b3688537678c6c16a08e8109b751f70fe24  guix-build-f12fbad5a185/output/x86_64-apple-darwin18/bitcoin-f12fbad5a185-osx64.tar.gz
eba8443129e216633b55eaeced25b8eebb0993b68515140aae21be7c6fa25706  guix-build-f12fbad5a185/output/x86_64-linux-gnu/SHA256SUMS.part
05f8fcfafd126a6542ff1ca6e0551284afcd748278426e47513c14f3fc45a989  guix-build-f12fbad5a185/output/x86_64-linux-gnu/bitcoin-f12fbad5a185-x86_64-linux-gnu-debug.tar.gz
0ccff593351dece86321fb2fd6c2f2e4d48efab133ac7e7c45b966a181a6ffe1  guix-build-f12fbad5a185/output/x86_64-linux-gnu/bitcoin-f12fbad5a185-x86_64-linux-gnu.tar.gz
b3f8cf3fde2ddbcb455fa0568ad299e837fd293cb43cfdd488428587c5acd8b3  guix-build-f12fbad5a185/output/x86_64-w64-mingw32/SHA256SUMS.part
c9c24a1925c615f92ba0c7d9166c27c8688e4b3d2d27fb42e53084dc752877e2  guix-build-f12fbad5a185/output/x86_64-w64-mingw32/bitcoin-f12fbad5a185-win-unsigned.tar.gz
fd2bba70034e5a838395228b1b951dfed8d3431e9a13baa31371cc1021b0a67e  guix-build-f12fbad5a185/output/x86_64-w64-mingw32/bitcoin-f12fbad5a185-win64-debug.zip
0803c10e2dae3db531c7b4c01e8abeb58f40eec03a89f2c14d8b043fd9c6a77f  guix-build-f12fbad5a185/output/x86_64-w64-mingw32/bitcoin-f12fbad5a185-win64-setup-unsigned.exe
8e4e07bfcf6e4b3bec5840d2f73a3e952253686e2612f304f54ff3408a6bcc87  guix-build-f12fbad5a185/output/x86_64-w64-mingw32/bitcoin-f12fbad5a185-win64.zip

laanwj commented at 3:33 PM on August 18, 2021: member

Looking at the output in bitcoin_config.h PACKAGE_VERSION is defined in the same way so there should be no user-visible change. I cannot find it being defined anywhere (at a higher level) so I suppose it's part of the autoconf system.

Code review ACK f12fbad5a1852706184082c68655fafad4bb9fe1

jarolrod commented at 8:18 PM on August 18, 2021: member

Contributing GUIX hashes, mine match @fanquake

find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum

66e4e416537e60bc72502db325eca9f7c122193f85ae50602aab060987b223b2  guix-build-f12fbad5a185/output/aarch64-linux-gnu/SHA256SUMS.part
c0896cf12a2feb9264627147e9dcd7c614685a6335dd2ebd8e67179769896ed3  guix-build-f12fbad5a185/output/aarch64-linux-gnu/bitcoin-f12fbad5a185-aarch64-linux-gnu-debug.tar.gz
9bb50b554f829c2ceb3d8d8e3475b1a8bafad9ebf291fe79b62823ed2075236a  guix-build-f12fbad5a185/output/aarch64-linux-gnu/bitcoin-f12fbad5a185-aarch64-linux-gnu.tar.gz
88ccebd7030c1dd9ecc38303c97704031cff55379cfe07fed7b950870126d2c6  guix-build-f12fbad5a185/output/arm-linux-gnueabihf/SHA256SUMS.part
9bd87c508c4f1a9275fa423b04fc7e6313a8e7345c6bb00c1277447a48975f3b  guix-build-f12fbad5a185/output/arm-linux-gnueabihf/bitcoin-f12fbad5a185-arm-linux-gnueabihf-debug.tar.gz
b9ce8908ff4386991b3a717414bb0430453097f5a3f093be22c898f2cae432d6  guix-build-f12fbad5a185/output/arm-linux-gnueabihf/bitcoin-f12fbad5a185-arm-linux-gnueabihf.tar.gz
4116a4f41fa29c98f06aec62a2978f30ebc494c5914bb3e5224907a56ae88b54  guix-build-f12fbad5a185/output/dist-archive/bitcoin-f12fbad5a185.tar.gz
e09b0641648c4560b1b90508aca2fa49f2e65a9897eb8fcdadf681d1327f8b61  guix-build-f12fbad5a185/output/powerpc64-linux-gnu/SHA256SUMS.part
6c590d736246098c1516fc6093e396d9737dc0a28eb0b23f4df5d4ee84ab23c7  guix-build-f12fbad5a185/output/powerpc64-linux-gnu/bitcoin-f12fbad5a185-powerpc64-linux-gnu-debug.tar.gz
809d49cc29157e0a9de33696019a6bda5f6bdf759757da39c191ec23fe5c3005  guix-build-f12fbad5a185/output/powerpc64-linux-gnu/bitcoin-f12fbad5a185-powerpc64-linux-gnu.tar.gz
925b28b7c597efda7f6fd03b9a91e6bccf20f65936af8f6225f41b87b76ce06a  guix-build-f12fbad5a185/output/powerpc64le-linux-gnu/SHA256SUMS.part
3f7e26e354b12c9cd6322763425c2971328d6c85f6170cfd6134f18f72b55f6a  guix-build-f12fbad5a185/output/powerpc64le-linux-gnu/bitcoin-f12fbad5a185-powerpc64le-linux-gnu-debug.tar.gz
43ac2b08ad5b5e64ff66c80a552f04f6ea8c63f61dd1f0aa7c3c29c401dca05f  guix-build-f12fbad5a185/output/powerpc64le-linux-gnu/bitcoin-f12fbad5a185-powerpc64le-linux-gnu.tar.gz
e7f82e7bad1daf60d12dbc42b2fac49f4c7062e4c9b39cc8f7f6764caf8ca975  guix-build-f12fbad5a185/output/riscv64-linux-gnu/SHA256SUMS.part
fd2026aa9b0bc274c63f1b6194b05b9e11572d9e9b859f75ede9dc2a13002d05  guix-build-f12fbad5a185/output/riscv64-linux-gnu/bitcoin-f12fbad5a185-riscv64-linux-gnu-debug.tar.gz
294c81e9b2b8e44c7a5bb71f70ac63972fdc097fed6d2f6d9c453801e170516a  guix-build-f12fbad5a185/output/riscv64-linux-gnu/bitcoin-f12fbad5a185-riscv64-linux-gnu.tar.gz
2d888256ea1910034d89f7c0e1121dcabb4c1a3919fb35e3c108d3b677cdb472  guix-build-f12fbad5a185/output/x86_64-apple-darwin18/SHA256SUMS.part
56a9a651d0349a19e24e85c4e4e17f83c7e02c0275de1231e404fae4760c2014  guix-build-f12fbad5a185/output/x86_64-apple-darwin18/bitcoin-f12fbad5a185-osx-unsigned.dmg
1849d8045c19111291ecce2e5880ae0a9d1e8a593a55386eb91fd797f0c36f0c  guix-build-f12fbad5a185/output/x86_64-apple-darwin18/bitcoin-f12fbad5a185-osx-unsigned.tar.gz
e4174792350605398f6a72c6a6408b3688537678c6c16a08e8109b751f70fe24  guix-build-f12fbad5a185/output/x86_64-apple-darwin18/bitcoin-f12fbad5a185-osx64.tar.gz
eba8443129e216633b55eaeced25b8eebb0993b68515140aae21be7c6fa25706  guix-build-f12fbad5a185/output/x86_64-linux-gnu/SHA256SUMS.part
05f8fcfafd126a6542ff1ca6e0551284afcd748278426e47513c14f3fc45a989  guix-build-f12fbad5a185/output/x86_64-linux-gnu/bitcoin-f12fbad5a185-x86_64-linux-gnu-debug.tar.gz
0ccff593351dece86321fb2fd6c2f2e4d48efab133ac7e7c45b966a181a6ffe1  guix-build-f12fbad5a185/output/x86_64-linux-gnu/bitcoin-f12fbad5a185-x86_64-linux-gnu.tar.gz
b3f8cf3fde2ddbcb455fa0568ad299e837fd293cb43cfdd488428587c5acd8b3  guix-build-f12fbad5a185/output/x86_64-w64-mingw32/SHA256SUMS.part
c9c24a1925c615f92ba0c7d9166c27c8688e4b3d2d27fb42e53084dc752877e2  guix-build-f12fbad5a185/output/x86_64-w64-mingw32/bitcoin-f12fbad5a185-win-unsigned.tar.gz
fd2bba70034e5a838395228b1b951dfed8d3431e9a13baa31371cc1021b0a67e  guix-build-f12fbad5a185/output/x86_64-w64-mingw32/bitcoin-f12fbad5a185-win64-debug.zip
0803c10e2dae3db531c7b4c01e8abeb58f40eec03a89f2c14d8b043fd9c6a77f  guix-build-f12fbad5a185/output/x86_64-w64-mingw32/bitcoin-f12fbad5a185-win64-setup-unsigned.exe
8e4e07bfcf6e4b3bec5840d2f73a3e952253686e2612f304f54ff3408a6bcc87  guix-build-f12fbad5a185/output/x86_64-w64-mingw32/bitcoin-f12fbad5a185-win64.zip

fanquake merged this on Aug 18, 2021

fanquake closed this on Aug 18, 2021

fanquake deleted the branch on Aug 18, 2021

MarcoFalke removed the label DrahtBot Guix build requested on Aug 19, 2021

DrahtBot commented at 6:35 AM on August 19, 2021: member

Guix builds

File	commit bb9f76a7194a665effab169d228bb8cbc66ccf86<br>(master)	commit af8cfcf0abf506f1c1c44a1ea13cfa3a37e0a988<br>(master and this pull)
SHA256SUMS.part	`b3deb620dfc476a6...`	`d03c21f6cdc88faa...`
*-aarch64-linux-gnu-debug.tar.gz	`3cd5aef60a69bad7...`	`6940f2d28d7d1aba...`
*-aarch64-linux-gnu.tar.gz	`66f9d2a2c1bff306...`	`a483b9ba5d0f5d24...`
*-arm-linux-gnueabihf-debug.tar.gz	`b8bdd0231d6981bf...`	`386ae306585dc634...`
*-arm-linux-gnueabihf.tar.gz	`08cba636b8a4010c...`	`6a49ad016050f620...`
*-osx-unsigned.dmg	`c8d685a83f152640...`	`6a4659ad4d5e709f...`
*-osx-unsigned.tar.gz	`4f770ddc7a365181...`	`70efbc0eee2f7b18...`
*-osx64.tar.gz	`143a8b6ed1db2914...`	`840582743c0e334b...`
*-powerpc64-linux-gnu-debug.tar.gz	`f97f73484b48ec4b...`	`d08ef122b926fc41...`
*-powerpc64-linux-gnu.tar.gz	`2c0a19ded438a665...`	`c0ae0b878e744e17...`
*-powerpc64le-linux-gnu-debug.tar.gz	`8225d98f73463a85...`	`6a2b18a46944cd46...`
*-powerpc64le-linux-gnu.tar.gz	`d2ecce465ad0d5a0...`	`8edad36124519515...`
*-riscv64-linux-gnu-debug.tar.gz	`b5e399dbd98fa3bb...`	`77bebc03d41752ba...`
*-riscv64-linux-gnu.tar.gz	`4876fc4dd97e2e2b...`	`f3e08361c45ce36a...`
*-win-unsigned.tar.gz	`5f727f29768d3ff2...`	`a9a66311e8f04216...`
*-win64-debug.zip	`f859183ce4bac93d...`	`c5356b0c105f89e8...`
*-win64-setup-unsigned.exe	`f7fd93c8e80cceb7...`	`856f18d0823d8788...`
*-win64.zip	`86f3021d85073caa...`	`f0cbc9af9dad7691...`
*-x86_64-linux-gnu-debug.tar.gz	`94769634c3debda7...`	`35b90daea3886752...`
*-x86_64-linux-gnu.tar.gz	`354501c61d0c265a...`	`25532e9720880623...`
*.tar.gz	`da4a3e26ccde87fa...`	`b1a43aeddc623719...`
guix_build.log	`6a160fb8362b9280...`	`a573a6fd44218ed7...`
guix_build.log.diff		`39c8280580a1db2f...`

sidhujag referenced this in commit 14db44cf2f on Aug 20, 2021

DrahtBot locked this on Aug 19, 2022