Skip to content

Commit

Permalink
Merge pull request #567 from pmienk/version3
Browse files Browse the repository at this point in the history
Regenerate with updated version to 3.8.0.
  • Loading branch information
pmienk authored Aug 18, 2023
2 parents 37b84cb + 9309f79 commit 8c4118d
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
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 @@ -175,11 +175,11 @@ endif()

# Find bitcoin-node
#------------------------------------------------------------------------------
find_package( Bitcoin-Node 3.7.0 REQUIRED )
find_package( Bitcoin-Node 3.8.0 REQUIRED )

# Find bitcoin-protocol
#------------------------------------------------------------------------------
find_package( Bitcoin-Protocol 3.7.0 REQUIRED )
find_package( Bitcoin-Protocol 3.8.0 REQUIRED )

# 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-server], [3.7.0], [[email protected]])
AC_INIT([libbitcoin-server], [3.8.0], [[email protected]])

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

AC_MSG_NOTICE([bash_completion_BUILD_CPPFLAGS : ${bash_completion_BUILD_CPPFLAGS}])

# Require bitcoin-node of at least version 3.7.0 and output ${bitcoin_node_CPPFLAGS/LIBS/PKG}.
# Require bitcoin-node of at least version 3.8.0 and output ${bitcoin_node_CPPFLAGS/LIBS/PKG}.
#------------------------------------------------------------------------------
PKG_CHECK_MODULES([bitcoin_node], [libbitcoin-node >= 3.7.0],
[bitcoin_node_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-node >= 3.7.0" 2>/dev/null`"
bitcoin_node_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-node >= 3.7.0" 2>/dev/null`"],
[AC_MSG_ERROR([libbitcoin-node >= 3.7.0 is required but was not found.])])
AC_SUBST([bitcoin_node_PKG], ['libbitcoin-node >= 3.7.0'])
PKG_CHECK_MODULES([bitcoin_node], [libbitcoin-node >= 3.8.0],
[bitcoin_node_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-node >= 3.8.0" 2>/dev/null`"
bitcoin_node_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-node >= 3.8.0" 2>/dev/null`"],
[AC_MSG_ERROR([libbitcoin-node >= 3.8.0 is required but was not found.])])
AC_SUBST([bitcoin_node_PKG], ['libbitcoin-node >= 3.8.0'])
AC_SUBST([bitcoin_node_CPPFLAGS], [${bitcoin_node_CFLAGS}])
AS_IF([test x${bitcoin_node_INCLUDEDIR} != "x"],
[AC_SUBST([bitcoin_node_ISYS_CPPFLAGS], ["-isystem${bitcoin_node_INCLUDEDIR} ${bitcoin_node_OTHER_CFLAGS}"])],
Expand All @@ -321,13 +321,13 @@ AS_CASE([${enable_isystem}],[yes],

AC_MSG_NOTICE([bitcoin_node_BUILD_CPPFLAGS : ${bitcoin_node_BUILD_CPPFLAGS}])

# Require bitcoin-protocol of at least version 3.7.0 and output ${bitcoin_protocol_CPPFLAGS/LIBS/PKG}.
# Require bitcoin-protocol of at least version 3.8.0 and output ${bitcoin_protocol_CPPFLAGS/LIBS/PKG}.
#------------------------------------------------------------------------------
PKG_CHECK_MODULES([bitcoin_protocol], [libbitcoin-protocol >= 3.7.0],
[bitcoin_protocol_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-protocol >= 3.7.0" 2>/dev/null`"
bitcoin_protocol_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-protocol >= 3.7.0" 2>/dev/null`"],
[AC_MSG_ERROR([libbitcoin-protocol >= 3.7.0 is required but was not found.])])
AC_SUBST([bitcoin_protocol_PKG], ['libbitcoin-protocol >= 3.7.0'])
PKG_CHECK_MODULES([bitcoin_protocol], [libbitcoin-protocol >= 3.8.0],
[bitcoin_protocol_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-protocol >= 3.8.0" 2>/dev/null`"
bitcoin_protocol_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-protocol >= 3.8.0" 2>/dev/null`"],
[AC_MSG_ERROR([libbitcoin-protocol >= 3.8.0 is required but was not found.])])
AC_SUBST([bitcoin_protocol_PKG], ['libbitcoin-protocol >= 3.8.0'])
AC_SUBST([bitcoin_protocol_CPPFLAGS], [${bitcoin_protocol_CFLAGS}])
AS_IF([test x${bitcoin_protocol_INCLUDEDIR} != "x"],
[AC_SUBST([bitcoin_protocol_ISYS_CPPFLAGS], ["-isystem${bitcoin_protocol_INCLUDEDIR} ${bitcoin_protocol_OTHER_CFLAGS}"])],
Expand Down
4 changes: 2 additions & 2 deletions include/bitcoin/server/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_SERVER_VERSION "3.7.0"
#define LIBBITCOIN_SERVER_VERSION "3.8.0"
#define LIBBITCOIN_SERVER_MAJOR_VERSION 3
#define LIBBITCOIN_SERVER_MINOR_VERSION 7
#define LIBBITCOIN_SERVER_MINOR_VERSION 8
#define LIBBITCOIN_SERVER_PATCH_VERSION 0

#endif
2 changes: 1 addition & 1 deletion libbitcoin-server.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-protocol >= 3.7.0 libbitcoin-node >= 3.7.0
Requires: libbitcoin-protocol >= 3.8.0 libbitcoin-node >= 3.8.0

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

0 comments on commit 8c4118d

Please sign in to comment.