build: add test_bitcoin.exe to win installer, don't install entire docs/ dir

fanquake commented at 8:22 am on August 9, 2022: member

Haven’t tested other than checking that it Guix builds.

Guix build (x86_64):

06e2886c80eba9c829047c04586b142d5f8f1c53c31aa82834aff39ae5dbf1762  guix-build-d755ffc3277c/output/dist-archive/bitcoin-d755ffc3277c.tar.gz
1cdf727c45c3283523726b4ec27f051de5931469874af736eac05d48016d6369b  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/SHA256SUMS.part
2546866b2f0c8067c168a936246c4cda25745c1b484322201230b885511f2abd7  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-debug.zip
331dbb780dff003089d0e9a3a2598cde89453af4f1b18e392a186a6ec14718b48  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-setup-unsigned.exe
439f1c55a2426390f014282d0a736ceb77e461199fde6ccefcef53ecf10dc4960  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-unsigned.tar.gz
57e4f7dc3475598d187e77cc31842ad2ce876fb98dc42e999b32bdefbf0b79df1  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64.zip

build: remove entire docs dir from Windows installer aa30e046ac

build: package test_bitcoin in Windows installer d755ffc327

fanquake added the label Windows on Aug 9, 2022

jarolrod commented at 1:54 pm on August 9, 2022: member

GUIX hashes

x86:

0$ env HOSTS='x86_64-w64-mingw32' ./contrib/guix/guix-build 
1$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
2
36e2886c80eba9c829047c04586b142d5f8f1c53c31aa82834aff39ae5dbf1762  guix-build-d755ffc3277c/output/dist-archive/bitcoin-d755ffc3277c.tar.gz
4cdf727c45c3283523726b4ec27f051de5931469874af736eac05d48016d6369b  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/SHA256SUMS.part
5546866b2f0c8067c168a936246c4cda25745c1b484322201230b885511f2abd7  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-debug.zip
631dbb780dff003089d0e9a3a2598cde89453af4f1b18e392a186a6ec14718b48  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-setup-unsigned.exe
739f1c55a2426390f014282d0a736ceb77e461199fde6ccefcef53ecf10dc4960  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-unsigned.tar.gz
87e4f7dc3475598d187e77cc31842ad2ce876fb98dc42e999b32bdefbf0b79df1  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64.zip

arm64:

0$ env HOSTS='x86_64-w64-mingw32' ./contrib/guix/guix-build 
1$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
2
36e2886c80eba9c829047c04586b142d5f8f1c53c31aa82834aff39ae5dbf1762  guix-build-d755ffc3277c/output/dist-archive/bitcoin-d755ffc3277c.tar.gz
4cdf727c45c3283523726b4ec27f051de5931469874af736eac05d48016d6369b  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/SHA256SUMS.part
5546866b2f0c8067c168a936246c4cda25745c1b484322201230b885511f2abd7  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-debug.zip
631dbb780dff003089d0e9a3a2598cde89453af4f1b18e392a186a6ec14718b48  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-setup-unsigned.exe
739f1c55a2426390f014282d0a736ceb77e461199fde6ccefcef53ecf10dc4960  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-unsigned.tar.gz
87e4f7dc3475598d187e77cc31842ad2ce876fb98dc42e999b32bdefbf0b79df1  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64.zip

ghost commented at 5:38 pm on August 9, 2022: none

Concept ACK

I could test if it was a change possible to test with windows binaries built using instructions in https://github.com/bitcoin/bitcoin/blob/master/doc/build-windows.md

No clue about guix build process for win installer

in share/setup.nsi.in:84 in d755ffc327

79@@ -80,8 +80,7 @@ Section -Main SEC0000
80     File @abs_top_builddir@/release/@BITCOIN_CLI_NAME@@EXEEXT@
81     File @abs_top_builddir@/release/@BITCOIN_TX_NAME@@EXEEXT@
82     File @abs_top_builddir@/release/@BITCOIN_WALLET_TOOL_NAME@@EXEEXT@
83-    SetOutPath $INSTDIR\doc
84-    File /r /x Makefile* @abs_top_srcdir@/doc\*.*

luke-jr commented at 2:10 am on August 10, 2022:

Do we not want to install any docs?

jarolrod commented at 2:40 am on August 10, 2022:

what would be docs that would be critical to include with the installation executable?

fanquake commented at 9:36 am on August 10, 2022:

Do we not want to install any docs?

Windows is the odd one out in this regard. I think the README and copyright is fine. I’d assume most users never even realised we were dumping a bumping of random/non-windows documentation onto their drives. If you think we should be installing some, then you should suggest a list.

luke-jr commented at 8:07 pm on August 10, 2022:

It’s not a question of critical, just what’s appropriate. I would think most of the docs would be. Exceptions are build docs, old release notes, and similar.

fanquake commented at 8:58 am on August 12, 2022:

I would think most of the docs would be. Exceptions are build docs, old release notes, and similar.

Again, feel free to propose a list / change. I think your assessment of “most” is incorrect. Of all the .md files in the 23.x docs/ folder, less than half would be relevent.

In any case don’t think this something worth spending time to try and optimise. If removing the installation of docs is too contreversial, happy to just drop that commit from this PR, and we can close the second half of #17171 as wont fix.

jarolrod approved

jarolrod commented at 2:38 am on August 10, 2022: member

ACK d755ffc3277c11b5c4a38c52e900b561d1636d0b

Tested on Windows 10 (x86) and Windows 11 (x86 and arm64). Was able to successfully run the tests in all scenarios, and run bitcoin-qt. Confirming that the docs dir is not placed in the installation directory.

MarcoFalke added the label DrahtBot Guix build requested on Aug 10, 2022

fanquake commented at 9:34 am on August 10, 2022: member

I could test if it was a change possible to test with windows binaries built using instructions in https://github.com/bitcoin/bitcoin/blob/master/doc/build-windows.md

It is. Run make deploy and that will build the installer.

unknown approved

unknown commented at 4:47 pm on August 10, 2022: none

ACK https://github.com/bitcoin/bitcoin/pull/25809/commits/d755ffc3277c11b5c4a38c52e900b561d1636d0b

Tested on Win 10 and installer works as expected. Docs directory isn’t added and test_bitcoin.exe is added in daemon directory.

 0PS C:\Program Files\Bitcoin> ls
 1
 2
 3    Directory: C:\Program Files\Bitcoin
 4
 5
 6Mode                 LastWriteTime         Length Name
 7----                 -------------         ------ ----
 8d-----        10-08-2022     16:40                daemon
 9-a----        10-08-2022     16:42       36432928 bitcoin-qt.exe
10-a----        10-08-2022     16:42           1142 COPYING.txt
11-a----        10-08-2022     16:42            846 readme.txt
12-a----        10-08-2022     16:42         152493 uninstall.exe
13
14
15PS C:\Program Files\Bitcoin> ls .\daemon\
16
17
18    Directory: C:\Program Files\Bitcoin\daemon
19
20
21Mode                 LastWriteTime         Length Name
22----                 -------------         ------ ----
23-a----        10-08-2022     16:42        2176512 bitcoin-cli.exe
24-a----        10-08-2022     16:42        3810304 bitcoin-tx.exe
25-a----        10-08-2022     16:42        8976896 bitcoin-wallet.exe
26-a----        10-08-2022     16:42       14503424 bitcoind.exe
27-a----        10-08-2022     16:42       24411648 test_bitcoin.exe

Although bitcoin core (windows) users will have to manually delete docs directory because installer just ensures its not added with new docs, it does not delete the docs already present.

DrahtBot commented at 10:30 am on August 11, 2022: contributor

Guix builds

File	commit a6fc293c0a1f27ba1e573bfa16fd76d5f58988b2(master)	commit 7a7e37fb91ae81d39361b195c05117b502e3046b(master and this pull)
SHA256SUMS.part	`ee1df5c52df292d7...`	`bf990d822b946c5b...`
*-aarch64-linux-gnu-debug.tar.gz	`3c5094ea45e3eabc...`	`09453f3fc041362a...`
*-aarch64-linux-gnu.tar.gz	`fe471b2323a76617...`	`d2c401522dc4b360...`
*-arm-linux-gnueabihf-debug.tar.gz	`84b3ffc992dd23c3...`	`328d45d3e4f740cf...`
*-arm-linux-gnueabihf.tar.gz	`4fdaeb62ff2bb35c...`	`863012e3086c22b2...`
*-arm64-apple-darwin-unsigned.dmg	`b517524ad24d8a88...`	`ed10be97166c538d...`
*-arm64-apple-darwin-unsigned.tar.gz	`a67f1287ce599762...`	`765907b70276fb58...`
*-arm64-apple-darwin.tar.gz	`7b3a70c0a8522185...`	`f01849f93a2df3e8...`
*-powerpc64-linux-gnu-debug.tar.gz	`5a42d588ca968430...`	`a572391b27db1d52...`
*-powerpc64-linux-gnu.tar.gz	`f5825733bf0b62c4...`	`5cbbb45c5c04b1ba...`
*-powerpc64le-linux-gnu-debug.tar.gz	`bc524d6680fba2ce...`	`713f5d5dd0902128...`
*-powerpc64le-linux-gnu.tar.gz	`7d17b7eb24fa91db...`	`7c503d841fe59359...`
*-riscv64-linux-gnu-debug.tar.gz	`9b51a9467993519e...`	`f524e82a0f4e86c6...`
*-riscv64-linux-gnu.tar.gz	`c55c086d6e655575...`	`ab61c323810ba0a8...`
*-win64-debug.zip	`0e5189fd72b5ab03...`	`f7583038ea67418f...`
*-win64-setup-unsigned.exe	`73363f0240b2c096...`	`7f6ead0fe4c76dd4...`
*-win64-unsigned.tar.gz	`e5ce44c59beac3ca...`	`ec26da32f4864148...`
*-win64.zip	`db20f0a2feba2959...`	`ba9f6a998158ed99...`
*-x86_64-apple-darwin-unsigned.dmg	`68ed63eb807a1a98...`	`b694680da5a132c1...`
*-x86_64-apple-darwin-unsigned.tar.gz	`99f3e7fe5af9882b...`	`e086427d7275456f...`
*-x86_64-apple-darwin.tar.gz	`ca7d0af2edf956d3...`	`f82b58045fd3ef0c...`
*-x86_64-linux-gnu-debug.tar.gz	`d578c96496828562...`	`0944644ffb1e9756...`
*-x86_64-linux-gnu.tar.gz	`651a427d8ad6a6e8...`	`0f6eecac888a0b15...`
*.tar.gz	`61d6fb619c35fdc8...`	`5e1ac71ceaf43af7...`
guix_build.log	`c8c9ea8e5b44a4b9...`	`cd5c230996fc00ab...`
guix_build.log.diff		`b667b54f82afcdcc...`

DrahtBot removed the label DrahtBot Guix build requested on Aug 11, 2022

hebasto commented at 4:39 pm on August 13, 2022: member

Guix build on x86_64:

06e2886c80eba9c829047c04586b142d5f8f1c53c31aa82834aff39ae5dbf1762  guix-build-d755ffc3277c/output/dist-archive/bitcoin-d755ffc3277c.tar.gz
1cdf727c45c3283523726b4ec27f051de5931469874af736eac05d48016d6369b  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/SHA256SUMS.part
2546866b2f0c8067c168a936246c4cda25745c1b484322201230b885511f2abd7  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-debug.zip
331dbb780dff003089d0e9a3a2598cde89453af4f1b18e392a186a6ec14718b48  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-setup-unsigned.exe
439f1c55a2426390f014282d0a736ceb77e461199fde6ccefcef53ecf10dc4960  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-unsigned.tar.gz
57e4f7dc3475598d187e77cc31842ad2ce876fb98dc42e999b32bdefbf0b79df1  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64.zip

hebasto approved

hebasto commented at 4:51 pm on August 13, 2022: member

ACK d755ffc3277c11b5c4a38c52e900b561d1636d0b, tested on Windows 11 Pro.

Should the 24.0 milestone be assigned here?

fanquake commented at 8:11 am on August 16, 2022: member

Should the 24.0 milestone be assigned here?

I don’t think this needed a milestone, but is going to be merged now in any case. I’ll combine some other minor share additions into #25829.

fanquake merged this on Aug 16, 2022

fanquake closed this on Aug 16, 2022

fanquake deleted the branch on Aug 16, 2022

sidhujag referenced this in commit d31fdeec58 on Aug 16, 2022

fanquake added this to the milestone 24.0 on Sep 15, 2022

bitcoin locked this on Sep 15, 2023

build: add test_bitcoin.exe to win installer, don’t install entire docs/ dir #25809

Guix builds