diff --git a/.appveyor.yml b/.appveyor.yml index 6ec633d7..6eb2da59 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,7 +4,7 @@ # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # ############################################################################### -version: 3.4.0.{build}-{branch} +version: 3.6.0.{build}-{branch} image: Visual Studio 2013 diff --git a/.travis.yml b/.travis.yml index f00ec88b..c49c4575 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ matrix: sources: - sourceline: 'ppa:h-rayflood/llvm' packages: - - clang-3.4 + - clang-5.0 - os: linux compiler: gcc env: LINK=dynamic @@ -66,7 +66,7 @@ install: # Export CC/CXX to control compiler/version. - if [[ $OSX && $CLANG && $STATIC ]]; then export CC=clang; export CXX=clang++; fi - - if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-3.4; export CXX=clang++-3.4; fi + - if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-5.0; export CXX=clang++-5.0; fi - if [[ $LINUX && $GCC && $STATIC ]]; then export CC=gcc; export CXX=g++; fi - if [[ $OSX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi diff --git a/configure.ac b/configure.ac index a3e2579b..cf61ec6f 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ AC_PREREQ([2.65]) # Process command-line arguments and perform initialization and verification. -AC_INIT([libbitcoin-blockchain], [3.4.0], [eric@voskuil.org]) +AC_INIT([libbitcoin-blockchain], [3.6.0], [eric@voskuil.org]) # Do compilation tests. AC_LANG(C++) @@ -168,14 +168,14 @@ AS_CASE([${with_tests}], [yes], AC_MSG_NOTICE([boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}])], [AC_SUBST([boost_unit_test_framework_LIBS], [])]) -# Require bitcoin-database of at least version 3.4.0 and output ${bitcoin_database_CPPFLAGS/LIBS/PKG}. +# Require bitcoin-database of at least version 3.6.0 and output ${bitcoin_database_CPPFLAGS/LIBS/PKG}. #------------------------------------------------------------------------------ -PKG_CHECK_MODULES([bitcoin_database], [libbitcoin-database >= 3.4.0], - [bitcoin_database_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-database >= 3.4.0" 2>/dev/null`" - bitcoin_database_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-database >= 3.4.0" 2>/dev/null`"], +PKG_CHECK_MODULES([bitcoin_database], [libbitcoin-database >= 3.6.0], + [bitcoin_database_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-database >= 3.6.0" 2>/dev/null`" + bitcoin_database_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-database >= 3.6.0" 2>/dev/null`"], [bitcoin_database_INCLUDEDIR="" bitcoin_database_OTHER_CFLAGS=""]) -AC_SUBST([bitcoin_database_PKG], ['libbitcoin-database >= 3.4.0']) +AC_SUBST([bitcoin_database_PKG], ['libbitcoin-database >= 3.6.0']) AC_SUBST([bitcoin_database_CPPFLAGS], [${bitcoin_database_CFLAGS}]) AS_IF([test x${bitcoin_database_INCLUDEDIR} != "x"], [AC_SUBST([bitcoin_database_ISYS_CPPFLAGS], ["-isystem${bitcoin_database_INCLUDEDIR} ${bitcoin_database_OTHER_CFLAGS}"])], @@ -192,15 +192,15 @@ AS_CASE([${enable_isystem}],[yes], AC_MSG_NOTICE([bitcoin_database_BUILD_CPPFLAGS : ${bitcoin_database_BUILD_CPPFLAGS}]) -# Require bitcoin-consensus of at least version 3.4.0 and output ${bitcoin_consensus_CPPFLAGS/LIBS/PKG}. +# Require bitcoin-consensus of at least version 3.6.0 and output ${bitcoin_consensus_CPPFLAGS/LIBS/PKG}. #------------------------------------------------------------------------------ AS_CASE([${with_consensus}], [yes], - [PKG_CHECK_MODULES([bitcoin_consensus], [libbitcoin-consensus >= 3.4.0], - [bitcoin_consensus_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-consensus >= 3.4.0" 2>/dev/null`" - bitcoin_consensus_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-consensus >= 3.4.0" 2>/dev/null`"], + [PKG_CHECK_MODULES([bitcoin_consensus], [libbitcoin-consensus >= 3.6.0], + [bitcoin_consensus_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-consensus >= 3.6.0" 2>/dev/null`" + bitcoin_consensus_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-consensus >= 3.6.0" 2>/dev/null`"], [bitcoin_consensus_INCLUDEDIR="" bitcoin_consensus_OTHER_CFLAGS=""]) - AC_SUBST([bitcoin_consensus_PKG], ['libbitcoin-consensus >= 3.4.0']) + AC_SUBST([bitcoin_consensus_PKG], ['libbitcoin-consensus >= 3.6.0']) AC_SUBST([bitcoin_consensus_CPPFLAGS], [${bitcoin_consensus_CFLAGS}]) AS_IF([test x${bitcoin_consensus_INCLUDEDIR} != "x"], [AC_SUBST([bitcoin_consensus_ISYS_CPPFLAGS], ["-isystem${bitcoin_consensus_INCLUDEDIR} ${bitcoin_consensus_OTHER_CFLAGS}"])], diff --git a/include/bitcoin/blockchain/version.hpp b/include/bitcoin/blockchain/version.hpp index 6ba20dba..2f71ab83 100644 --- a/include/bitcoin/blockchain/version.hpp +++ b/include/bitcoin/blockchain/version.hpp @@ -12,9 +12,9 @@ * For interpretation of the versioning scheme see: http://semver.org */ -#define LIBBITCOIN_BLOCKCHAIN_VERSION "3.4.0" +#define LIBBITCOIN_BLOCKCHAIN_VERSION "3.6.0" #define LIBBITCOIN_BLOCKCHAIN_MAJOR_VERSION 3 -#define LIBBITCOIN_BLOCKCHAIN_MINOR_VERSION 4 +#define LIBBITCOIN_BLOCKCHAIN_MINOR_VERSION 6 #define LIBBITCOIN_BLOCKCHAIN_PATCH_VERSION 0 #endif diff --git a/install.sh b/install.sh index aa4c466b..be0f5d37 100755 --- a/install.sh +++ b/install.sh @@ -541,7 +541,7 @@ initialize_boost_icu_configuration() BOOST_ICU_POSIX="off" # Extract ICU libs from package config variables and augment with -ldl. - ICU_LIBS=( `pkg-config icu-i18n --libs` "-ldl" ) + ICU_LIBS="`pkg-config icu-i18n --libs` -ldl" # This is a hack for boost m4 scripts that fail with ICU dependency. # See custom edits in ax-boost-locale.m4 and ax_boost_regex.m4. diff --git a/libbitcoin-blockchain.pc.in b/libbitcoin-blockchain.pc.in index 3f781ef4..e7873252 100644 --- a/libbitcoin-blockchain.pc.in +++ b/libbitcoin-blockchain.pc.in @@ -25,7 +25,7 @@ Version: @PACKAGE_VERSION@ #============================================================================== # Dependencies that publish package configuration. #------------------------------------------------------------------------------ -Requires: libbitcoin-database >= 3.4.0 @bitcoin_consensus_PKG@ +Requires: libbitcoin-database >= 3.6.0 @bitcoin_consensus_PKG@ # Include directory and any other required compiler flags. #------------------------------------------------------------------------------