Skip to content

Commit 88a6923

Browse files
evoskuilevoskuil
committed
Regenerate artifacts.
1 parent 1130312 commit 88a6923

File tree

8 files changed

+140
-12
lines changed

8 files changed

+140
-12
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ jobs:
767767
$BC_TEST_SINGLETON = $BC_TEST_EXES.FullName;
768768
Write-Host "Executing $BC_TEST_SINGLETON $env:BOOST_UNIT_TEST_OPTIONS" -ForegroundColor Yellow;
769769
try {
770-
Invoke-Expression "$BC_TEST_SINGLETON --run_test=${{ matrix.tests }} $env:BOOST_UNIT_TEST_OPTIONS"
770+
Invoke-Expression "$BC_TEST_SINGLETON --log_level=warning --run_test=${{ matrix.tests }} $env:BOOST_UNIT_TEST_OPTIONS"
771771
}
772772
catch {
773773
$ERR = $_;

‎builds/cmake/CMakeLists.txt‎

Lines changed: 9 additions & 8 deletions
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()
@@ -301,6 +301,7 @@ if (with-tests)
301301

302302
add_test( NAME libbitcoin-protocol-test COMMAND libbitcoin-protocol-test
303303
--run_test=*
304+
--log_level=warning
304305
--show_progress=no
305306
--detect_memory_leak=0
306307
--report_level=no

‎builds/cmake/CMakePresets.json‎

Lines changed: 2 additions & 2 deletions
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
{

‎builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1616
</ClCompile>
1717
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
18-
<Command>"$(TargetPath)" --run_test=* --show_progress=no --build_info=yes</Command>
18+
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>
1919
</PostBuildEvent>
2020
</ItemDefinitionGroup>
2121

‎install-cmake.sh‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,12 @@ build_from_tarball_boost()
863863
display_message "BOOST_OPTIONS : $*"
864864
display_message "--------------------------------------------------------------------"
865865

866+
guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
867+
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
868+
cp tools/build/src/engine/b2 .
869+
866870
./bootstrap.sh \
871+
"--with-bjam=./b2" \
867872
"--prefix=$PREFIX" \
868873
"--with-icu=$ICU_PREFIX"
869874

@@ -881,6 +886,7 @@ build_from_tarball_boost()
881886
"$BOOST_CXXFLAGS" \
882887
"$BOOST_LINKFLAGS" \
883888
"link=$BOOST_LINK" \
889+
"warnings=off" \
884890
"boost.locale.iconv=$BOOST_ICU_ICONV" \
885891
"boost.locale.posix=$BOOST_ICU_POSIX" \
886892
"-sNO_BZIP2=1" \
@@ -904,15 +910,32 @@ build_from_tarball_boost()
904910
build_all()
905911
{
906912
unpack_from_tarball "$ZMQ_ARCHIVE" "$ZMQ_URL" gzip "$BUILD_ZMQ"
913+
local SAVE_CPPFLAGS="$CPPFLAGS"
914+
export CPPFLAGS="$CPPFLAGS ${ZMQ_FLAGS[@]}"
907915
build_from_tarball "$ZMQ_ARCHIVE" . "$PARALLEL" "$BUILD_ZMQ" "${ZMQ_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
916+
export CPPFLAGS=$SAVE_CPPFLAGS
908917
unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU"
918+
local SAVE_CPPFLAGS="$CPPFLAGS"
919+
export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}"
909920
build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
921+
export CPPFLAGS=$SAVE_CPPFLAGS
910922
unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST"
923+
local SAVE_CPPFLAGS="$CPPFLAGS"
924+
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
911925
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
926+
export CPPFLAGS=$SAVE_CPPFLAGS
912927
create_from_github libbitcoin secp256k1 version8 "yes"
928+
local SAVE_CPPFLAGS="$CPPFLAGS"
929+
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
913930
build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
931+
export CPPFLAGS=$SAVE_CPPFLAGS
914932
create_from_github libbitcoin libbitcoin-system master "yes"
933+
local SAVE_CPPFLAGS="$CPPFLAGS"
934+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"
915935
build_from_github_cmake libbitcoin-system "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
936+
export CPPFLAGS=$SAVE_CPPFLAGS
937+
local SAVE_CPPFLAGS="$CPPFLAGS"
938+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_PROTOCOL_FLAGS[@]}"
916939
if [[ ! ($CI == true) ]]; then
917940
create_from_github libbitcoin libbitcoin-protocol master "yes"
918941
build_from_github_cmake libbitcoin-protocol "$PARALLEL" true "yes" "${BITCOIN_PROTOCOL_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
@@ -923,6 +946,7 @@ build_all()
923946
pop_directory
924947
pop_directory
925948
fi
949+
export CPPFLAGS=$SAVE_CPPFLAGS
926950
}
927951

928952

@@ -944,6 +968,24 @@ set_with_boost_prefix
944968

945969
remove_install_options
946970

971+
# Define build flags.
972+
#==============================================================================
973+
# Define zmq flags.
974+
#------------------------------------------------------------------------------
975+
ZMQ_FLAGS=(
976+
"-w")
977+
978+
# Define icu flags.
979+
#------------------------------------------------------------------------------
980+
ICU_FLAGS=(
981+
"-w")
982+
983+
# Define secp256k1 flags.
984+
#------------------------------------------------------------------------------
985+
SECP256K1_FLAGS=(
986+
"-w")
987+
988+
947989
# Define build options.
948990
#==============================================================================
949991
# Define zmq options.

‎install-cmakepresets.sh‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,12 @@ build_from_tarball_boost()
917917
display_message "BOOST_OPTIONS : $*"
918918
display_message "--------------------------------------------------------------------"
919919

920+
guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
921+
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
922+
cp tools/build/src/engine/b2 .
923+
920924
./bootstrap.sh \
925+
"--with-bjam=./b2" \
921926
"--prefix=$PREFIX" \
922927
"--with-icu=$ICU_PREFIX"
923928

@@ -935,6 +940,7 @@ build_from_tarball_boost()
935940
"$BOOST_CXXFLAGS" \
936941
"$BOOST_LINKFLAGS" \
937942
"link=$BOOST_LINK" \
943+
"warnings=off" \
938944
"boost.locale.iconv=$BOOST_ICU_ICONV" \
939945
"boost.locale.posix=$BOOST_ICU_POSIX" \
940946
"-sNO_BZIP2=1" \
@@ -958,16 +964,33 @@ build_from_tarball_boost()
958964
build_all()
959965
{
960966
unpack_from_tarball "$ZMQ_ARCHIVE" "$ZMQ_URL" gzip "$BUILD_ZMQ"
967+
local SAVE_CPPFLAGS="$CPPFLAGS"
968+
export CPPFLAGS="$CPPFLAGS ${ZMQ_FLAGS[@]}"
961969
build_from_tarball "$ZMQ_ARCHIVE" . "$PARALLEL" "$BUILD_ZMQ" "${ZMQ_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
970+
export CPPFLAGS=$SAVE_CPPFLAGS
962971
unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU"
972+
local SAVE_CPPFLAGS="$CPPFLAGS"
973+
export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}"
963974
build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
975+
export CPPFLAGS=$SAVE_CPPFLAGS
964976
unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST"
977+
local SAVE_CPPFLAGS="$CPPFLAGS"
978+
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
965979
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
980+
export CPPFLAGS=$SAVE_CPPFLAGS
966981
create_from_github libbitcoin secp256k1 version8 "yes"
982+
local SAVE_CPPFLAGS="$CPPFLAGS"
983+
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
967984
build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
985+
export CPPFLAGS=$SAVE_CPPFLAGS
968986
create_from_github libbitcoin libbitcoin-system master "yes"
987+
local SAVE_CPPFLAGS="$CPPFLAGS"
988+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"
969989
display_message "libbitcoin-system PRESET ${REPO_PRESET[libbitcoin-system]}"
970990
build_from_github_cmake libbitcoin-system ${REPO_PRESET[libbitcoin-system]} "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS_CMAKE "$@"
991+
export CPPFLAGS=$SAVE_CPPFLAGS
992+
local SAVE_CPPFLAGS="$CPPFLAGS"
993+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_PROTOCOL_FLAGS[@]}"
971994
if [[ ! ($CI == true) ]]; then
972995
create_from_github libbitcoin libbitcoin-protocol master "yes"
973996
display_message "libbitcoin-protocol PRESET ${REPO_PRESET[libbitcoin-protocol]}"
@@ -980,6 +1003,7 @@ build_all()
9801003
pop_directory
9811004
pop_directory
9821005
fi
1006+
export CPPFLAGS=$SAVE_CPPFLAGS
9831007
}
9841008

9851009

@@ -1001,6 +1025,24 @@ set_with_boost_prefix
10011025

10021026
remove_install_options
10031027

1028+
# Define build flags.
1029+
#==============================================================================
1030+
# Define zmq flags.
1031+
#------------------------------------------------------------------------------
1032+
ZMQ_FLAGS=(
1033+
"-w")
1034+
1035+
# Define icu flags.
1036+
#------------------------------------------------------------------------------
1037+
ICU_FLAGS=(
1038+
"-w")
1039+
1040+
# Define secp256k1 flags.
1041+
#------------------------------------------------------------------------------
1042+
SECP256K1_FLAGS=(
1043+
"-w")
1044+
1045+
10041046
# Define build options.
10051047
#==============================================================================
10061048
# Define zmq options.

‎install.sh‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,12 @@ build_from_tarball_boost()
738738
display_message "BOOST_OPTIONS : $*"
739739
display_message "--------------------------------------------------------------------"
740740

741+
guessed_toolset=`./tools/build/src/engine/build.sh --guess-toolset`
742+
CXXFLAGS="-w" ./tools/build/src/engine/build.sh ${guessed_toolset} --cxxflags="-w"
743+
cp tools/build/src/engine/b2 .
744+
741745
./bootstrap.sh \
746+
"--with-bjam=./b2" \
742747
"--prefix=$PREFIX" \
743748
"--with-icu=$ICU_PREFIX"
744749

@@ -756,6 +761,7 @@ build_from_tarball_boost()
756761
"$BOOST_CXXFLAGS" \
757762
"$BOOST_LINKFLAGS" \
758763
"link=$BOOST_LINK" \
764+
"warnings=off" \
759765
"boost.locale.iconv=$BOOST_ICU_ICONV" \
760766
"boost.locale.posix=$BOOST_ICU_POSIX" \
761767
"-sNO_BZIP2=1" \
@@ -779,15 +785,32 @@ build_from_tarball_boost()
779785
build_all()
780786
{
781787
unpack_from_tarball "$ZMQ_ARCHIVE" "$ZMQ_URL" gzip "$BUILD_ZMQ"
788+
local SAVE_CPPFLAGS="$CPPFLAGS"
789+
export CPPFLAGS="$CPPFLAGS ${ZMQ_FLAGS[@]}"
782790
build_from_tarball "$ZMQ_ARCHIVE" . "$PARALLEL" "$BUILD_ZMQ" "${ZMQ_OPTIONS[@]}" "$@"
791+
export CPPFLAGS=$SAVE_CPPFLAGS
783792
unpack_from_tarball "$ICU_ARCHIVE" "$ICU_URL" gzip "$BUILD_ICU"
793+
local SAVE_CPPFLAGS="$CPPFLAGS"
794+
export CPPFLAGS="$CPPFLAGS ${ICU_FLAGS[@]}"
784795
build_from_tarball "$ICU_ARCHIVE" source "$PARALLEL" "$BUILD_ICU" "${ICU_OPTIONS[@]}" "$@"
796+
export CPPFLAGS=$SAVE_CPPFLAGS
785797
unpack_from_tarball "$BOOST_ARCHIVE" "$BOOST_URL" bzip2 "$BUILD_BOOST"
798+
local SAVE_CPPFLAGS="$CPPFLAGS"
799+
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
786800
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
801+
export CPPFLAGS=$SAVE_CPPFLAGS
787802
create_from_github libbitcoin secp256k1 version8 "yes"
803+
local SAVE_CPPFLAGS="$CPPFLAGS"
804+
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
788805
build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" "$@"
806+
export CPPFLAGS=$SAVE_CPPFLAGS
789807
create_from_github libbitcoin libbitcoin-system master "yes"
808+
local SAVE_CPPFLAGS="$CPPFLAGS"
809+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_SYSTEM_FLAGS[@]}"
790810
build_from_github libbitcoin-system "$PARALLEL" false "yes" "${BITCOIN_SYSTEM_OPTIONS[@]}" "$@"
811+
export CPPFLAGS=$SAVE_CPPFLAGS
812+
local SAVE_CPPFLAGS="$CPPFLAGS"
813+
export CPPFLAGS="$CPPFLAGS ${BITCOIN_PROTOCOL_FLAGS[@]}"
791814
if [[ ! ($CI == true) ]]; then
792815
create_from_github libbitcoin libbitcoin-protocol master "yes"
793816
build_from_github libbitcoin-protocol "$PARALLEL" true "yes" "${BITCOIN_PROTOCOL_OPTIONS[@]}" "$@"
@@ -798,6 +821,7 @@ build_all()
798821
pop_directory
799822
pop_directory
800823
fi
824+
export CPPFLAGS=$SAVE_CPPFLAGS
801825
}
802826

803827

@@ -818,6 +842,24 @@ set_pkgconfigdir
818842
set_with_boost_prefix
819843

820844

845+
# Define build flags.
846+
#==============================================================================
847+
# Define zmq flags.
848+
#------------------------------------------------------------------------------
849+
ZMQ_FLAGS=(
850+
"-w")
851+
852+
# Define icu flags.
853+
#------------------------------------------------------------------------------
854+
ICU_FLAGS=(
855+
"-w")
856+
857+
# Define secp256k1 flags.
858+
#------------------------------------------------------------------------------
859+
SECP256K1_FLAGS=(
860+
"-w")
861+
862+
821863
# Define build options.
822864
#==============================================================================
823865
# Define zmq options.

‎libbitcoin-protocol-test_runner.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#==============================================================================
1111
BOOST_UNIT_TEST_OPTIONS=\
1212
"--run_test=* "\
13+
"--log_level=warning "\
1314
"--show_progress=no "\
1415
"--detect_memory_leak=0 "\
1516
"--report_level=no "\

0 commit comments

Comments
 (0)