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 with updated version to 3.8.0. #545

Merged
merged 1 commit into from
Aug 18, 2023
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
6 changes: 3 additions & 3 deletions builds/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ else ()
set( libdir "\${exec_prefix}/lib" )
set( includedir "\${exec_prefix}/include" )

set( PACKAGE_VERSION "3.7.0" )
set( PACKAGE_VERSION "3.8.0" )
set( VERSION "${PACKAGE_VERSION}" )
endif ()

Expand Down Expand Up @@ -173,12 +173,12 @@ set( boost_LDFLAGS "-L${Boost_LIBRARY_DIR}" )

# Find bitcoin-database
#------------------------------------------------------------------------------
find_package( Bitcoin-Database 3.7.0 REQUIRED )
find_package( Bitcoin-Database 3.8.0 REQUIRED )

# Find bitcoin-consensus
#------------------------------------------------------------------------------
if (with-consensus)
find_package( Bitcoin-Consensus 3.7.0 REQUIRED )
find_package( Bitcoin-Consensus 3.8.0 REQUIRED )
endif()

# Define project common includes directories
Expand Down
26 changes: 13 additions & 13 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-blockchain], [3.7.0], [[email protected]])
AC_INIT([libbitcoin-blockchain], [3.8.0], [[email protected]])

# Do compilation tests.
AC_LANG(C++)
Expand Down Expand Up @@ -269,13 +269,13 @@ 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.7.0 and output ${bitcoin_database_CPPFLAGS/LIBS/PKG}.
# Require bitcoin-database of at least version 3.8.0 and output ${bitcoin_database_CPPFLAGS/LIBS/PKG}.
#------------------------------------------------------------------------------
PKG_CHECK_MODULES([bitcoin_database], [libbitcoin-database >= 3.7.0],
[bitcoin_database_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-database >= 3.7.0" 2>/dev/null`"
bitcoin_database_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-database >= 3.7.0" 2>/dev/null`"],
[AC_MSG_ERROR([libbitcoin-database >= 3.7.0 is required but was not found.])])
AC_SUBST([bitcoin_database_PKG], ['libbitcoin-database >= 3.7.0'])
PKG_CHECK_MODULES([bitcoin_database], [libbitcoin-database >= 3.8.0],
[bitcoin_database_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-database >= 3.8.0" 2>/dev/null`"
bitcoin_database_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-database >= 3.8.0" 2>/dev/null`"],
[AC_MSG_ERROR([libbitcoin-database >= 3.8.0 is required but was not found.])])
AC_SUBST([bitcoin_database_PKG], ['libbitcoin-database >= 3.8.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}"])],
Expand All @@ -292,14 +292,14 @@ AS_CASE([${enable_isystem}],[yes],

AC_MSG_NOTICE([bitcoin_database_BUILD_CPPFLAGS : ${bitcoin_database_BUILD_CPPFLAGS}])

# Require bitcoin-consensus of at least version 3.7.0 and output ${bitcoin_consensus_CPPFLAGS/LIBS/PKG}.
# Require bitcoin-consensus of at least version 3.8.0 and output ${bitcoin_consensus_CPPFLAGS/LIBS/PKG}.
#------------------------------------------------------------------------------
AS_CASE([${with_consensus}], [yes],
[PKG_CHECK_MODULES([bitcoin_consensus], [libbitcoin-consensus >= 3.7.0],
[bitcoin_consensus_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-consensus >= 3.7.0" 2>/dev/null`"
bitcoin_consensus_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-consensus >= 3.7.0" 2>/dev/null`"],
[AC_MSG_ERROR([--with-consensus specified but libbitcoin-consensus >= 3.7.0 was not found.])])
AC_SUBST([bitcoin_consensus_PKG], ['libbitcoin-consensus >= 3.7.0'])
[PKG_CHECK_MODULES([bitcoin_consensus], [libbitcoin-consensus >= 3.8.0],
[bitcoin_consensus_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-consensus >= 3.8.0" 2>/dev/null`"
bitcoin_consensus_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-consensus >= 3.8.0" 2>/dev/null`"],
[AC_MSG_ERROR([--with-consensus specified but libbitcoin-consensus >= 3.8.0 was not found.])])
AC_SUBST([bitcoin_consensus_PKG], ['libbitcoin-consensus >= 3.8.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}"])],
Expand Down
4 changes: 2 additions & 2 deletions include/bitcoin/blockchain/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_BLOCKCHAIN_VERSION "3.7.0"
#define LIBBITCOIN_BLOCKCHAIN_VERSION "3.8.0"
#define LIBBITCOIN_BLOCKCHAIN_MAJOR_VERSION 3
#define LIBBITCOIN_BLOCKCHAIN_MINOR_VERSION 7
#define LIBBITCOIN_BLOCKCHAIN_MINOR_VERSION 8
#define LIBBITCOIN_BLOCKCHAIN_PATCH_VERSION 0

#endif
2 changes: 1 addition & 1 deletion libbitcoin-blockchain.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-database >= 3.7.0 @bitcoin_consensus_PKG@
Requires: libbitcoin-database >= 3.8.0 @bitcoin_consensus_PKG@

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