build: Package docs/ and don't package source.
No-one uses the installer then builds from source. Closes #2819.
This commit is contained in:
parent
39db27ca35
commit
6c980c7d31
2 changed files with 6 additions and 5 deletions
|
@ -16,6 +16,8 @@ OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
|
|||
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
|
||||
OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
|
||||
|
||||
DIST_DOCS = $(wildcard doc/*.md)
|
||||
|
||||
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
|
||||
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
|
||||
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
|
||||
|
@ -42,7 +44,6 @@ distcleancheck:
|
|||
@:
|
||||
|
||||
$(BITCOIN_WIN_INSTALLER): $(BITCOIND_BIN) $(BITCOIN_QT_BIN) $(BITCOIN_CLI_BIN)
|
||||
$(MAKE) distdir
|
||||
$(MKDIR_P) $(top_builddir)/release
|
||||
$(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
|
||||
$(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
|
||||
|
@ -149,7 +150,7 @@ check-local:
|
|||
@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS)
|
||||
endif
|
||||
|
||||
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
|
||||
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
|
||||
|
||||
CLEANFILES = $(OSX_DMG) $(OSX_APP) $(BITCOIN_WIN_INSTALLER)
|
||||
|
||||
|
|
|
@ -79,8 +79,8 @@ Section -Main SEC0000
|
|||
SetOutPath $INSTDIR\daemon
|
||||
File @abs_top_srcdir@/release/bitcoind.exe
|
||||
File @abs_top_srcdir@/release/bitcoin-cli.exe
|
||||
SetOutPath $INSTDIR\src
|
||||
File /r @abs_top_srcdir@/@PACKAGE@-@VERSION@/src\*.*
|
||||
SetOutPath $INSTDIR\doc
|
||||
File /r @abs_top_srcdir@/doc\*.*
|
||||
SetOutPath $INSTDIR
|
||||
WriteRegStr HKCU "${REGKEY}\Components" Main 1
|
||||
|
||||
|
@ -131,7 +131,7 @@ Section /o -un.Main UNSEC0000
|
|||
Delete /REBOOTOK $INSTDIR\COPYING.txt
|
||||
Delete /REBOOTOK $INSTDIR\readme.txt
|
||||
RMDir /r /REBOOTOK $INSTDIR\daemon
|
||||
RMDir /r /REBOOTOK $INSTDIR\src
|
||||
RMDir /r /REBOOTOK $INSTDIR\doc
|
||||
DeleteRegValue HKCU "${REGKEY}\Components" Main
|
||||
SectionEnd
|
||||
|
||||
|
|
Loading…
Reference in a new issue