Skip to content

Commit

Permalink
Merge pull request #422 from thecodefactory/build-update
Browse files Browse the repository at this point in the history
Regenerate build artifacts.
  • Loading branch information
thecodefactory authored Aug 29, 2019
2 parents 3fb757a + 7df8d71 commit c28bd64
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -71,7 +71,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
Expand Down
22 changes: 11 additions & 11 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
AC_PREREQ([2.65])

# Process command-line arguments and perform initialization and verification.
AC_INIT([libbitcoin-node], [3.4.0], [[email protected]])
AC_INIT([libbitcoin-node], [3.6.0], [[email protected]])

# Do compilation tests.
AC_LANG(C++)
Expand Down Expand Up @@ -197,14 +197,14 @@ AS_CASE([${enable_isystem}],[yes],

AC_MSG_NOTICE([bash_completion_BUILD_CPPFLAGS : ${bash_completion_BUILD_CPPFLAGS}])

# Require bitcoin-blockchain of at least version 3.4.0 and output ${bitcoin_blockchain_CPPFLAGS/LIBS/PKG}.
# Require bitcoin-blockchain of at least version 3.6.0 and output ${bitcoin_blockchain_CPPFLAGS/LIBS/PKG}.
#------------------------------------------------------------------------------
PKG_CHECK_MODULES([bitcoin_blockchain], [libbitcoin-blockchain >= 3.4.0],
[bitcoin_blockchain_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-blockchain >= 3.4.0" 2>/dev/null`"
bitcoin_blockchain_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-blockchain >= 3.4.0" 2>/dev/null`"],
PKG_CHECK_MODULES([bitcoin_blockchain], [libbitcoin-blockchain >= 3.6.0],
[bitcoin_blockchain_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-blockchain >= 3.6.0" 2>/dev/null`"
bitcoin_blockchain_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-blockchain >= 3.6.0" 2>/dev/null`"],
[bitcoin_blockchain_INCLUDEDIR=""
bitcoin_blockchain_OTHER_CFLAGS=""])
AC_SUBST([bitcoin_blockchain_PKG], ['libbitcoin-blockchain >= 3.4.0'])
AC_SUBST([bitcoin_blockchain_PKG], ['libbitcoin-blockchain >= 3.6.0'])
AC_SUBST([bitcoin_blockchain_CPPFLAGS], [${bitcoin_blockchain_CFLAGS}])
AS_IF([test x${bitcoin_blockchain_INCLUDEDIR} != "x"],
[AC_SUBST([bitcoin_blockchain_ISYS_CPPFLAGS], ["-isystem${bitcoin_blockchain_INCLUDEDIR} ${bitcoin_blockchain_OTHER_CFLAGS}"])],
Expand All @@ -221,14 +221,14 @@ AS_CASE([${enable_isystem}],[yes],

AC_MSG_NOTICE([bitcoin_blockchain_BUILD_CPPFLAGS : ${bitcoin_blockchain_BUILD_CPPFLAGS}])

# Require bitcoin-network of at least version 3.4.0 and output ${bitcoin_network_CPPFLAGS/LIBS/PKG}.
# Require bitcoin-network of at least version 3.6.0 and output ${bitcoin_network_CPPFLAGS/LIBS/PKG}.
#------------------------------------------------------------------------------
PKG_CHECK_MODULES([bitcoin_network], [libbitcoin-network >= 3.4.0],
[bitcoin_network_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-network >= 3.4.0" 2>/dev/null`"
bitcoin_network_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-network >= 3.4.0" 2>/dev/null`"],
PKG_CHECK_MODULES([bitcoin_network], [libbitcoin-network >= 3.6.0],
[bitcoin_network_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-network >= 3.6.0" 2>/dev/null`"
bitcoin_network_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-network >= 3.6.0" 2>/dev/null`"],
[bitcoin_network_INCLUDEDIR=""
bitcoin_network_OTHER_CFLAGS=""])
AC_SUBST([bitcoin_network_PKG], ['libbitcoin-network >= 3.4.0'])
AC_SUBST([bitcoin_network_PKG], ['libbitcoin-network >= 3.6.0'])
AC_SUBST([bitcoin_network_CPPFLAGS], [${bitcoin_network_CFLAGS}])
AS_IF([test x${bitcoin_network_INCLUDEDIR} != "x"],
[AC_SUBST([bitcoin_network_ISYS_CPPFLAGS], ["-isystem${bitcoin_network_INCLUDEDIR} ${bitcoin_network_OTHER_CFLAGS}"])],
Expand Down
4 changes: 2 additions & 2 deletions include/bitcoin/node/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
* For interpretation of the versioning scheme see: http://semver.org
*/

#define LIBBITCOIN_NODE_VERSION "3.4.0"
#define LIBBITCOIN_NODE_VERSION "3.6.0"
#define LIBBITCOIN_NODE_MAJOR_VERSION 3
#define LIBBITCOIN_NODE_MINOR_VERSION 4
#define LIBBITCOIN_NODE_MINOR_VERSION 6
#define LIBBITCOIN_NODE_PATCH_VERSION 0

#endif
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,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.
Expand Down
2 changes: 1 addition & 1 deletion libbitcoin-node.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Version: @PACKAGE_VERSION@
#==============================================================================
# Dependencies that publish package configuration.
#------------------------------------------------------------------------------
Requires: libbitcoin-blockchain >= 3.4.0 libbitcoin-network >= 3.4.0
Requires: libbitcoin-blockchain >= 3.6.0 libbitcoin-network >= 3.6.0

# Include directory and any other required compiler flags.
#------------------------------------------------------------------------------
Expand Down

0 comments on commit c28bd64

Please sign in to comment.