diff options
| author | fanquake <fanquake@gmail.com> | 2022-08-16 09:11:55 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-08-16 09:14:42 +0100 |
| commit | b63c24a509adc1672176c0e3700f25eb1f369f20 (patch) | |
| tree | 190faa1047ccac24b05bab1f955d2aeb3ed70191 | |
| parent | 0f90b586863f68aa01e089e48a06802405e2b83b (diff) | |
| parent | d755ffc3277c11b5c4a38c52e900b561d1636d0b (diff) | |
| download | bitcoin-b63c24a509adc1672176c0e3700f25eb1f369f20.tar.xz | |
Merge bitcoin/bitcoin#25809: build: add test_bitcoin.exe to win installer, don't install entire docs/ dir
d755ffc3277c11b5c4a38c52e900b561d1636d0b build: package test_bitcoin in Windows installer (fanquake)
aa30e046ace860d40736d01f91edd8802adfdf2d build: remove entire docs dir from Windows installer (fanquake)
Pull request description:
Haven't tested other than checking that it Guix builds.
Fixes: #17171.
Guix build (x86_64):
```bash
6e2886c80eba9c829047c04586b142d5f8f1c53c31aa82834aff39ae5dbf1762 guix-build-d755ffc3277c/output/dist-archive/bitcoin-d755ffc3277c.tar.gz
cdf727c45c3283523726b4ec27f051de5931469874af736eac05d48016d6369b guix-build-d755ffc3277c/output/x86_64-w64-mingw32/SHA256SUMS.part
546866b2f0c8067c168a936246c4cda25745c1b484322201230b885511f2abd7 guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-debug.zip
31dbb780dff003089d0e9a3a2598cde89453af4f1b18e392a186a6ec14718b48 guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-setup-unsigned.exe
39f1c55a2426390f014282d0a736ceb77e461199fde6ccefcef53ecf10dc4960 guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-unsigned.tar.gz
7e4f7dc3475598d187e77cc31842ad2ce876fb98dc42e999b32bdefbf0b79df1 guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64.zip
```
ACKs for top commit:
jarolrod:
ACK d755ffc3277c11b5c4a38c52e900b561d1636d0b
1440000bytes:
ACK https://github.com/bitcoin/bitcoin/pull/25809/commits/d755ffc3277c11b5c4a38c52e900b561d1636d0b
hebasto:
ACK d755ffc3277c11b5c4a38c52e900b561d1636d0b, tested on Windows 11 Pro.
Tree-SHA512: 7f1b46182b616806f706e20ccb05d8e563d5ff8f1155169713db780c06bbe3fffdb4c1b3f5da7c3e01bfcd40e7046811ff0710b81342d4c53d67ce91b36a7da7
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | share/setup.nsi.in | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 011faa62c7..8b61763ae4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,7 @@ endif BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT) BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT) +BITCOIN_TEST_BIN=$(top_builddir)/src/test/$(BITCOIN_TEST_NAME)$(EXEEXT) BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT) BITCOIN_TX_BIN=$(top_builddir)/src/$(BITCOIN_TX_NAME)$(EXEEXT) BITCOIN_UTIL_BIN=$(top_builddir)/src/$(BITCOIN_UTIL_NAME)$(EXEEXT) @@ -78,6 +79,7 @@ $(BITCOIN_WIN_INSTALLER): all-recursive $(MKDIR_P) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release + STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TEST_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TX_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_WALLET_BIN) $(top_builddir)/release diff --git a/configure.ac b/configure.ac index 7ed9514aae..713b8a1ab9 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,7 @@ fi BITCOIN_DAEMON_NAME=bitcoind BITCOIN_GUI_NAME=bitcoin-qt +BITCOIN_TEST_NAME=test_bitcoin BITCOIN_CLI_NAME=bitcoin-cli BITCOIN_TX_NAME=bitcoin-tx BITCOIN_UTIL_NAME=bitcoin-util @@ -1917,6 +1918,7 @@ AC_SUBST(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION") AC_SUBST(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL") AC_SUBST(BITCOIN_DAEMON_NAME) AC_SUBST(BITCOIN_GUI_NAME) +AC_SUBST(BITCOIN_TEST_NAME) AC_SUBST(BITCOIN_CLI_NAME) AC_SUBST(BITCOIN_TX_NAME) AC_SUBST(BITCOIN_UTIL_NAME) diff --git a/share/setup.nsi.in b/share/setup.nsi.in index b31ba7a5b4..a5fb2e06cb 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -80,8 +80,7 @@ Section -Main SEC0000 File @abs_top_builddir@/release/@BITCOIN_CLI_NAME@@EXEEXT@ File @abs_top_builddir@/release/@BITCOIN_TX_NAME@@EXEEXT@ File @abs_top_builddir@/release/@BITCOIN_WALLET_TOOL_NAME@@EXEEXT@ - SetOutPath $INSTDIR\doc - File /r /x Makefile* @abs_top_srcdir@/doc\*.* + File @abs_top_builddir@/release/@BITCOIN_TEST_NAME@@EXEEXT@ SetOutPath $INSTDIR WriteRegStr HKCU "${REGKEY}\Components" Main 1 SectionEnd @@ -129,7 +128,6 @@ Section /o -un.Main UNSEC0000 Delete /REBOOTOK $INSTDIR\COPYING.txt Delete /REBOOTOK $INSTDIR\readme.txt RMDir /r /REBOOTOK $INSTDIR\daemon - RMDir /r /REBOOTOK $INSTDIR\doc DeleteRegValue HKCU "${REGKEY}\Components" Main SectionEnd |