Skip to content

Commit 35b8af9

Browse files
author
Cory Fields
committed
autotools: switch to autotools buildsystem
1 parent 2fee100 commit 35b8af9

Some content is hidden

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

59 files changed

+3527
-1508
lines changed

.gitignore

+61-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,46 @@
1+
*.tar.gz
2+
3+
*.exe
14
src/*.exe
5+
src/*/*.exe
26
src/bitcoin
37
src/bitcoind
4-
src/test_bitcoin
8+
src/test/test_bitcoin
9+
src/qt/test/test_bitcoin-qt
10+
11+
Makefile.in
12+
aclocal.m4
13+
autom4te.cache/
14+
config.log
15+
config.status
16+
configure
17+
src/.deps/
18+
src/Makefile.in
19+
src/bitcoin-config.h
20+
src/bitcoin-config.h.in
21+
src/build-aux/
22+
src/qt/Makefile.in
23+
src/stamp-h1
24+
share/setup.nsi
25+
share/qt/Info.plist
26+
27+
src/leveldb/.deps/
28+
29+
src/test/.deps
30+
src/test/.dirstamp
31+
32+
src/qt/.deps/
33+
src/qt/.dirstamp
34+
src/qt/*.moc
35+
src/qt/moc_*.cpp
36+
src/qt/forms/ui_*.h
37+
38+
src/qt/test/.deps/
39+
src/qt/test/.dirstamp
40+
src/qt/test/moc*.cpp
41+
src/qt/res/.deps/
42+
src/qt/res/.dirstamp
43+
544
.*.swp
645
*.*~*
746
*.bak
@@ -10,6 +49,13 @@ src/test_bitcoin
1049
*.o
1150
*.patch
1251
.bitcoin
52+
*.a
53+
*.pb.cc
54+
*.pb.h
55+
56+
*.log
57+
*.trs
58+
*.dmg
1359

1460
# Compilation and Qt preprocessor part
1561
*.qm
@@ -31,4 +77,18 @@ qrc_*.cpp
3177
.DS_Store
3278
build
3379

80+
#lcov
81+
*.gcno
82+
/*.info
83+
test_bitcoin.coverage/
84+
total.coverage/
85+
coverage_percent.txt
86+
87+
#build tests
88+
linux-coverage-build
89+
linux-build
90+
win32-build
91+
qa/pull-tester/run-bitcoind-for-test.sh
92+
qa/pull-tester/build-tests.sh
93+
3494
!src/leveldb-*/Makefile

Makefile.am

+159
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
ACLOCAL_AMFLAGS = -I src/m4
2+
SUBDIRS = src
3+
.PHONY: deploy
4+
5+
GZIP_ENV="-9n"
6+
7+
BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT)
8+
BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
9+
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win32-setup$(EXEEXT)
10+
11+
OSX_APP=Bitcoin-Qt.app
12+
OSX_DMG=Bitcoin-Qt.dmg
13+
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
14+
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
15+
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
16+
OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
17+
18+
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
19+
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
20+
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
21+
$(top_srcdir)/doc/README_windows.txt
22+
23+
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
24+
$(top_srcdir)/contrib/macdeploy/background.png
25+
26+
COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
27+
leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
28+
baseline_filtered.info block_test_filtered.info \
29+
leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
30+
31+
dist-hook:
32+
-$(MAKE) -C $(top_distdir)/src/leveldb clean
33+
-$(GIT) archive --format=tar HEAD -- src/version.cpp | $(AMTAR) -C $(top_distdir) -xf -
34+
35+
distcheck-hook:
36+
$(MKDIR_P) $(top_distdir)/_build/src/leveldb
37+
cp -rf $(top_srcdir)/src/leveldb/* $(top_distdir)/_build/src/leveldb/
38+
-$(MAKE) -C $(top_distdir)/_build/src/leveldb clean
39+
40+
distcleancheck:
41+
@:
42+
43+
$(BITCOIN_WIN_INSTALLER): $(BITCOIND_BIN) $(BITCOIN_QT_BIN)
44+
$(MAKE) distdir
45+
$(MKDIR_P) $(top_builddir)/release
46+
$(INSTALL_STRIP_PROGRAM) $(top_builddir)/src/bitcoind$(EXEEXT) $(top_builddir)/release
47+
$(INSTALL_STRIP_PROGRAM) $(top_builddir)/src/qt/bitcoin-qt$(EXEEXT) $(top_builddir)/release
48+
@test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \
49+
echo error: could not build $@
50+
51+
$(BITCOIND_BIN):
52+
make -C $(top_srcdir)/src bitcoind$(EXEEXT)
53+
54+
$(BITCOIN_QT_BIN):
55+
make -C $(top_srcdir)/src/qt bitcoin-qt$(EXEEXT)
56+
57+
58+
$(OSX_APP)/Contents/PkgInfo:
59+
$(MKDIR_P) $(@D)
60+
@echo "APPL????" > $@
61+
62+
$(OSX_APP)/Contents/Resources/empty.lproj:
63+
$(MKDIR_P) $(@D)
64+
@touch $@
65+
66+
$(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
67+
$(MKDIR_P) $(@D)
68+
$(INSTALL) $< $@
69+
70+
$(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
71+
$(MKDIR_P) $(@D)
72+
$(INSTALL) $< $@
73+
74+
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
75+
$(MKDIR_P) $(@D)
76+
$(INSTALL_STRIP_PROGRAM) $< $@
77+
78+
OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
79+
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
80+
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
81+
82+
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
83+
$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
84+
rm -rf $(OSX_APP)
85+
86+
87+
if TARGET_DARWIN
88+
deploy: $(OSX_DMG)
89+
endif
90+
if TARGET_WINDOWS
91+
deploy: $(BITCOIN_WIN_INSTALLER)
92+
endif
93+
94+
if USE_LCOV
95+
96+
baseline.info:
97+
$(LCOV) -c -i -d $(abs_builddir)/src -o $@
98+
99+
baseline_filtered.info: baseline.info
100+
$(LCOV) -r $< "/usr/include/*" -o $@
101+
102+
leveldb_baseline.info: baseline_filtered.info
103+
$(LCOV) -c -i -d $(abs_builddir)/src/leveldb -b $(abs_builddir)/src/leveldb -o $@
104+
105+
leveldb_baseline_filtered.info: leveldb_baseline.info
106+
$(LCOV) -r $< "/usr/include/*" -o $@
107+
108+
baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
109+
$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@
110+
111+
test_bitcoin.info: baseline_filtered_combined.info
112+
$(MAKE) -C src/ check
113+
$(LCOV) -c -d $(abs_builddir)/src -t test_bitcoin -o $@
114+
$(LCOV) -z -d $(abs_builddir)/src
115+
$(LCOV) -z -d $(abs_builddir)/src/leveldb
116+
117+
test_bitcoin_filtered.info: test_bitcoin.info
118+
$(LCOV) -r $< "/usr/include/*" -o $@
119+
120+
block_test.info: test_bitcoin_filtered.info
121+
-@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -Xmx2G -jar $(JAVA_COMPARISON_TOOL) 1 18444
122+
$(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@
123+
$(LCOV) -z -d $(abs_builddir)/src
124+
$(LCOV) -z -d $(abs_builddir)/src/leveldb
125+
126+
block_test_filtered.info: block_test.info
127+
$(LCOV) -r $< "/usr/include/*" -o $@
128+
129+
test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
130+
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
131+
132+
total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info block_test_filtered.info
133+
$(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
134+
135+
test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info
136+
$(GENHTML) -s $< -o $(@D)
137+
@touch $@
138+
139+
total.coverage/.dirstamp: total_coverage.info
140+
$(GENHTML) -s $< -o $(@D)
141+
@touch $@
142+
143+
cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp
144+
145+
endif
146+
147+
if USE_COMPARISON_TOOL
148+
check-local:
149+
@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -Xmx2G -jar $(JAVA_COMPARISON_TOOL) 1 18444
150+
endif
151+
152+
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
153+
154+
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
155+
156+
.INTERMEDIATE: $(OSX_APP_BUILT) $(COVERAGE_INFO)
157+
158+
clean-local:
159+
rm -rf test_bitcoin.coverage/ total.coverage/

README.md

+2-9
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,8 @@ lots of money.
5858
Developers are strongly encouraged to write unit tests for new code, and to
5959
submit new unit tests for old code.
6060

61-
Unit tests for the core code are in `src/test/`. To compile and run them:
62-
63-
cd src; make -f makefile.unix test
64-
65-
Unit tests for the GUI code are in `src/qt/test/`. To compile and run them:
66-
67-
qmake BITCOIN_QT_TEST=1 -o Makefile.test bitcoin-qt.pro
68-
make -f Makefile.test
69-
./bitcoin-qt_test
61+
Unit tests can be compiled and run (assuming they weren't disabled in configure) with:
62+
make check
7063

7164
Every pull request is built for both Windows and Linux on a dedicated server,
7265
and unit and sanity tests are automatically run. The binaries produced may be

autogen.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
autoreconf -vif

0 commit comments

Comments
 (0)