Skip to content

Commit b63c24a

Browse files
committed
Merge bitcoin#25809: build: add test_bitcoin.exe to win installer, don't install entire docs/ dir
d755ffc build: package test_bitcoin in Windows installer (fanquake) aa30e04 build: remove entire docs dir from Windows installer (fanquake) Pull request description: Haven't tested other than checking that it Guix builds. Fixes: bitcoin#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 d755ffc 1440000bytes: ACK bitcoin@d755ffc hebasto: ACK d755ffc, tested on Windows 11 Pro. Tree-SHA512: 7f1b46182b616806f706e20ccb05d8e563d5ff8f1155169713db780c06bbe3fffdb4c1b3f5da7c3e01bfcd40e7046811ff0710b81342d4c53d67ce91b36a7da7
2 parents 0f90b58 + d755ffc commit b63c24a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Makefile.am

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ endif
2323

2424
BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
2525
BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
26+
BITCOIN_TEST_BIN=$(top_builddir)/src/test/$(BITCOIN_TEST_NAME)$(EXEEXT)
2627
BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
2728
BITCOIN_TX_BIN=$(top_builddir)/src/$(BITCOIN_TX_NAME)$(EXEEXT)
2829
BITCOIN_UTIL_BIN=$(top_builddir)/src/$(BITCOIN_UTIL_NAME)$(EXEEXT)
@@ -78,6 +79,7 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
7879
$(MKDIR_P) $(top_builddir)/release
7980
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
8081
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
82+
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TEST_BIN) $(top_builddir)/release
8183
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
8284
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TX_BIN) $(top_builddir)/release
8385
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_WALLET_BIN) $(top_builddir)/release

configure.ac

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ fi
3131

3232
BITCOIN_DAEMON_NAME=bitcoind
3333
BITCOIN_GUI_NAME=bitcoin-qt
34+
BITCOIN_TEST_NAME=test_bitcoin
3435
BITCOIN_CLI_NAME=bitcoin-cli
3536
BITCOIN_TX_NAME=bitcoin-tx
3637
BITCOIN_UTIL_NAME=bitcoin-util
@@ -1917,6 +1918,7 @@ AC_SUBST(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION")
19171918
AC_SUBST(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL")
19181919
AC_SUBST(BITCOIN_DAEMON_NAME)
19191920
AC_SUBST(BITCOIN_GUI_NAME)
1921+
AC_SUBST(BITCOIN_TEST_NAME)
19201922
AC_SUBST(BITCOIN_CLI_NAME)
19211923
AC_SUBST(BITCOIN_TX_NAME)
19221924
AC_SUBST(BITCOIN_UTIL_NAME)

share/setup.nsi.in

+1-3
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ Section -Main SEC0000
8080
File @abs_top_builddir@/release/@BITCOIN_CLI_NAME@@EXEEXT@
8181
File @abs_top_builddir@/release/@BITCOIN_TX_NAME@@EXEEXT@
8282
File @abs_top_builddir@/release/@BITCOIN_WALLET_TOOL_NAME@@EXEEXT@
83-
SetOutPath $INSTDIR\doc
84-
File /r /x Makefile* @abs_top_srcdir@/doc\*.*
83+
File @abs_top_builddir@/release/@BITCOIN_TEST_NAME@@EXEEXT@
8584
SetOutPath $INSTDIR
8685
WriteRegStr HKCU "${REGKEY}\Components" Main 1
8786
SectionEnd
@@ -129,7 +128,6 @@ Section /o -un.Main UNSEC0000
129128
Delete /REBOOTOK $INSTDIR\COPYING.txt
130129
Delete /REBOOTOK $INSTDIR\readme.txt
131130
RMDir /r /REBOOTOK $INSTDIR\daemon
132-
RMDir /r /REBOOTOK $INSTDIR\doc
133131
DeleteRegValue HKCU "${REGKEY}\Components" Main
134132
SectionEnd
135133

0 commit comments

Comments
 (0)