Skip to content
This repository was archived by the owner on Apr 2, 2025. It is now read-only.

Commit 6755ad9

Browse files
ca333ca333
authored
Merge pull request #61 from jl777/master
master update
2 parents 30188de + 65cddb3 commit 6755ad9

89 files changed

Lines changed: 5351 additions & 1964 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.am‎

Lines changed: 123 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ BITCOIND_BIN=$(top_builddir)/src/zcashd$(EXEEXT)
1616
BITCOIN_CLI_BIN=$(top_builddir)/src/zcash-cli$(EXEEXT)
1717
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
1818

19-
##OSX_APP=Bitcoin-Qt.app
20-
##OSX_DMG=Bitcoin-Core.dmg
21-
##OSX_BACKGROUND_IMAGE=background.tiff
22-
##OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
23-
##OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
24-
##OSX_BASE_LPROJ_DIR=$(top_srcdir)/contrib/macdeploy/Base.lproj/InfoPlist.strings
25-
##OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
26-
##OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
27-
##OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
19+
if TARGET_DARWIN
20+
OSX_APP=Bitcoin-Qt.app
21+
OSX_DMG=Bitcoin-Core.dmg
22+
OSX_BACKGROUND_IMAGE=background.tiff
23+
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
24+
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
25+
OSX_BASE_LPROJ_DIR=$(top_srcdir)/contrib/macdeploy/Base.lproj/InfoPlist.strings
26+
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
27+
OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
28+
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
29+
endif
2830

2931
DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
3032

@@ -35,14 +37,15 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
3537
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
3638
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp
3739

38-
##OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) $(OSX_BASE_LPROJ_DIR) \
39-
## $(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_IMAGE) \
40-
## $(top_srcdir)/contrib/macdeploy/DS_Store \
41-
## $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
42-
## $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
43-
40+
if TARGET_DARWIN
41+
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) $(OSX_BASE_LPROJ_DIR) \
42+
$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_IMAGE) \
43+
$(top_srcdir)/contrib/macdeploy/DS_Store \
44+
$(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
45+
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
46+
endif
4447

45-
if BUILD_DARWIN
48+
if TARGET_DARWIN
4649
COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
4750
leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
4851
baseline_filtered.info block_test_filtered.info \
@@ -53,7 +56,7 @@ COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
5356
leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
5457
baseline_filtered.info block_test_filtered.info \
5558
leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info \
56-
zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
59+
#zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
5760
endif
5861

5962
dist-hook:
@@ -80,68 +83,73 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
8083
$(if $(findstring src/,$(MAKECMDGOALS)),$(MAKECMDGOALS), none): FORCE
8184
$(MAKE) -C src $(patsubst src/%,%,$@)
8285

83-
##$(OSX_APP)/Contents/PkgInfo:
84-
## $(MKDIR_P) $(@D)
85-
## @echo "APPL????" > $@
86-
##
87-
##$(OSX_APP)/Contents/Resources/empty.lproj:
88-
## $(MKDIR_P) $(@D)
89-
## @touch $@
90-
##
91-
##$(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
92-
## $(MKDIR_P) $(@D)
93-
## $(INSTALL_DATA) $< $@
94-
##
95-
##$(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
96-
## $(MKDIR_P) $(@D)
97-
## $(INSTALL_DATA) $< $@
98-
##
99-
##$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
100-
## $(MKDIR_P) $(@D)
101-
## STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@
102-
##
103-
##$(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(OSX_BASE_LPROJ_DIR)
104-
## $(MKDIR_P) $(@D)
105-
## $(INSTALL_DATA) $< $@
106-
##
107-
##OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
108-
## $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
109-
## $(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
110-
##
111-
##if BUILD_DARWIN
112-
##$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
113-
## $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
114-
##
115-
##deploydir: $(OSX_DMG)
116-
##else
117-
##APP_DIST_DIR=$(top_builddir)/dist
118-
##APP_DIST_EXTRAS=$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE) $(APP_DIST_DIR)/.DS_Store $(APP_DIST_DIR)/Applications
119-
##
120-
##$(APP_DIST_DIR)/Applications:
121-
## @rm -f $@
122-
## @cd $(@D); $(LN_S) /Applications $(@F)
123-
##
124-
##$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
125-
##
126-
##$(OSX_DMG): $(APP_DIST_EXTRAS)
127-
## $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Bitcoin-Core" -no-pad -r -apple -o $@ dist
128-
##
129-
##$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_IMAGE)
130-
## $(MKDIR_P) $(@D)
131-
## $(INSTALL) $< $@
132-
##$(APP_DIST_DIR)/.DS_Store: contrib/macdeploy/DS_Store
133-
## $(INSTALL) $< $@
134-
##
135-
##$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
136-
## INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
137-
##
138-
##deploydir: $(APP_DIST_EXTRAS)
139-
##endif
140-
##
141-
##if TARGET_DARWIN
142-
##appbundle: $(OSX_APP_BUILT)
143-
##deploy: $(OSX_DMG)
144-
##endif
86+
if TARGET_DARWIN
87+
88+
$(OSX_APP)/Contents/PkgInfo:
89+
$(MKDIR_P) $(@D)
90+
@echo "APPL????" > $@
91+
92+
$(OSX_APP)/Contents/Resources/empty.lproj:
93+
$(MKDIR_P) $(@D)
94+
@touch $@
95+
96+
$(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
97+
$(MKDIR_P) $(@D)
98+
$(INSTALL_DATA) $< $@
99+
100+
$(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
101+
$(MKDIR_P) $(@D)
102+
$(INSTALL_DATA) $< $@
103+
104+
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
105+
$(MKDIR_P) $(@D)
106+
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@
107+
108+
$(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(OSX_BASE_LPROJ_DIR)
109+
$(MKDIR_P) $(@D)
110+
$(INSTALL_DATA) $< $@
111+
112+
OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
113+
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
114+
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
115+
116+
endif
117+
118+
if BUILD_DARWIN
119+
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
120+
$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
121+
deploydir: $(OSX_DMG)
122+
else
123+
APP_DIST_DIR=$(top_builddir)/dist
124+
APP_DIST_EXTRAS=$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE) $(APP_DIST_DIR)/.DS_Store $(APP_DIST_DIR)/Applications
125+
endif
126+
127+
if TARGET_DARWIN
128+
$(APP_DIST_DIR)/Applications:
129+
@rm -f $@
130+
@cd $(@D); $(LN_S) /Applications $(@F)
131+
132+
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
133+
134+
$(OSX_DMG): $(APP_DIST_EXTRAS)
135+
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Bitcoin-Core" -no-pad -r -apple -o $@ dist
136+
137+
$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_IMAGE)
138+
$(MKDIR_P) $(@D)
139+
$(INSTALL) $< $@
140+
$(APP_DIST_DIR)/.DS_Store: contrib/macdeploy/DS_Store
141+
$(INSTALL) $< $@
142+
143+
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
144+
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
145+
146+
deploydir: $(APP_DIST_EXTRAS)
147+
endif
148+
149+
if TARGET_DARWIN
150+
appbundle: $(OSX_APP_BUILT)
151+
deploy: $(OSX_DMG)
152+
endif
145153

146154
if TARGET_WINDOWS
147155
deploy: $(BITCOIN_WIN_INSTALLER)
@@ -161,10 +169,14 @@ baseline.info:
161169
if BUILD_DARWIN
162170
baseline_filtered.info: baseline.info
163171
$(LCOV) -r $< "/usr/include/*" \
164-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
165-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
166-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
172+
"$(abs_builddir)/depends/$(BUILD)/include/*.h" \
173+
"$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
174+
"$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
175+
"$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
176+
"$(abs_builddir)/src/gtest/*" \
167177
"$(abs_builddir)/src/test/*" \
178+
"$(abs_builddir)/src/wallet/gtest/*" \
179+
"$(abs_builddir)/src/wallet/test/*" \
168180
-o $@
169181
else
170182
baseline_filtered.info: baseline.info
@@ -186,10 +198,14 @@ leveldb_baseline.info: baseline_filtered.info
186198
if BUILD_DARWIN
187199
leveldb_baseline_filtered.info: leveldb_baseline.info
188200
$(LCOV) -r $< "/usr/include/*" \
189-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
190-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
191-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
201+
"$(abs_builddir)/depends/$(BUILD)/include/*.h" \
202+
"$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
203+
"$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
204+
"$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
205+
"$(abs_builddir)/src/gtest/*" \
192206
"$(abs_builddir)/src/test/*" \
207+
"$(abs_builddir)/src/wallet/gtest/*" \
208+
"$(abs_builddir)/src/wallet/test/*" \
193209
-o $@
194210
else
195211
leveldb_baseline_filtered.info: leveldb_baseline.info
@@ -217,9 +233,11 @@ test_bitcoin.info: baseline_filtered_combined.info
217233
if BUILD_DARWIN
218234
test_bitcoin_filtered.info: test_bitcoin.info
219235
$(LCOV) -r $< "/usr/include/*" \
220-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
221-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
222-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
236+
"$(abs_builddir)/depends/$(BUILD)/include/*.h" \
237+
"$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
238+
"$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
239+
"$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
240+
"$(abs_builddir)/src/gtest/*" \
223241
"$(abs_builddir)/src/test/*" \
224242
"$(abs_builddir)/src/wallet/gtest/*" \
225243
"$(abs_builddir)/src/wallet/test/*" \
@@ -248,10 +266,14 @@ block_test.info: test_bitcoin_filtered.info
248266
if BUILD_DARWIN
249267
block_test_filtered.info: block_test.info
250268
$(LCOV) -r $< "/usr/include/*" \
251-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
252-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
253-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
269+
"$(abs_builddir)/depends/$(BUILD)/include/*.h" \
270+
"$(abs_builddir)/depends/$(BUILD)/include/boost/*" \
271+
"$(abs_builddir)/depends/$(BUILD)/include/gmock/*" \
272+
"$(abs_builddir)/depends/$(BUILD)/include/gtest/*" \
273+
"$(abs_builddir)/src/gtest/*" \
254274
"$(abs_builddir)/src/test/*" \
275+
"$(abs_builddir)/src/wallet/gtest/*" \
276+
"$(abs_builddir)/src/wallet/test/*" \
255277
-o $@
256278
else
257279
block_test_filtered.info: block_test.info
@@ -276,8 +298,8 @@ zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.
276298
endif
277299

278300
if BUILD_DARWIN
279-
total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info block_test_filtered.info
280-
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
301+
total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info
302+
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
281303
else
282304
total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info
283305
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
@@ -288,12 +310,19 @@ test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info
288310
$(GENHTML) -s $< -o $(@D)
289311
@touch $@
290312

313+
if TARGET_DARWIN
314+
zcash-gtest.coverage/.dirstamp: zcash-gtest_coverage.info
315+
$(GENHTML) -s $< -o $(@D)
316+
@touch $@
317+
cov-zcash: zcash-gtest.coverage/.dirstamp
318+
endif
319+
291320
total.coverage/.dirstamp: total_coverage.info
292321
$(GENHTML) -s $< -o $(@D)
293322
@touch $@
294323

295324
if BUILD_DARWIN
296-
cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp
325+
cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp
297326
else
298327
cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp
299328
endif

0 commit comments

Comments
 (0)