Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regenerate build artifacts. #208

Merged
merged 1 commit into from
Aug 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -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
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-protocol], [3.4.0], [eric@voskuil.org])
AC_INIT([libbitcoin-protocol], [3.6.0], [eric@voskuil.org])

# Do compilation tests.
AC_LANG(C++)
Expand Down Expand Up @@ -146,14 +146,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 zmq of at least version 4.2.5 and output ${zmq_CPPFLAGS/LIBS/PKG}.
# Require zmq of at least version 4.3.2 and output ${zmq_CPPFLAGS/LIBS/PKG}.
#------------------------------------------------------------------------------
PKG_CHECK_MODULES([zmq], [libzmq >= 4.2.5],
[zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.2.5" 2>/dev/null`"
zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.2.5" 2>/dev/null`"],
PKG_CHECK_MODULES([zmq], [libzmq >= 4.3.2],
[zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.3.2" 2>/dev/null`"
zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.3.2" 2>/dev/null`"],
[zmq_INCLUDEDIR=""
zmq_OTHER_CFLAGS=""])
AC_SUBST([zmq_PKG], ['libzmq >= 4.2.5'])
AC_SUBST([zmq_PKG], ['libzmq >= 4.3.2'])
AC_SUBST([zmq_CPPFLAGS], [${zmq_CFLAGS}])
AS_IF([test x${zmq_INCLUDEDIR} != "x"],
[AC_SUBST([zmq_ISYS_CPPFLAGS], ["-isystem${zmq_INCLUDEDIR} ${zmq_OTHER_CFLAGS}"])],
Expand All @@ -170,14 +170,14 @@ AS_CASE([${enable_isystem}],[yes],

AC_MSG_NOTICE([zmq_BUILD_CPPFLAGS : ${zmq_BUILD_CPPFLAGS}])

# Require bitcoin of at least version 3.4.0 and output ${bitcoin_CPPFLAGS/LIBS/PKG}.
# Require bitcoin of at least version 3.6.0 and output ${bitcoin_CPPFLAGS/LIBS/PKG}.
#------------------------------------------------------------------------------
PKG_CHECK_MODULES([bitcoin], [libbitcoin >= 3.4.0],
[bitcoin_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin >= 3.4.0" 2>/dev/null`"
bitcoin_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin >= 3.4.0" 2>/dev/null`"],
PKG_CHECK_MODULES([bitcoin], [libbitcoin >= 3.6.0],
[bitcoin_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin >= 3.6.0" 2>/dev/null`"
bitcoin_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin >= 3.6.0" 2>/dev/null`"],
[bitcoin_INCLUDEDIR=""
bitcoin_OTHER_CFLAGS=""])
AC_SUBST([bitcoin_PKG], ['libbitcoin >= 3.4.0'])
AC_SUBST([bitcoin_PKG], ['libbitcoin >= 3.6.0'])
AC_SUBST([bitcoin_CPPFLAGS], [${bitcoin_CFLAGS}])
AS_IF([test x${bitcoin_INCLUDEDIR} != "x"],
[AC_SUBST([bitcoin_ISYS_CPPFLAGS], ["-isystem${bitcoin_INCLUDEDIR} ${bitcoin_OTHER_CFLAGS}"])],
Expand Down
4 changes: 2 additions & 2 deletions include/bitcoin/protocol/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_PROTOCOL_VERSION "3.4.0"
#define LIBBITCOIN_PROTOCOL_VERSION "3.6.0"
#define LIBBITCOIN_PROTOCOL_MAJOR_VERSION 3
#define LIBBITCOIN_PROTOCOL_MINOR_VERSION 4
#define LIBBITCOIN_PROTOCOL_MINOR_VERSION 6
#define LIBBITCOIN_PROTOCOL_PATCH_VERSION 0

#endif
6 changes: 3 additions & 3 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ BUILD_DIR="build-libbitcoin-protocol"

# ZMQ archive.
#------------------------------------------------------------------------------
ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.2.5/zeromq-4.2.5.tar.gz"
ZMQ_ARCHIVE="zeromq-4.2.5.tar.gz"
ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.3.2/zeromq-4.3.2.tar.gz"
ZMQ_ARCHIVE="zeromq-4.3.2.tar.gz"

# Boost archive.
#------------------------------------------------------------------------------
Expand Down Expand Up @@ -534,7 +534,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-protocol.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: libzmq >= 4.2.5 libbitcoin >= 3.4.0
Requires: libzmq >= 4.3.2 libbitcoin >= 3.6.0

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