From f8974b2781ed304578bf39a73686be2acbc309a0 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Fri, 23 Feb 2024 01:34:54 -0800 Subject: [PATCH] Regenerate artifacts. --- .github/workflows/ci.yml | 19 ++++++++------- build.cmd | 6 ++--- builds/cmake/CMakeLists.txt | 16 ++++++------- builds/cmake/CMakePresets.json | 4 ++-- install-cmake.sh | 42 ++++++++++++++++++++++++++++++++++ install-cmakepresets.sh | 42 ++++++++++++++++++++++++++++++++++ install.sh | 42 ++++++++++++++++++++++++++++++++++ 7 files changed, 150 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 946bbec..2a77ba5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -187,9 +187,10 @@ jobs: - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }} - uses: pmienk/coveralls-github-action@master + uses: coverallsapp/github-action@v2.2.3 with: - path-to-lcov: "./coverage.info" + format: lcov + files: "./coverage.info" github-token: ${{ secrets.github_token }} - name: Failure display available binaries @@ -420,9 +421,10 @@ jobs: - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }} - uses: pmienk/coveralls-github-action@master + uses: coverallsapp/github-action@v2.2.3 with: - path-to-lcov: "./coverage.info" + format: lcov + files: "./coverage.info" github-token: ${{ secrets.github_token }} - name: Failure display available binaries @@ -622,9 +624,10 @@ jobs: - name: Coveralls.io Upload if: ${{ matrix.coverage == 'cov' }} - uses: pmienk/coveralls-github-action@master + uses: coverallsapp/github-action@v2.2.3 with: - path-to-lcov: "./coverage.info" + format: lcov + files: "./coverage.info" github-token: ${{ secrets.github_token }} - name: Failure display available binaries @@ -719,7 +722,7 @@ jobs: steps: - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 with: msbuild-architecture: x64 @@ -749,7 +752,7 @@ jobs: } - name: Execute build - run: .\build.cmd .. ${{ matrix.platform }} ${{ matrix.configuration }} ${{ matrix.version }} + run: .\build.cmd .. ${{ matrix.platform }} ${{ matrix.configuration }} x64 ${{ matrix.version }} - name: Execute tests shell: powershell diff --git a/build.cmd b/build.cmd index 06accdb..2b6638e 100644 --- a/build.cmd +++ b/build.cmd @@ -11,10 +11,10 @@ SET "relative_path_base=%~1" call cd /d "%relative_path_base%" SET "path_base=%cd%" SET "nuget_pkg_path=%path_base%\.nuget\packages" -SET "msbuild_args=/verbosity:minimal /p:Platform=%~2 /p:Configuration=%~3" -SET "proj_version=%~4" +SET "msbuild_args=/verbosity:minimal /p:Platform=%~2 /p:Configuration=%~3 /p:PreferredToolArchitecture=%~4" +SET "proj_version=%~5" SET "msbuild_exe=msbuild" -IF EXIST "%~5" SET "msbuild_exe=%~5" +IF EXIST "%~6" SET "msbuild_exe=%~6" call :pending "Build initialized..." IF NOT EXIST "%nuget_pkg_path%" ( diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index fdec50c..8aeeff8 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -45,7 +45,7 @@ set( CMAKE_CXX_STANDARD_REQUIRED ON ) # Warn on all stuff. check_cxx_compiler_flag( "-Wall" HAS_FLAG_WALL ) if ( HAS_FLAG_WALL ) - add_compile_options( "-Wall" ) + add_compile_options( $<$:-Wall> ) else() message( FATAL_ERROR "Compiler does not support -Wall" ) endif() @@ -53,7 +53,7 @@ endif() # Warn on extra stuff. check_cxx_compiler_flag( "-Wextra" HAS_FLAG_WEXTRA ) if ( HAS_FLAG_WEXTRA ) - add_compile_options( "-Wextra" ) + add_compile_options( $<$:-Wextra> ) else() message( FATAL_ERROR "Compiler does not support -Wextra" ) endif() @@ -61,7 +61,7 @@ endif() # Disallow warning on style order of declarations. check_cxx_compiler_flag( "-Wno-reorder" HAS_FLAG_WNO-REORDER ) if ( HAS_FLAG_WNO-REORDER ) - add_compile_options( "-Wno-reorder" ) + add_compile_options( $<$:-Wno-reorder> ) else() message( FATAL_ERROR "Compiler does not support -Wno-reorder" ) endif() @@ -69,7 +69,7 @@ endif() # Suppress warning for incomplete field initialization. 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" ) + add_compile_options( $<$:-Wno-missing-field-initializers> ) else() message( FATAL_ERROR "Compiler does not support -Wno-missing-field-initializers" ) endif() @@ -77,7 +77,7 @@ endif() # Conform to style. check_cxx_compiler_flag( "-Wno-missing-braces" HAS_FLAG_WNO-MISSING-BRACES ) if ( HAS_FLAG_WNO-MISSING-BRACES ) - add_compile_options( "-Wno-missing-braces" ) + add_compile_options( $<$:-Wno-missing-braces> ) else() message( FATAL_ERROR "Compiler does not support -Wno-missing-braces" ) endif() @@ -85,7 +85,7 @@ endif() # Ignore comments within comments or commenting of backslash extended lines. check_cxx_compiler_flag( "-Wno-comment" HAS_FLAG_WNO-COMMENT ) if ( HAS_FLAG_WNO-COMMENT ) - add_compile_options( "-Wno-comment" ) + add_compile_options( $<$:-Wno-comment> ) else() message( FATAL_ERROR "Compiler does not support -Wno-comment" ) endif() @@ -93,7 +93,7 @@ endif() # Suppress warning for copy of implicitly generated copy constructor. check_cxx_compiler_flag( "-Wno-deprecated-copy" HAS_FLAG_WNO-DEPRECATED-COPY ) if ( HAS_FLAG_WNO-DEPRECATED-COPY ) - add_compile_options( "-Wno-deprecated-copy" ) + add_compile_options( $<$:-Wno-deprecated-copy> ) else() message( FATAL_ERROR "Compiler does not support -Wno-deprecated-copy" ) endif() @@ -102,7 +102,7 @@ endif() if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") check_cxx_compiler_flag( "-Wno-mismatched-tags" HAS_FLAG_WNO-MISMATCHED-TAGS ) if ( HAS_FLAG_WNO-MISMATCHED-TAGS ) - add_compile_options( "-Wno-mismatched-tags" ) + add_compile_options( $<$:-Wno-mismatched-tags> ) else() message( FATAL_ERROR "Compiler does not support -Wno-mismatched-tags" ) endif() diff --git a/builds/cmake/CMakePresets.json b/builds/cmake/CMakePresets.json index e2719d5..048dc10 100644 --- a/builds/cmake/CMakePresets.json +++ b/builds/cmake/CMakePresets.json @@ -79,8 +79,8 @@ "description": "Factored size optimization settings.", "hidden": true, "cacheVariables": { - "CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -Os -s", - "CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Os -s" + "CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -Os", + "CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Os" } }, { diff --git a/install-cmake.sh b/install-cmake.sh index ee7a445..0941308 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -863,7 +863,12 @@ build_from_tarball_boost() display_message "BOOST_OPTIONS : $*" display_message "--------------------------------------------------------------------" + guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset` + CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w" + cp tools/build/src/engine/b2 . + ./bootstrap.sh \ + "--with-bjam=./b2" \ "--prefix=$PREFIX" \ "--with-icu=$ICU_PREFIX" @@ -881,6 +886,7 @@ build_from_tarball_boost() "$BOOST_CXXFLAGS" \ "$BOOST_LINKFLAGS" \ "link=$BOOST_LINK" \ + "warnings=off" \ "boost.locale.iconv=$BOOST_ICU_ICONV" \ "boost.locale.posix=$BOOST_ICU_POSIX" \ "-sNO_BZIP2=1" \ @@ -904,15 +910,32 @@ build_from_tarball_boost() build_all() { unpack_from_tarball "$ZMQ_ARCHIVE" "$ZMQ_URL" gzip "$BUILD_ZMQ" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${ZMQ_FLAGS[@]}" build_from_tarball "$ZMQ_ARCHIVE" . "$PARALLEL" "$BUILD_ZMQ" "${ZMQ_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS + export CPPFLAGS=$SAVE_CPPFLAGS unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}" build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS + export CPPFLAGS=$SAVE_CPPFLAGS unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}" build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}" + export CPPFLAGS=$SAVE_CPPFLAGS create_from_github libbitcoin secp256k1 version8 "yes" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}" build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS + export CPPFLAGS=$SAVE_CPPFLAGS create_from_github libbitcoin libbitcoin-system master "yes" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}" build_from_github_cmake libbitcoin-system "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@" + export CPPFLAGS=$SAVE_CPPFLAGS + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${BITCOIN_PROTOCOL_FLAGS[@]}" if [[ ! ($CI == true) ]]; then create_from_github libbitcoin libbitcoin-protocol master "yes" build_from_github_cmake libbitcoin-protocol "$PARALLEL" true "yes" "${BITCOIN_PROTOCOL_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@" @@ -923,6 +946,7 @@ build_all() pop_directory pop_directory fi + export CPPFLAGS=$SAVE_CPPFLAGS } @@ -944,6 +968,24 @@ set_with_boost_prefix remove_install_options +# Define build flags. +#============================================================================== +# Define zmq flags. +#------------------------------------------------------------------------------ +ZMQ_FLAGS=( +"-w") + +# Define icu flags. +#------------------------------------------------------------------------------ +ICU_FLAGS=( +"-w") + +# Define secp256k1 flags. +#------------------------------------------------------------------------------ +SECP256K1_FLAGS=( +"-w") + + # Define build options. #============================================================================== # Define zmq options. diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index 5c2fdb1..855f8d6 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -917,7 +917,12 @@ build_from_tarball_boost() display_message "BOOST_OPTIONS : $*" display_message "--------------------------------------------------------------------" + guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset` + CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w" + cp tools/build/src/engine/b2 . + ./bootstrap.sh \ + "--with-bjam=./b2" \ "--prefix=$PREFIX" \ "--with-icu=$ICU_PREFIX" @@ -935,6 +940,7 @@ build_from_tarball_boost() "$BOOST_CXXFLAGS" \ "$BOOST_LINKFLAGS" \ "link=$BOOST_LINK" \ + "warnings=off" \ "boost.locale.iconv=$BOOST_ICU_ICONV" \ "boost.locale.posix=$BOOST_ICU_POSIX" \ "-sNO_BZIP2=1" \ @@ -958,16 +964,33 @@ build_from_tarball_boost() build_all() { unpack_from_tarball "$ZMQ_ARCHIVE" "$ZMQ_URL" gzip "$BUILD_ZMQ" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${ZMQ_FLAGS[@]}" build_from_tarball "$ZMQ_ARCHIVE" . "$PARALLEL" "$BUILD_ZMQ" "${ZMQ_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS + export CPPFLAGS=$SAVE_CPPFLAGS unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}" build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS + export CPPFLAGS=$SAVE_CPPFLAGS unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}" build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}" + export CPPFLAGS=$SAVE_CPPFLAGS create_from_github libbitcoin secp256k1 version8 "yes" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}" build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS + export CPPFLAGS=$SAVE_CPPFLAGS create_from_github libbitcoin libbitcoin-system master "yes" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}" display_message "libbitcoin-system PRESET ${REPO_PRESET[libbitcoin-system]}" build_from_github_cmake libbitcoin-system ${REPO_PRESET[libbitcoin-system]} "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@" + export CPPFLAGS=$SAVE_CPPFLAGS + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${BITCOIN_PROTOCOL_FLAGS[@]}" if [[ ! ($CI == true) ]]; then create_from_github libbitcoin libbitcoin-protocol master "yes" display_message "libbitcoin-protocol PRESET ${REPO_PRESET[libbitcoin-protocol]}" @@ -980,6 +1003,7 @@ build_all() pop_directory pop_directory fi + export CPPFLAGS=$SAVE_CPPFLAGS } @@ -1001,6 +1025,24 @@ set_with_boost_prefix remove_install_options +# Define build flags. +#============================================================================== +# Define zmq flags. +#------------------------------------------------------------------------------ +ZMQ_FLAGS=( +"-w") + +# Define icu flags. +#------------------------------------------------------------------------------ +ICU_FLAGS=( +"-w") + +# Define secp256k1 flags. +#------------------------------------------------------------------------------ +SECP256K1_FLAGS=( +"-w") + + # Define build options. #============================================================================== # Define zmq options. diff --git a/install.sh b/install.sh index 743c07d..853b376 100755 --- a/install.sh +++ b/install.sh @@ -738,7 +738,12 @@ build_from_tarball_boost() display_message "BOOST_OPTIONS : $*" display_message "--------------------------------------------------------------------" + guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset` + CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w" + cp tools/build/src/engine/b2 . + ./bootstrap.sh \ + "--with-bjam=./b2" \ "--prefix=$PREFIX" \ "--with-icu=$ICU_PREFIX" @@ -756,6 +761,7 @@ build_from_tarball_boost() "$BOOST_CXXFLAGS" \ "$BOOST_LINKFLAGS" \ "link=$BOOST_LINK" \ + "warnings=off" \ "boost.locale.iconv=$BOOST_ICU_ICONV" \ "boost.locale.posix=$BOOST_ICU_POSIX" \ "-sNO_BZIP2=1" \ @@ -779,15 +785,32 @@ build_from_tarball_boost() build_all() { unpack_from_tarball "$ZMQ_ARCHIVE" "$ZMQ_URL" gzip "$BUILD_ZMQ" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${ZMQ_FLAGS[@]}" build_from_tarball "$ZMQ_ARCHIVE" . "$PARALLEL" "$BUILD_ZMQ" "${ZMQ_OPTIONS[@]}" "$@" + export CPPFLAGS=$SAVE_CPPFLAGS unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}" build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" "$@" + export CPPFLAGS=$SAVE_CPPFLAGS unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}" build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}" + export CPPFLAGS=$SAVE_CPPFLAGS create_from_github libbitcoin secp256k1 version8 "yes" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}" build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" "$@" + export CPPFLAGS=$SAVE_CPPFLAGS create_from_github libbitcoin libbitcoin-system master "yes" + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}" build_from_github libbitcoin-system "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" "$@" + export CPPFLAGS=$SAVE_CPPFLAGS + local SAVE_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS ${BITCOIN_PROTOCOL_FLAGS[@]}" if [[ ! ($CI == true) ]]; then create_from_github libbitcoin libbitcoin-protocol master "yes" build_from_github libbitcoin-protocol "$PARALLEL" true "yes" "${BITCOIN_PROTOCOL_OPTIONS[@]}" "$@" @@ -798,6 +821,7 @@ build_all() pop_directory pop_directory fi + export CPPFLAGS=$SAVE_CPPFLAGS } @@ -818,6 +842,24 @@ set_pkgconfigdir set_with_boost_prefix +# Define build flags. +#============================================================================== +# Define zmq flags. +#------------------------------------------------------------------------------ +ZMQ_FLAGS=( +"-w") + +# Define icu flags. +#------------------------------------------------------------------------------ +ICU_FLAGS=( +"-w") + +# Define secp256k1 flags. +#------------------------------------------------------------------------------ +SECP256K1_FLAGS=( +"-w") + + # Define build options. #============================================================================== # Define zmq options.