Skip to content

Commit 57b19ac

Browse files
Regenerate build artifacts.
1 parent 6d680b7 commit 57b19ac

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#
66
###############################################################################
7-
version: 3.4.0.{build}-{branch}
7+
version: 3.6.0.{build}-{branch}
88

99
image: Visual Studio 2013
1010

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ matrix:
3535
sources:
3636
- sourceline: 'ppa:h-rayflood/llvm'
3737
packages:
38-
- clang-3.4
38+
- clang-5.0
3939
- os: linux
4040
compiler: gcc
4141
env: LINK=dynamic
@@ -66,7 +66,7 @@ install:
6666

6767
# Export CC/CXX to control compiler/version.
6868
- if [[ $OSX && $CLANG && $STATIC ]]; then export CC=clang; export CXX=clang++; fi
69-
- if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-3.4; export CXX=clang++-3.4; fi
69+
- if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-5.0; export CXX=clang++-5.0; fi
7070
- if [[ $LINUX && $GCC && $STATIC ]]; then export CC=gcc; export CXX=g++; fi
7171
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
7272
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi

configure.ac

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
AC_PREREQ([2.65])
1414

1515
# Process command-line arguments and perform initialization and verification.
16-
AC_INIT([libbitcoin-protocol], [3.4.0], [[email protected]])
16+
AC_INIT([libbitcoin-protocol], [3.6.0], [[email protected]])
1717

1818
# Do compilation tests.
1919
AC_LANG(C++)
@@ -146,14 +146,14 @@ AS_CASE([${with_tests}], [yes],
146146
AC_MSG_NOTICE([boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}])],
147147
[AC_SUBST([boost_unit_test_framework_LIBS], [])])
148148

149-
# Require zmq of at least version 4.2.5 and output ${zmq_CPPFLAGS/LIBS/PKG}.
149+
# Require zmq of at least version 4.3.2 and output ${zmq_CPPFLAGS/LIBS/PKG}.
150150
#------------------------------------------------------------------------------
151-
PKG_CHECK_MODULES([zmq], [libzmq >= 4.2.5],
152-
[zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.2.5" 2>/dev/null`"
153-
zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.2.5" 2>/dev/null`"],
151+
PKG_CHECK_MODULES([zmq], [libzmq >= 4.3.2],
152+
[zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.3.2" 2>/dev/null`"
153+
zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.3.2" 2>/dev/null`"],
154154
[zmq_INCLUDEDIR=""
155155
zmq_OTHER_CFLAGS=""])
156-
AC_SUBST([zmq_PKG], ['libzmq >= 4.2.5'])
156+
AC_SUBST([zmq_PKG], ['libzmq >= 4.3.2'])
157157
AC_SUBST([zmq_CPPFLAGS], [${zmq_CFLAGS}])
158158
AS_IF([test x${zmq_INCLUDEDIR} != "x"],
159159
[AC_SUBST([zmq_ISYS_CPPFLAGS], ["-isystem${zmq_INCLUDEDIR} ${zmq_OTHER_CFLAGS}"])],
@@ -170,14 +170,14 @@ AS_CASE([${enable_isystem}],[yes],
170170

171171
AC_MSG_NOTICE([zmq_BUILD_CPPFLAGS : ${zmq_BUILD_CPPFLAGS}])
172172

173-
# Require bitcoin of at least version 3.4.0 and output ${bitcoin_CPPFLAGS/LIBS/PKG}.
173+
# Require bitcoin of at least version 3.6.0 and output ${bitcoin_CPPFLAGS/LIBS/PKG}.
174174
#------------------------------------------------------------------------------
175-
PKG_CHECK_MODULES([bitcoin], [libbitcoin >= 3.4.0],
176-
[bitcoin_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin >= 3.4.0" 2>/dev/null`"
177-
bitcoin_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin >= 3.4.0" 2>/dev/null`"],
175+
PKG_CHECK_MODULES([bitcoin], [libbitcoin >= 3.6.0],
176+
[bitcoin_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin >= 3.6.0" 2>/dev/null`"
177+
bitcoin_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin >= 3.6.0" 2>/dev/null`"],
178178
[bitcoin_INCLUDEDIR=""
179179
bitcoin_OTHER_CFLAGS=""])
180-
AC_SUBST([bitcoin_PKG], ['libbitcoin >= 3.4.0'])
180+
AC_SUBST([bitcoin_PKG], ['libbitcoin >= 3.6.0'])
181181
AC_SUBST([bitcoin_CPPFLAGS], [${bitcoin_CFLAGS}])
182182
AS_IF([test x${bitcoin_INCLUDEDIR} != "x"],
183183
[AC_SUBST([bitcoin_ISYS_CPPFLAGS], ["-isystem${bitcoin_INCLUDEDIR} ${bitcoin_OTHER_CFLAGS}"])],

include/bitcoin/protocol/version.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* For interpretation of the versioning scheme see: http://semver.org
1313
*/
1414

15-
#define LIBBITCOIN_PROTOCOL_VERSION "3.4.0"
15+
#define LIBBITCOIN_PROTOCOL_VERSION "3.6.0"
1616
#define LIBBITCOIN_PROTOCOL_MAJOR_VERSION 3
17-
#define LIBBITCOIN_PROTOCOL_MINOR_VERSION 4
17+
#define LIBBITCOIN_PROTOCOL_MINOR_VERSION 6
1818
#define LIBBITCOIN_PROTOCOL_PATCH_VERSION 0
1919

2020
#endif

install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ BUILD_DIR="build-libbitcoin-protocol"
3434

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

4040
# Boost archive.
4141
#------------------------------------------------------------------------------
@@ -534,7 +534,7 @@ initialize_boost_icu_configuration()
534534
BOOST_ICU_POSIX="off"
535535

536536
# Extract ICU libs from package config variables and augment with -ldl.
537-
ICU_LIBS=( `pkg-config icu-i18n --libs` "-ldl" )
537+
ICU_LIBS="`pkg-config icu-i18n --libs` -ldl"
538538

539539
# This is a hack for boost m4 scripts that fail with ICU dependency.
540540
# See custom edits in ax-boost-locale.m4 and ax_boost_regex.m4.

libbitcoin-protocol.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Version: @PACKAGE_VERSION@
2525
#==============================================================================
2626
# Dependencies that publish package configuration.
2727
#------------------------------------------------------------------------------
28-
Requires: libzmq >= 4.2.5 libbitcoin >= 3.4.0
28+
Requires: libzmq >= 4.3.2 libbitcoin >= 3.6.0
2929

3030
# Include directory and any other required compiler flags.
3131
#------------------------------------------------------------------------------

0 commit comments

Comments
 (0)