Skip to content

Commit 468696b

Browse files
pmienkpmienk
committed
Regenerate artifacts.
1 parent 62889cd commit 468696b

File tree

7 files changed

+144
-21
lines changed

7 files changed

+144
-21
lines changed

‎.github/workflows/ci.yml

+11-8
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,10 @@ jobs:
187187
188188
- name: Coveralls.io Upload
189189
if: ${{ matrix.coverage == 'cov' }}
190-
uses: pmienk/coveralls-github-action@master
190+
uses: coverallsapp/github-action@v2.2.3
191191
with:
192-
path-to-lcov: "./coverage.info"
192+
format: lcov
193+
files: "./coverage.info"
193194
github-token: ${{ secrets.github_token }}
194195

195196
- name: Failure display available binaries
@@ -420,9 +421,10 @@ jobs:
420421
421422
- name: Coveralls.io Upload
422423
if: ${{ matrix.coverage == 'cov' }}
423-
uses: pmienk/coveralls-github-action@master
424+
uses: coverallsapp/github-action@v2.2.3
424425
with:
425-
path-to-lcov: "./coverage.info"
426+
format: lcov
427+
files: "./coverage.info"
426428
github-token: ${{ secrets.github_token }}
427429

428430
- name: Failure display available binaries
@@ -622,9 +624,10 @@ jobs:
622624
623625
- name: Coveralls.io Upload
624626
if: ${{ matrix.coverage == 'cov' }}
625-
uses: pmienk/coveralls-github-action@master
627+
uses: coverallsapp/github-action@v2.2.3
626628
with:
627-
path-to-lcov: "./coverage.info"
629+
format: lcov
630+
files: "./coverage.info"
628631
github-token: ${{ secrets.github_token }}
629632

630633
- name: Failure display available binaries
@@ -707,7 +710,7 @@ jobs:
707710

708711
steps:
709712
- name: Add msbuild to PATH
710-
uses: microsoft/setup-msbuild@v1.1
713+
uses: microsoft/setup-msbuild@v2
711714
with:
712715
msbuild-architecture: x64
713716

@@ -737,7 +740,7 @@ jobs:
737740
}
738741
739742
- name: Execute build
740-
run: .\build.cmd .. ${{ matrix.platform }} ${{ matrix.configuration }} ${{ matrix.version }}
743+
run: .\build.cmd .. ${{ matrix.platform }} ${{ matrix.configuration }} x64 ${{ matrix.version }}
741744

742745
- name: Execute tests
743746
shell: powershell

‎build.cmd

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ SET "relative_path_base=%~1"
1111
call cd /d "%relative_path_base%"
1212
SET "path_base=%cd%"
1313
SET "nuget_pkg_path=%path_base%\.nuget\packages"
14-
SET "msbuild_args=/verbosity:minimal /p:Platform=%~2 /p:Configuration=%~3"
15-
SET "proj_version=%~4"
14+
SET "msbuild_args=/verbosity:minimal /p:Platform=%~2 /p:Configuration=%~3 /p:PreferredToolArchitecture=%~4"
15+
SET "proj_version=%~5"
1616
SET "msbuild_exe=msbuild"
17-
IF EXIST "%~5" SET "msbuild_exe=%~5"
17+
IF EXIST "%~6" SET "msbuild_exe=%~6"
1818

1919
call :pending "Build initialized..."
2020
IF NOT EXIST "%nuget_pkg_path%" (

‎builds/cmake/CMakeLists.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -45,55 +45,55 @@ set( CMAKE_CXX_STANDARD_REQUIRED ON )
4545
# Warn on all stuff.
4646
check_cxx_compiler_flag( "-Wall" HAS_FLAG_WALL )
4747
if ( HAS_FLAG_WALL )
48-
add_compile_options( "-Wall" )
48+
add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-Wall> )
4949
else()
5050
message( FATAL_ERROR "Compiler does not support -Wall" )
5151
endif()
5252

5353
# Warn on extra stuff.
5454
check_cxx_compiler_flag( "-Wextra" HAS_FLAG_WEXTRA )
5555
if ( HAS_FLAG_WEXTRA )
56-
add_compile_options( "-Wextra" )
56+
add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-Wextra> )
5757
else()
5858
message( FATAL_ERROR "Compiler does not support -Wextra" )
5959
endif()
6060

6161
# Disallow warning on style order of declarations.
6262
check_cxx_compiler_flag( "-Wno-reorder" HAS_FLAG_WNO-REORDER )
6363
if ( HAS_FLAG_WNO-REORDER )
64-
add_compile_options( "-Wno-reorder" )
64+
add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-Wno-reorder> )
6565
else()
6666
message( FATAL_ERROR "Compiler does not support -Wno-reorder" )
6767
endif()
6868

6969
# Suppress warning for incomplete field initialization.
7070
check_cxx_compiler_flag( "-Wno-missing-field-initializers" HAS_FLAG_WNO-MISSING-FIELD-INITIALIZERS )
7171
if ( HAS_FLAG_WNO-MISSING-FIELD-INITIALIZERS )
72-
add_compile_options( "-Wno-missing-field-initializers" )
72+
add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-Wno-missing-field-initializers> )
7373
else()
7474
message( FATAL_ERROR "Compiler does not support -Wno-missing-field-initializers" )
7575
endif()
7676

7777
# Conform to style.
7878
check_cxx_compiler_flag( "-Wno-missing-braces" HAS_FLAG_WNO-MISSING-BRACES )
7979
if ( HAS_FLAG_WNO-MISSING-BRACES )
80-
add_compile_options( "-Wno-missing-braces" )
80+
add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-Wno-missing-braces> )
8181
else()
8282
message( FATAL_ERROR "Compiler does not support -Wno-missing-braces" )
8383
endif()
8484

8585
# Ignore comments within comments or commenting of backslash extended lines.
8686
check_cxx_compiler_flag( "-Wno-comment" HAS_FLAG_WNO-COMMENT )
8787
if ( HAS_FLAG_WNO-COMMENT )
88-
add_compile_options( "-Wno-comment" )
88+
add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-Wno-comment> )
8989
else()
9090
message( FATAL_ERROR "Compiler does not support -Wno-comment" )
9191
endif()
9292

9393
# Suppress warning for copy of implicitly generated copy constructor.
9494
check_cxx_compiler_flag( "-Wno-deprecated-copy" HAS_FLAG_WNO-DEPRECATED-COPY )
9595
if ( HAS_FLAG_WNO-DEPRECATED-COPY )
96-
add_compile_options( "-Wno-deprecated-copy" )
96+
add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-copy> )
9797
else()
9898
message( FATAL_ERROR "Compiler does not support -Wno-deprecated-copy" )
9999
endif()
@@ -102,7 +102,7 @@ endif()
102102
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
103103
check_cxx_compiler_flag( "-Wno-mismatched-tags" HAS_FLAG_WNO-MISMATCHED-TAGS )
104104
if ( HAS_FLAG_WNO-MISMATCHED-TAGS )
105-
add_compile_options( "-Wno-mismatched-tags" )
105+
add_compile_options( $<$<COMPILE_LANGUAGE:CXX>:-Wno-mismatched-tags> )
106106
else()
107107
message( FATAL_ERROR "Compiler does not support -Wno-mismatched-tags" )
108108
endif()

‎builds/cmake/CMakePresets.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
"description": "Factored size optimization settings.",
8080
"hidden": true,
8181
"cacheVariables": {
82-
"CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -Os -s",
83-
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Os -s"
82+
"CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -Os",
83+
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Os"
8484
}
8585
},
8686
{

‎install-cmake.sh

+40
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,12 @@ build_from_tarball_boost()
873873
display_message "BOOST_OPTIONS : $*"
874874
display_message "--------------------------------------------------------------------"
875875

876+
guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
877+
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
878+
cp tools/build/src/engine/b2 .
879+
876880
./bootstrap.sh \
881+
"--with-bjam=./b2" \
877882
"--prefix=$PREFIX" \
878883
"--with-icu=$ICU_PREFIX"
879884

@@ -891,6 +896,7 @@ build_from_tarball_boost()
891896
"$BOOST_CXXFLAGS" \
892897
"$BOOST_LINKFLAGS" \
893898
"link=$BOOST_LINK" \
899+
"warnings=off" \
894900
"boost.locale.iconv=$BOOST_ICU_ICONV" \
895901
"boost.locale.posix=$BOOST_ICU_POSIX" \
896902
"-sNO_BZIP2=1" \
@@ -914,17 +920,37 @@ build_from_tarball_boost()
914920
build_all()
915921
{
916922
unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU"
923+
local SAVE_CPPFLAGS="$CPPFLAGS"
924+
export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}"
917925
build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
926+
export CPPFLAGS=$SAVE_CPPFLAGS
918927
unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST"
928+
local SAVE_CPPFLAGS="$CPPFLAGS"
929+
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
919930
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
931+
export CPPFLAGS=$SAVE_CPPFLAGS
920932
create_from_github libbitcoin secp256k1 version8 "yes"
933+
local SAVE_CPPFLAGS="$CPPFLAGS"
934+
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
921935
build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
936+
export CPPFLAGS=$SAVE_CPPFLAGS
922937
create_from_github libbitcoin libbitcoin-system master "yes"
938+
local SAVE_CPPFLAGS="$CPPFLAGS"
939+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"
923940
build_from_github_cmake libbitcoin-system "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
941+
export CPPFLAGS=$SAVE_CPPFLAGS
924942
create_from_github libbitcoin libbitcoin-database master "yes"
943+
local SAVE_CPPFLAGS="$CPPFLAGS"
944+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_DATABASE_FLAGS[@]}"
925945
build_from_github_cmake libbitcoin-database "$PARALLEL" false "yes" "${BITCOIN_DATABASE_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
946+
export CPPFLAGS=$SAVE_CPPFLAGS
926947
create_from_github libbitcoin libbitcoin-consensus master "$WITH_BITCOIN_CONSENSUS"
948+
local SAVE_CPPFLAGS="$CPPFLAGS"
949+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_CONSENSUS_FLAGS[@]}"
927950
build_from_github_cmake libbitcoin-consensus "$PARALLEL" false "$WITH_BITCOIN_CONSENSUS" "${BITCOIN_CONSENSUS_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
951+
export CPPFLAGS=$SAVE_CPPFLAGS
952+
local SAVE_CPPFLAGS="$CPPFLAGS"
953+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_BLOCKCHAIN_FLAGS[@]}"
928954
if [[ ! ($CI == true) ]]; then
929955
create_from_github libbitcoin libbitcoin-blockchain master "yes"
930956
build_from_github_cmake libbitcoin-blockchain "$PARALLEL" true "yes" "${BITCOIN_BLOCKCHAIN_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
@@ -935,6 +961,7 @@ build_all()
935961
pop_directory
936962
pop_directory
937963
fi
964+
export CPPFLAGS=$SAVE_CPPFLAGS
938965
}
939966

940967

@@ -956,6 +983,19 @@ set_with_boost_prefix
956983

957984
remove_install_options
958985

986+
# Define build flags.
987+
#==============================================================================
988+
# Define icu flags.
989+
#------------------------------------------------------------------------------
990+
ICU_FLAGS=(
991+
"-w")
992+
993+
# Define secp256k1 flags.
994+
#------------------------------------------------------------------------------
995+
SECP256K1_FLAGS=(
996+
"-w")
997+
998+
959999
# Define build options.
9601000
#==============================================================================
9611001
# Define icu options.

‎install-cmakepresets.sh

+40
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,12 @@ build_from_tarball_boost()
938938
display_message "BOOST_OPTIONS : $*"
939939
display_message "--------------------------------------------------------------------"
940940

941+
guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
942+
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
943+
cp tools/build/src/engine/b2 .
944+
941945
./bootstrap.sh \
946+
"--with-bjam=./b2" \
942947
"--prefix=$PREFIX" \
943948
"--with-icu=$ICU_PREFIX"
944949

@@ -956,6 +961,7 @@ build_from_tarball_boost()
956961
"$BOOST_CXXFLAGS" \
957962
"$BOOST_LINKFLAGS" \
958963
"link=$BOOST_LINK" \
964+
"warnings=off" \
959965
"boost.locale.iconv=$BOOST_ICU_ICONV" \
960966
"boost.locale.posix=$BOOST_ICU_POSIX" \
961967
"-sNO_BZIP2=1" \
@@ -979,20 +985,40 @@ build_from_tarball_boost()
979985
build_all()
980986
{
981987
unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU"
988+
local SAVE_CPPFLAGS="$CPPFLAGS"
989+
export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}"
982990
build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
991+
export CPPFLAGS=$SAVE_CPPFLAGS
983992
unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST"
993+
local SAVE_CPPFLAGS="$CPPFLAGS"
994+
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
984995
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
996+
export CPPFLAGS=$SAVE_CPPFLAGS
985997
create_from_github libbitcoin secp256k1 version8 "yes"
998+
local SAVE_CPPFLAGS="$CPPFLAGS"
999+
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
9861000
build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
1001+
export CPPFLAGS=$SAVE_CPPFLAGS
9871002
create_from_github libbitcoin libbitcoin-system master "yes"
1003+
local SAVE_CPPFLAGS="$CPPFLAGS"
1004+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"
9881005
display_message "libbitcoin-system PRESET ${REPO_PRESET[libbitcoin-system]}"
9891006
build_from_github_cmake libbitcoin-system ${REPO_PRESET[libbitcoin-system]} "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
1007+
export CPPFLAGS=$SAVE_CPPFLAGS
9901008
create_from_github libbitcoin libbitcoin-database master "yes"
1009+
local SAVE_CPPFLAGS="$CPPFLAGS"
1010+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_DATABASE_FLAGS[@]}"
9911011
display_message "libbitcoin-database PRESET ${REPO_PRESET[libbitcoin-database]}"
9921012
build_from_github_cmake libbitcoin-database ${REPO_PRESET[libbitcoin-database]} "$PARALLEL" false "yes" "${BITCOIN_DATABASE_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
1013+
export CPPFLAGS=$SAVE_CPPFLAGS
9931014
create_from_github libbitcoin libbitcoin-consensus master "$WITH_BITCOIN_CONSENSUS"
1015+
local SAVE_CPPFLAGS="$CPPFLAGS"
1016+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_CONSENSUS_FLAGS[@]}"
9941017
display_message "libbitcoin-consensus PRESET ${REPO_PRESET[libbitcoin-consensus]}"
9951018
build_from_github_cmake libbitcoin-consensus ${REPO_PRESET[libbitcoin-consensus]} "$PARALLEL" false "$WITH_BITCOIN_CONSENSUS" "${BITCOIN_CONSENSUS_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
1019+
export CPPFLAGS=$SAVE_CPPFLAGS
1020+
local SAVE_CPPFLAGS="$CPPFLAGS"
1021+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_BLOCKCHAIN_FLAGS[@]}"
9961022
if [[ ! ($CI == true) ]]; then
9971023
create_from_github libbitcoin libbitcoin-blockchain master "yes"
9981024
display_message "libbitcoin-blockchain PRESET ${REPO_PRESET[libbitcoin-blockchain]}"
@@ -1005,6 +1031,7 @@ build_all()
10051031
pop_directory
10061032
pop_directory
10071033
fi
1034+
export CPPFLAGS=$SAVE_CPPFLAGS
10081035
}
10091036

10101037

@@ -1026,6 +1053,19 @@ set_with_boost_prefix
10261053

10271054
remove_install_options
10281055

1056+
# Define build flags.
1057+
#==============================================================================
1058+
# Define icu flags.
1059+
#------------------------------------------------------------------------------
1060+
ICU_FLAGS=(
1061+
"-w")
1062+
1063+
# Define secp256k1 flags.
1064+
#------------------------------------------------------------------------------
1065+
SECP256K1_FLAGS=(
1066+
"-w")
1067+
1068+
10291069
# Define build options.
10301070
#==============================================================================
10311071
# Define icu options.

0 commit comments

Comments
 (0)