Skip to content

Commit e5daa2e

Browse files
luke-jrluke-jr
committed
Merge branch 'master' into depends_curl
2 parents 5c70a6d + 3174621 commit e5daa2e

File tree

526 files changed

+14022
-4885
lines changed

Some content is hidden

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

526 files changed

+14022
-4885
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ matrix:
4747
- compiler: ": No wallet"
4848
env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
4949
- compiler: ": Cross-Mac"
50-
env: HOST=x86_64-apple-darwin11 PACKAGES="cmake libcap-dev libz-dev libbz2-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
50+
env: HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
5151
exclude:
5252
- compiler: gcc
5353
install:
@@ -70,6 +70,7 @@ script:
7070
- test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
7171
- ./configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
7272
- make distdir PACKAGE=bitcoin VERSION=$HOST
73+
- if [ "$RUN_TESTS" = "true" ]; then contrib/devtools/check-doc.py; fi
7374
- cd bitcoin-$HOST
7475
- ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
7576
- make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ Anyone may participate in peer review which is expressed by comments in the pull
9595
- Concept ACK means "I agree in the general principle of this pull request";
9696
- Nit refers to trivial, often non-blocking issues.
9797

98+
Reviewers should include the commit hash which they reviewed in their comments.
99+
98100
Project maintainers reserve the right to weigh the opinions of peer reviewers using common sense judgement and also may weight based on meritocracy: Those that have demonstrated a deeper commitment and understanding towards the project (over time) or have clear domain expertise may naturally have more weight, as one would expect in all walks of life.
99101

100102
Where a patch set affects consensus critical code, the bar will be set much higher in terms of discussion and peer review requirements, keeping in mind that mistakes could be very costly to the wider community. This includes refactoring of consensus critical code.

‎COPYING‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2009-2015 The Bitcoin Core developers
3+
Copyright (c) 2009-2016 The Bitcoin Core developers
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile.am‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ SUBDIRS = src
33
.PHONY: deploy FORCE
44

55
GZIP_ENV="-9n"
6+
export PYTHONPATH
67

78
if BUILD_BITCOIN_LIBS
89
pkgconfigdir = $(libdir)/pkgconfig
@@ -14,26 +15,35 @@ BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
1415
BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
1516
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
1617

18+
empty :=
19+
space := $(empty) $(empty)
20+
1721
OSX_APP=Bitcoin-Qt.app
18-
OSX_DMG=Bitcoin-Core.dmg
22+
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
23+
OSX_DMG = $(OSX_VOLNAME).dmg
24+
OSX_BACKGROUND_SVG=background.svg
1925
OSX_BACKGROUND_IMAGE=background.tiff
26+
OSX_BACKGROUND_IMAGE_DPIS=36 72
27+
OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py
2028
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
2129
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
22-
OSX_BASE_LPROJ_DIR=$(top_srcdir)/contrib/macdeploy/Base.lproj/InfoPlist.strings
2330
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
2431
OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
2532
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
2633

2734
DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
2835

36+
BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
37+
$(top_srcdir)/contrib/devtools/security-check.py
38+
2939
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
3040
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
3141
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
3242
$(top_srcdir)/doc/README_windows.txt
3343

34-
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) $(OSX_BASE_LPROJ_DIR) \
35-
$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_IMAGE) \
36-
$(top_srcdir)/contrib/macdeploy/DS_Store \
44+
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
45+
$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_SVG) \
46+
$(OSX_DSSTORE_GEN) \
3747
$(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
3848
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
3949

@@ -87,17 +97,20 @@ $(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
8797
$(MKDIR_P) $(@D)
8898
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@
8999

90-
$(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(OSX_BASE_LPROJ_DIR)
100+
$(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
91101
$(MKDIR_P) $(@D)
92-
$(INSTALL_DATA) $< $@
102+
echo '{ CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@
93103

94104
OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
95105
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
96106
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
97107

108+
osx_volname:
109+
echo $(OSX_VOLNAME) >$@
110+
98111
if BUILD_DARWIN
99112
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
100-
$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
113+
$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 -volname $(OSX_VOLNAME)
101114

102115
deploydir: $(OSX_DMG)
103116
else
@@ -111,13 +124,17 @@ $(APP_DIST_DIR)/Applications:
111124
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
112125

113126
$(OSX_DMG): $(APP_DIST_EXTRAS)
114-
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Bitcoin-Core" -no-pad -r -dir-mode 0755 -apple -o $@ dist
127+
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist
115128

116-
$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_IMAGE)
129+
dpi%.$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_SVG)
130+
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d $* -p $* | $(IMAGEMAGICK_CONVERT) - $@
131+
OSX_BACKGROUND_IMAGE_DPIFILES := $(foreach dpi,$(OSX_BACKGROUND_IMAGE_DPIS),dpi$(dpi).$(OSX_BACKGROUND_IMAGE))
132+
$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIFILES)
117133
$(MKDIR_P) $(@D)
118-
$(INSTALL) $< $@
119-
$(APP_DIST_DIR)/.DS_Store: contrib/macdeploy/DS_Store
120-
$(INSTALL) $< $@
134+
$(TIFFCP) -c none $(OSX_BACKGROUND_IMAGE_DPIFILES) $@
135+
136+
$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
137+
$< "$@" "$(OSX_VOLNAME)"
121138

122139
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
123140
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
@@ -213,7 +230,7 @@ endif
213230

214231
dist_noinst_SCRIPTS = autogen.sh
215232

216-
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
233+
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
217234

218235
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
219236

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bitcoin Core integration/staging tree
33

44
[![Build Status](https://travis-ci.org/bitcoin/bitcoin.svg?branch=master)](https://travis-ci.org/bitcoin/bitcoin)
55

6-
https://www.bitcoin.org
6+
https://bitcoincore.org
77

88
What is Bitcoin?
99
----------------
@@ -15,13 +15,14 @@ out collectively by the network. Bitcoin Core is the name of open source
1515
software which enables the use of this currency.
1616

1717
For more information, as well as an immediately useable, binary version of
18-
the Bitcoin Core software, see https://www.bitcoin.org/en/download.
18+
the Bitcoin Core software, see https://www.bitcoin.org/en/download, or read the
19+
[original whitepaper](https://bitcoincore.org/bitcoin.pdf).
1920

2021
License
2122
-------
2223

2324
Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
24-
information or see http://opensource.org/licenses/MIT.
25+
information or see https://opensource.org/licenses/MIT.
2526

2627
Development Process
2728
-------------------

‎autogen.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ if [ -z ${LIBTOOLIZE} ] && GLIBTOOLIZE="`which glibtoolize 2>/dev/null`"; then
66
LIBTOOLIZE="${GLIBTOOLIZE}"
77
export LIBTOOLIZE
88
fi
9+
which autoreconf >/dev/null || \
10+
(echo "configuration failed, please install autoconf first" && exit 1)
911
autoreconf --install --force --warnings=all

‎build-aux/m4/bitcoin_find_bdb48.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
3838
done
3939
if test "x$bdbpath" = "xX"; then
4040
AC_MSG_RESULT([no])
41-
AC_MSG_ERROR([libdb_cxx headers missing, Bitcoin Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
41+
AC_MSG_ERROR([libdb_cxx headers missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
4242
elif test "x$bdb48path" = "xX"; then
4343
BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx)
4444
AC_ARG_WITH([incompatible-bdb],[AS_HELP_STRING([--with-incompatible-bdb], [allow using a bdb version other than 4.8])],[
@@ -60,7 +60,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
6060
])
6161
done
6262
if test "x$BDB_LIBS" = "x"; then
63-
AC_MSG_ERROR([libdb_cxx missing, Bitcoin Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
63+
AC_MSG_ERROR([libdb_cxx missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
6464
fi
6565
AC_SUBST(BDB_LIBS)
6666
])

‎build-aux/m4/bitcoin_qt.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
220220
221221
222222
dnl enable qt support
223-
AC_MSG_CHECKING(whether to build Bitcoin Core GUI)
223+
AC_MSG_CHECKING(whether to build ]AC_PACKAGE_NAME[ GUI)
224224
BITCOIN_QT_CHECK([
225225
bitcoin_enable_qt=yes
226226
bitcoin_enable_qt_test=yes

0 commit comments

Comments
 (0)