Skip to content

Commit

Permalink
Merge pull request #101 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 fee3fd4 + 698c84e commit db8418f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 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
- swig
- os: linux
compiler: gcc
Expand Down Expand Up @@ -72,7 +72,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
2 changes: 1 addition & 1 deletion 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-consensus], [3.4.0], [[email protected]])
AC_INIT([libbitcoin-consensus], [3.6.0], [[email protected]])

# Do compilation tests.
AC_LANG(C++)
Expand Down
4 changes: 2 additions & 2 deletions include/bitcoin/consensus/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_CONSENSUS_VERSION "3.4.0"
#define LIBBITCOIN_CONSENSUS_VERSION "3.6.0"
#define LIBBITCOIN_CONSENSUS_MAJOR_VERSION 3
#define LIBBITCOIN_CONSENSUS_MINOR_VERSION 4
#define LIBBITCOIN_CONSENSUS_MINOR_VERSION 6
#define LIBBITCOIN_CONSENSUS_PATCH_VERSION 0

#endif
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,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

0 comments on commit db8418f

Please sign in to comment.