From e455d4b2433f624f9967f410d5378d5ceb602d8d Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Tue, 9 May 2023 17:04:06 -0700 Subject: [PATCH 1/3] Regenerate artifacts. --- .github/workflows/ci.yml | 46 ++++++++++-- builds/cmake/CMakeLists.txt | 65 +++++++++++++--- configure.ac | 146 ++++++++++++++++++------------------ 3 files changed, 168 insertions(+), 89 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dfa15c..f72d1c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,7 @@ jobs: zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "apt" packages: "" @@ -44,6 +45,7 @@ jobs: zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "apt" packages: "" @@ -59,6 +61,7 @@ jobs: zmq: "--build-zmq" cc: "gcc" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "apt" packages: "" @@ -74,6 +77,7 @@ jobs: zmq: "--build-zmq" cc: "gcc" flags: "-Og -fPIE" + options: "--enable-isystem" packager: "apt" packages: "" @@ -89,6 +93,7 @@ jobs: zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "brew" packages: "" @@ -104,6 +109,7 @@ jobs: zmq: "--build-zmq" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE" + options: "--enable-isystem" packager: "brew" packages: "" @@ -155,11 +161,16 @@ jobs: echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV fi + - name: Display CPU details + if: ${{ (runner.os == 'Linux') }} + shell: bash + run: | + lscpu + - name: Execute install.sh run: > ./install.sh - --enable-isystem - --build-dir=$LIBBITCOIN_SRC_PATH + --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }} --prefix=$LIBBITCOIN_SRC_PATH/prefix ${{ env.LINKAGE }} ${{ env.ASSERT_NDEBUG }} @@ -214,11 +225,11 @@ jobs: run: | cat ${{ github.workspace }}/build/build-*/bootstrap.log + - name: Failure display otool output if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test - - name: Failure display DYLD_PRINT_LIBRARIES if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | @@ -249,6 +260,7 @@ jobs: zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -264,6 +276,7 @@ jobs: zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -279,6 +292,7 @@ jobs: zmq: "--build-zmq" cc: "gcc" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -294,6 +308,7 @@ jobs: zmq: "--build-zmq" cc: "gcc" flags: "-Og -fPIE" + options: "" packager: "apt" packages: "" @@ -309,6 +324,7 @@ jobs: zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE" + options: "" packager: "brew" packages: "" @@ -324,6 +340,7 @@ jobs: zmq: "--build-zmq" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE" + options: "" packager: "brew" packages: "" @@ -378,10 +395,16 @@ jobs: echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV fi + - name: Display CPU details + if: ${{ (runner.os == 'Linux') }} + shell: bash + run: | + lscpu + - name: Execute install-cmake.sh run: > ./install-cmake.sh - --build-dir=$LIBBITCOIN_SRC_PATH + --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }} --prefix=$LIBBITCOIN_SRC_PATH/prefix ${{ env.LINKAGE }} ${{ env.ASSERT_NDEBUG }} @@ -436,11 +459,11 @@ jobs: run: | cat ${{ github.workspace }}/build/build-*/bootstrap.log + - name: Failure display otool output if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test - - name: Failure display DYLD_PRINT_LIBRARIES if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | @@ -482,6 +505,7 @@ jobs: zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -498,6 +522,7 @@ jobs: zmq: "--build-zmq" cc: "clang" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -514,6 +539,7 @@ jobs: zmq: "--build-zmq" cc: "gcc" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -568,10 +594,16 @@ jobs: echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV fi + - name: Display CPU details + if: ${{ (runner.os == 'Linux') }} + shell: bash + run: | + lscpu + - name: Execute install-cmakepresets.sh run: > ./install-cmakepresets.sh - --build-dir=$LIBBITCOIN_SRC_PATH + --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }} --prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }} --preset=${{ matrix.preset }} ${{ env.LINKAGE }} @@ -627,11 +659,11 @@ jobs: run: | cat ${{ github.workspace }}/build/build-*/bootstrap.log + - name: Failure display otool output if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test - - name: Failure display DYLD_PRINT_LIBRARIES if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index cd30743..0ac77b7 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -16,6 +16,8 @@ enable_testing() list( APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/modules" ) include(CheckIncludeFiles) include(CheckSymbolExists) +include(CheckCXXCompilerFlag) +include(CheckCXXSourceCompiles) set_property(GLOBAL PROPERTY USE_FOLDERS ON) @@ -40,32 +42,77 @@ set( CMAKE_CXX_STANDARD_REQUIRED ON ) # Add compiler options #------------------------------------------------------------------------------ # Warn on all stuff. -add_compile_options( "-Wall" ) +check_cxx_compiler_flag( "-Wall" HAS_FLAG_WALL ) +if ( HAS_FLAG_WALL ) + add_compile_options( "-Wall" ) +else() + message( FATAL_ERROR "Compiler does not support -Wall" ) +endif() # Warn on extra stuff. -add_compile_options( "-Wextra" ) +check_cxx_compiler_flag( "-Wextra" HAS_FLAG_WEXTRA ) +if ( HAS_FLAG_WEXTRA ) + add_compile_options( "-Wextra" ) +else() + message( FATAL_ERROR "Compiler does not support -Wextra" ) +endif() # Be really annoying. -add_compile_options( "-Wpedantic" ) +check_cxx_compiler_flag( "-Wpedantic" HAS_FLAG_WPEDANTIC ) +if ( HAS_FLAG_WPEDANTIC ) + add_compile_options( "-Wpedantic" ) +else() + message( FATAL_ERROR "Compiler does not support -Wpedantic" ) +endif() # Disallow warning on style order of declarations. -add_compile_options( "-Wno-reorder" ) +check_cxx_compiler_flag( "-Wno-reorder" HAS_FLAG_WNO-REORDER ) +if ( HAS_FLAG_WNO-REORDER ) + add_compile_options( "-Wno-reorder" ) +else() + message( FATAL_ERROR "Compiler does not support -Wno-reorder" ) +endif() # Suppress warning for incomplete field initialization. -add_compile_options( "-Wno-missing-field-initializers" ) +check_cxx_compiler_flag( "-Wno-missing-field-initializers" HAS_FLAG_WNO-MISSING-FIELD-INITIALIZERS ) +if ( HAS_FLAG_WNO-MISSING-FIELD-INITIALIZERS ) + add_compile_options( "-Wno-missing-field-initializers" ) +else() + message( FATAL_ERROR "Compiler does not support -Wno-missing-field-initializers" ) +endif() # Conform to style. -add_compile_options( "-Wno-missing-braces" ) +check_cxx_compiler_flag( "-Wno-missing-braces" HAS_FLAG_WNO-MISSING-BRACES ) +if ( HAS_FLAG_WNO-MISSING-BRACES ) + add_compile_options( "-Wno-missing-braces" ) +else() + message( FATAL_ERROR "Compiler does not support -Wno-missing-braces" ) +endif() # Ignore comments within comments or commenting of backslash extended lines. -add_compile_options( "-Wno-comment" ) +check_cxx_compiler_flag( "-Wno-comment" HAS_FLAG_WNO-COMMENT ) +if ( HAS_FLAG_WNO-COMMENT ) + add_compile_options( "-Wno-comment" ) +else() + message( FATAL_ERROR "Compiler does not support -Wno-comment" ) +endif() # Suppress warning for copy of implicitly generated copy constructor. -add_compile_options( "-Wno-deprecated-copy" ) +check_cxx_compiler_flag( "-Wno-deprecated-copy" HAS_FLAG_WNO-DEPRECATED-COPY ) +if ( HAS_FLAG_WNO-DEPRECATED-COPY ) + add_compile_options( "-Wno-deprecated-copy" ) +else() + message( FATAL_ERROR "Compiler does not support -Wno-deprecated-copy" ) +endif() # Conflict in stdlib under clang. if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - add_compile_options( "-Wno-mismatched-tags" ) + check_cxx_compiler_flag( "-Wno-mismatched-tags" HAS_FLAG_WNO-MISMATCHED-TAGS ) + if ( HAS_FLAG_WNO-MISMATCHED-TAGS ) + add_compile_options( "-Wno-mismatched-tags" ) + else() + message( FATAL_ERROR "Compiler does not support -Wno-mismatched-tags" ) + endif() endif() # Implement -Dpkgconfigdir and output ${pkgconfigdir}. diff --git a/configure.ac b/configure.ac index fac70ae..d30845d 100644 --- a/configure.ac +++ b/configure.ac @@ -124,79 +124,6 @@ AC_ARG_ENABLE([isystem], AC_MSG_RESULT([$enable_isystem]) -# Check dependencies. -#============================================================================== -# Require Boost of at least version 1.72.0 and output ${boost_CPPFLAGS/LDFLAGS}. -#------------------------------------------------------------------------------ -AS_CASE([${CC}], [*], - [AX_BOOST_BASE([1.72.0], - [AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}]) - AC_SUBST([boost_ISYS_CPPFLAGS], [`echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]) - AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}]) - AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}]) - AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}]) - AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])], - [AC_MSG_ERROR([Boost 1.72.0 or later is required but was not found.])])]) - -AS_CASE([${enable_isystem}],[yes], - [AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_ISYS_CPPFLAGS}])], - [AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_CPPFLAGS}])]) - -AC_MSG_NOTICE([boost_BUILD_CPPFLAGS : ${boost_BUILD_CPPFLAGS}]) - -AS_CASE([${with_tests}], [yes], - [AX_BOOST_UNIT_TEST_FRAMEWORK - AC_SUBST([boost_unit_test_framework_LIBS], [${BOOST_UNIT_TEST_FRAMEWORK_LIB}]) - 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.3.4 and output ${zmq_CPPFLAGS/LIBS/PKG}. -#------------------------------------------------------------------------------ -PKG_CHECK_MODULES([zmq], [libzmq >= 4.3.4], - [zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.3.4" 2>/dev/null`" - zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.3.4" 2>/dev/null`"], - [AC_MSG_ERROR([libzmq >= 4.3.4 is required but was not found.])]) -AC_SUBST([zmq_PKG], ['libzmq >= 4.3.4']) -AC_SUBST([zmq_CPPFLAGS], [${zmq_CFLAGS}]) -AS_IF([test x${zmq_INCLUDEDIR} != "x"], - [AC_SUBST([zmq_ISYS_CPPFLAGS], ["-isystem${zmq_INCLUDEDIR} ${zmq_OTHER_CFLAGS}"])], - [AC_SUBST([zmq_ISYS_CPPFLAGS], [${zmq_OTHER_CFLAGS}])]) -AC_MSG_NOTICE([zmq_CPPFLAGS : ${zmq_CPPFLAGS}]) -AC_MSG_NOTICE([zmq_ISYS_CPPFLAGS : ${zmq_ISYS_CPPFLAGS}]) -AC_MSG_NOTICE([zmq_OTHER_CFLAGS : ${zmq_OTHER_CFLAGS}]) -AC_MSG_NOTICE([zmq_INCLUDEDIR : ${zmq_INCLUDEDIR}]) -AC_MSG_NOTICE([zmq_LIBS : ${zmq_LIBS}]) - -AS_CASE([${enable_isystem}],[yes], - [AC_SUBST([zmq_BUILD_CPPFLAGS], [${zmq_ISYS_CPPFLAGS}])], - [AC_SUBST([zmq_BUILD_CPPFLAGS], [${zmq_CPPFLAGS}])]) - -AC_MSG_NOTICE([zmq_BUILD_CPPFLAGS : ${zmq_BUILD_CPPFLAGS}]) - -# Require bitcoin-system of at least version 3.7.0 and output ${bitcoin_system_CPPFLAGS/LIBS/PKG}. -#------------------------------------------------------------------------------ -PKG_CHECK_MODULES([bitcoin_system], [libbitcoin-system >= 3.7.0], - [bitcoin_system_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-system >= 3.7.0" 2>/dev/null`" - bitcoin_system_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-system >= 3.7.0" 2>/dev/null`"], - [AC_MSG_ERROR([libbitcoin-system >= 3.7.0 is required but was not found.])]) -AC_SUBST([bitcoin_system_PKG], ['libbitcoin-system >= 3.7.0']) -AC_SUBST([bitcoin_system_CPPFLAGS], [${bitcoin_system_CFLAGS}]) -AS_IF([test x${bitcoin_system_INCLUDEDIR} != "x"], - [AC_SUBST([bitcoin_system_ISYS_CPPFLAGS], ["-isystem${bitcoin_system_INCLUDEDIR} ${bitcoin_system_OTHER_CFLAGS}"])], - [AC_SUBST([bitcoin_system_ISYS_CPPFLAGS], [${bitcoin_system_OTHER_CFLAGS}])]) -AC_MSG_NOTICE([bitcoin_system_CPPFLAGS : ${bitcoin_system_CPPFLAGS}]) -AC_MSG_NOTICE([bitcoin_system_ISYS_CPPFLAGS : ${bitcoin_system_ISYS_CPPFLAGS}]) -AC_MSG_NOTICE([bitcoin_system_OTHER_CFLAGS : ${bitcoin_system_OTHER_CFLAGS}]) -AC_MSG_NOTICE([bitcoin_system_INCLUDEDIR : ${bitcoin_system_INCLUDEDIR}]) -AC_MSG_NOTICE([bitcoin_system_LIBS : ${bitcoin_system_LIBS}]) - -AS_CASE([${enable_isystem}],[yes], - [AC_SUBST([bitcoin_system_BUILD_CPPFLAGS], [${bitcoin_system_ISYS_CPPFLAGS}])], - [AC_SUBST([bitcoin_system_BUILD_CPPFLAGS], [${bitcoin_system_CPPFLAGS}])]) - -AC_MSG_NOTICE([bitcoin_system_BUILD_CPPFLAGS : ${bitcoin_system_BUILD_CPPFLAGS}]) - - # Set flags. #============================================================================== # Require c++11 for all c++ products. @@ -294,6 +221,79 @@ AS_CASE([${CC}], [*], [LDFLAGS="$LDFLAGS -fstack-protector-all"])]) +# Check dependencies. +#============================================================================== +# Require Boost of at least version 1.72.0 and output ${boost_CPPFLAGS/LDFLAGS}. +#------------------------------------------------------------------------------ +AS_CASE([${CC}], [*], + [AX_BOOST_BASE([1.72.0], + [AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}]) + AC_SUBST([boost_ISYS_CPPFLAGS], [`echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]) + AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}]) + AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}]) + AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}]) + AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])], + [AC_MSG_ERROR([Boost 1.72.0 or later is required but was not found.])])]) + +AS_CASE([${enable_isystem}],[yes], + [AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_ISYS_CPPFLAGS}])], + [AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_CPPFLAGS}])]) + +AC_MSG_NOTICE([boost_BUILD_CPPFLAGS : ${boost_BUILD_CPPFLAGS}]) + +AS_CASE([${with_tests}], [yes], + [AX_BOOST_UNIT_TEST_FRAMEWORK + AC_SUBST([boost_unit_test_framework_LIBS], [${BOOST_UNIT_TEST_FRAMEWORK_LIB}]) + 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.3.4 and output ${zmq_CPPFLAGS/LIBS/PKG}. +#------------------------------------------------------------------------------ +PKG_CHECK_MODULES([zmq], [libzmq >= 4.3.4], + [zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.3.4" 2>/dev/null`" + zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.3.4" 2>/dev/null`"], + [AC_MSG_ERROR([libzmq >= 4.3.4 is required but was not found.])]) +AC_SUBST([zmq_PKG], ['libzmq >= 4.3.4']) +AC_SUBST([zmq_CPPFLAGS], [${zmq_CFLAGS}]) +AS_IF([test x${zmq_INCLUDEDIR} != "x"], + [AC_SUBST([zmq_ISYS_CPPFLAGS], ["-isystem${zmq_INCLUDEDIR} ${zmq_OTHER_CFLAGS}"])], + [AC_SUBST([zmq_ISYS_CPPFLAGS], [${zmq_OTHER_CFLAGS}])]) +AC_MSG_NOTICE([zmq_CPPFLAGS : ${zmq_CPPFLAGS}]) +AC_MSG_NOTICE([zmq_ISYS_CPPFLAGS : ${zmq_ISYS_CPPFLAGS}]) +AC_MSG_NOTICE([zmq_OTHER_CFLAGS : ${zmq_OTHER_CFLAGS}]) +AC_MSG_NOTICE([zmq_INCLUDEDIR : ${zmq_INCLUDEDIR}]) +AC_MSG_NOTICE([zmq_LIBS : ${zmq_LIBS}]) + +AS_CASE([${enable_isystem}],[yes], + [AC_SUBST([zmq_BUILD_CPPFLAGS], [${zmq_ISYS_CPPFLAGS}])], + [AC_SUBST([zmq_BUILD_CPPFLAGS], [${zmq_CPPFLAGS}])]) + +AC_MSG_NOTICE([zmq_BUILD_CPPFLAGS : ${zmq_BUILD_CPPFLAGS}]) + +# Require bitcoin-system of at least version 3.7.0 and output ${bitcoin_system_CPPFLAGS/LIBS/PKG}. +#------------------------------------------------------------------------------ +PKG_CHECK_MODULES([bitcoin_system], [libbitcoin-system >= 3.7.0], + [bitcoin_system_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-system >= 3.7.0" 2>/dev/null`" + bitcoin_system_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-system >= 3.7.0" 2>/dev/null`"], + [AC_MSG_ERROR([libbitcoin-system >= 3.7.0 is required but was not found.])]) +AC_SUBST([bitcoin_system_PKG], ['libbitcoin-system >= 3.7.0']) +AC_SUBST([bitcoin_system_CPPFLAGS], [${bitcoin_system_CFLAGS}]) +AS_IF([test x${bitcoin_system_INCLUDEDIR} != "x"], + [AC_SUBST([bitcoin_system_ISYS_CPPFLAGS], ["-isystem${bitcoin_system_INCLUDEDIR} ${bitcoin_system_OTHER_CFLAGS}"])], + [AC_SUBST([bitcoin_system_ISYS_CPPFLAGS], [${bitcoin_system_OTHER_CFLAGS}])]) +AC_MSG_NOTICE([bitcoin_system_CPPFLAGS : ${bitcoin_system_CPPFLAGS}]) +AC_MSG_NOTICE([bitcoin_system_ISYS_CPPFLAGS : ${bitcoin_system_ISYS_CPPFLAGS}]) +AC_MSG_NOTICE([bitcoin_system_OTHER_CFLAGS : ${bitcoin_system_OTHER_CFLAGS}]) +AC_MSG_NOTICE([bitcoin_system_INCLUDEDIR : ${bitcoin_system_INCLUDEDIR}]) +AC_MSG_NOTICE([bitcoin_system_LIBS : ${bitcoin_system_LIBS}]) + +AS_CASE([${enable_isystem}],[yes], + [AC_SUBST([bitcoin_system_BUILD_CPPFLAGS], [${bitcoin_system_ISYS_CPPFLAGS}])], + [AC_SUBST([bitcoin_system_BUILD_CPPFLAGS], [${bitcoin_system_CPPFLAGS}])]) + +AC_MSG_NOTICE([bitcoin_system_BUILD_CPPFLAGS : ${bitcoin_system_BUILD_CPPFLAGS}]) + + # Process outputs into templates. #============================================================================== AC_CONFIG_FILES([Makefile libbitcoin-protocol.pc]) From b56c47c82715b68392ecf3c5bd742b3755f265e2 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Wed, 16 Aug 2023 17:27:34 -0700 Subject: [PATCH 2/3] Update copyright year range. --- .github/workflows/ci.yml | 2 +- Makefile.am | 2 +- autogen.sh | 2 +- build.cmd | 2 +- builds/cmake/CMakeLists.txt | 2 +- builds/cmake/modules/FindBitcoin-System.cmake | 2 +- builds/cmake/modules/FindBitcoin.cmake | 2 +- builds/cmake/modules/FindMbedtls.cmake | 2 +- builds/cmake/modules/FindZmq.cmake | 2 +- builds/msvc/debug.natvis | 2 +- .../libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj | 2 +- .../libbitcoin-protocol-test.vcxproj.filters | 2 +- builds/msvc/vs2022/libbitcoin-protocol-test/packages.config | 2 +- .../msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj | 2 +- .../libbitcoin-protocol/libbitcoin-protocol.vcxproj.filters | 2 +- builds/msvc/vs2022/libbitcoin-protocol/packages.config | 2 +- configure.ac | 2 +- include/bitcoin/protocol.hpp | 2 +- include/bitcoin/protocol/define.hpp | 2 +- include/bitcoin/protocol/settings.hpp | 2 +- include/bitcoin/protocol/version.hpp | 2 +- include/bitcoin/protocol/zmq/authenticator.hpp | 2 +- include/bitcoin/protocol/zmq/certificate.hpp | 2 +- include/bitcoin/protocol/zmq/context.hpp | 2 +- include/bitcoin/protocol/zmq/frame.hpp | 2 +- include/bitcoin/protocol/zmq/identifiers.hpp | 2 +- include/bitcoin/protocol/zmq/message.hpp | 2 +- include/bitcoin/protocol/zmq/poller.hpp | 2 +- include/bitcoin/protocol/zmq/socket.hpp | 2 +- include/bitcoin/protocol/zmq/worker.hpp | 2 +- include/bitcoin/protocol/zmq/zeromq.hpp | 2 +- install-cmake.sh | 2 +- install-cmakepresets.sh | 2 +- install.sh | 2 +- libbitcoin-protocol-test_runner.sh | 2 +- libbitcoin-protocol.pc.in | 2 +- src/settings.cpp | 2 +- src/zmq/authenticator.cpp | 2 +- src/zmq/certificate.cpp | 2 +- src/zmq/context.cpp | 2 +- src/zmq/frame.cpp | 2 +- src/zmq/identifiers.cpp | 2 +- src/zmq/message.cpp | 2 +- src/zmq/poller.cpp | 2 +- src/zmq/socket.cpp | 2 +- src/zmq/worker.cpp | 2 +- src/zmq/zeromq.cpp | 2 +- test/converter.cpp | 2 +- test/main.cpp | 2 +- test/utility.hpp | 2 +- test/zmq/authenticator.cpp | 2 +- test/zmq/certificate.cpp | 2 +- test/zmq/context.cpp | 2 +- test/zmq/frame.cpp | 2 +- test/zmq/identifiers.cpp | 2 +- test/zmq/message.cpp | 2 +- test/zmq/poller.cpp | 2 +- test/zmq/socket.cpp | 2 +- test/zmq/worker.cpp | 2 +- 59 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f72d1c9..e12baf3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/Makefile.am b/Makefile.am index 29c4bee..28901ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/autogen.sh b/autogen.sh index c193402..34b1759 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/build.cmd b/build.cmd index e2fc2ab..7792d60 100644 --- a/build.cmd +++ b/build.cmd @@ -1,5 +1,5 @@ REM ########################################################################### -REM # Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING). +REM # Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING). REM # REM # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY REM # diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index 0ac77b7..7007385 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/builds/cmake/modules/FindBitcoin-System.cmake b/builds/cmake/modules/FindBitcoin-System.cmake index 1a5d052..63f4083 100644 --- a/builds/cmake/modules/FindBitcoin-System.cmake +++ b/builds/cmake/modules/FindBitcoin-System.cmake @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/builds/cmake/modules/FindBitcoin.cmake b/builds/cmake/modules/FindBitcoin.cmake index 9536241..f33b9df 100644 --- a/builds/cmake/modules/FindBitcoin.cmake +++ b/builds/cmake/modules/FindBitcoin.cmake @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/builds/cmake/modules/FindMbedtls.cmake b/builds/cmake/modules/FindMbedtls.cmake index b938a06..03a534d 100644 --- a/builds/cmake/modules/FindMbedtls.cmake +++ b/builds/cmake/modules/FindMbedtls.cmake @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin developers (see COPYING). # ############################################################################### # FindMbedtls diff --git a/builds/cmake/modules/FindZmq.cmake b/builds/cmake/modules/FindZmq.cmake index 47b879b..3d5dada 100644 --- a/builds/cmake/modules/FindZmq.cmake +++ b/builds/cmake/modules/FindZmq.cmake @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/builds/msvc/debug.natvis b/builds/msvc/debug.natvis index b55daa2..4867d1d 100644 --- a/builds/msvc/debug.natvis +++ b/builds/msvc/debug.natvis @@ -1,6 +1,6 @@