Skip to content

Commit 33cd942

Browse files
committed
Merge #14698: build: Add bitcoin-tx.exe into Windows installer
5c5902a build: Add bitcoin-tx.exe into Windows installer (Chun Kuan Lee) Pull request description: I think bitcoin-tx.exe should be packed into the Windows installer. Tree-SHA512: 346051d3680e74e773d5d8736b5d90604dc52689484cf14b2bc47e1fe3a010f9322f82993e2b1ba3533736bcb9bc8478d71f8c4d42eadf6605195fba619d71a2
2 parents 8c59bb8 + 5c5902a commit 33cd942

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Makefile.am

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ endif
1919
BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
2020
BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
2121
BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
22+
BITCOIN_TX_BIN=$(top_builddir)/src/$(BITCOIN_TX_NAME)$(EXEEXT)
2223
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
2324

2425
empty :=
@@ -74,6 +75,7 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
7475
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
7576
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
7677
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
78+
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_TX_BIN) $(top_builddir)/release
7779
@test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \
7880
echo error: could not build $@
7981
@echo built $@
@@ -167,6 +169,9 @@ $(BITCOIND_BIN): FORCE
167169
$(BITCOIN_CLI_BIN): FORCE
168170
$(MAKE) -C src $(@F)
169171

172+
$(BITCOIN_TX_BIN): FORCE
173+
$(MAKE) -C src $(@F)
174+
170175
if USE_LCOV
171176
LCOV_FILTER_PATTERN=-p "/usr/include/" -p "/usr/lib/" -p "src/leveldb/" -p "src/bench/" -p "src/univalue" -p "src/crypto/ctaes" -p "src/secp256k1"
172177

share/setup.nsi.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ Section -Main SEC0000
8080
SetOutPath $INSTDIR\daemon
8181
File @abs_top_srcdir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@
8282
File @abs_top_srcdir@/release/@BITCOIN_CLI_NAME@@EXEEXT@
83+
File @abs_top_srcdir@/release/@BITCOIN_TX_NAME@@EXEEXT@
8384
SetOutPath $INSTDIR\doc
8485
File /r /x Makefile* @abs_top_srcdir@/doc\*.*
8586
SetOutPath $INSTDIR

0 commit comments

Comments
 (0)