Skip to content

Commit 4a75fcf

Browse files
pmienkpmienk
authored
Merge pull request libbitcoin#276 from pmienk/master
Regenerate artifacts.
2 parents d0f4efd + d3913ed commit 4a75fcf

File tree

8 files changed

+60
-33
lines changed

8 files changed

+60
-33
lines changed

‎.github/workflows/ci.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
coverage: "nocov"
2626
boost: "--build-boost"
2727
icu: ""
28+
secp256k1: "--build-secp256k1"
2829
zmq: "--build-zmq"
2930
cc: "clang-15"
3031
flags: "-Og -fPIE"
@@ -40,6 +41,7 @@ jobs:
4041
coverage: "nocov"
4142
boost: "--build-boost"
4243
icu: "--build-icu --with-icu"
44+
secp256k1: "--build-secp256k1"
4345
zmq: "--build-zmq"
4446
cc: "clang-15"
4547
flags: "-Os -fPIE"
@@ -55,6 +57,7 @@ jobs:
5557
coverage: "nocov"
5658
boost: "--build-boost"
5759
icu: ""
60+
secp256k1: "--build-secp256k1"
5861
zmq: "--build-zmq"
5962
cc: "gcc-11"
6063
flags: "-Os -fPIE"
@@ -70,6 +73,7 @@ jobs:
7073
coverage: "nocov"
7174
boost: "--build-boost"
7275
icu: "--build-icu --with-icu"
76+
secp256k1: "--build-secp256k1"
7377
zmq: "--build-zmq"
7478
cc: "gcc-11"
7579
flags: "-Os -fPIE"
@@ -85,6 +89,7 @@ jobs:
8589
coverage: "nocov"
8690
boost: "--build-boost"
8791
icu: ""
92+
secp256k1: "--build-secp256k1"
8893
zmq: "--build-zmq"
8994
cc: "clang"
9095
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
@@ -100,6 +105,7 @@ jobs:
100105
coverage: "nocov"
101106
boost: "--build-boost"
102107
icu: ""
108+
secp256k1: "--build-secp256k1"
103109
zmq: "--build-zmq"
104110
cc: "clang"
105111
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
@@ -176,6 +182,7 @@ jobs:
176182
${{ env.ASSERT_NDEBUG }}
177183
${{ matrix.boost }}
178184
${{ matrix.icu }}
185+
${{ matrix.secp256k1 }}
179186
${{ matrix.zmq }}
180187
181188
- name: Coveralls Calculation
@@ -257,6 +264,7 @@ jobs:
257264
coverage: "nocov"
258265
boost: "--build-boost"
259266
icu: ""
267+
secp256k1: "--build-secp256k1"
260268
zmq: "--build-zmq"
261269
cc: "clang-15"
262270
flags: "-Og -fPIE"
@@ -272,6 +280,7 @@ jobs:
272280
coverage: "nocov"
273281
boost: "--build-boost"
274282
icu: "--build-icu --with-icu"
283+
secp256k1: "--build-secp256k1"
275284
zmq: "--build-zmq"
276285
cc: "clang-15"
277286
flags: "-Os -fPIE"
@@ -287,6 +296,7 @@ jobs:
287296
coverage: "nocov"
288297
boost: "--build-boost"
289298
icu: ""
299+
secp256k1: "--build-secp256k1"
290300
zmq: "--build-zmq"
291301
cc: "gcc-11"
292302
flags: "-Os -fPIE"
@@ -302,6 +312,7 @@ jobs:
302312
coverage: "nocov"
303313
boost: "--build-boost"
304314
icu: "--build-icu --with-icu"
315+
secp256k1: "--build-secp256k1"
305316
zmq: "--build-zmq"
306317
cc: "gcc-11"
307318
flags: "-Os -fPIE"
@@ -317,6 +328,7 @@ jobs:
317328
coverage: "nocov"
318329
boost: "--build-boost"
319330
icu: ""
331+
secp256k1: "--build-secp256k1"
320332
zmq: "--build-zmq"
321333
cc: "clang"
322334
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
@@ -332,6 +344,7 @@ jobs:
332344
coverage: "nocov"
333345
boost: "--build-boost"
334346
icu: ""
347+
secp256k1: "--build-secp256k1"
335348
zmq: "--build-zmq"
336349
cc: "clang"
337350
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
@@ -411,6 +424,7 @@ jobs:
411424
${{ env.ASSERT_NDEBUG }}
412425
${{ matrix.boost }}
413426
${{ matrix.icu }}
427+
${{ matrix.secp256k1 }}
414428
${{ matrix.zmq }}
415429
416430
- name: Coveralls Calculation
@@ -503,6 +517,7 @@ jobs:
503517
coverage: "nocov"
504518
boost: "--build-boost"
505519
icu: ""
520+
secp256k1: "--build-secp256k1"
506521
zmq: "--build-zmq"
507522
cc: "clang-15"
508523
flags: "-Og -fPIE"
@@ -519,6 +534,7 @@ jobs:
519534
coverage: "nocov"
520535
boost: "--build-boost"
521536
icu: "--build-icu --with-icu"
537+
secp256k1: "--build-secp256k1"
522538
zmq: "--build-zmq"
523539
cc: "clang-15"
524540
flags: "-Os -fPIE"
@@ -535,6 +551,7 @@ jobs:
535551
coverage: "nocov"
536552
boost: "--build-boost"
537553
icu: ""
554+
secp256k1: "--build-secp256k1"
538555
zmq: "--build-zmq"
539556
cc: "gcc-11"
540557
flags: "-Os -fPIE"
@@ -615,6 +632,7 @@ jobs:
615632
${{ env.ASSERT_NDEBUG }}
616633
${{ matrix.boost }}
617634
${{ matrix.icu }}
635+
${{ matrix.secp256k1 }}
618636
${{ matrix.zmq }}
619637
620638
- name: Coveralls Calculation

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets')" />
105105
<Import Project="$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets')" />
106106
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets')" />
107-
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets')" />
107+
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
108108
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets')" />
109109
</ImportGroup>
110110
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -121,7 +121,7 @@
121121
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets'))" />
122122
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets'))" />
123123
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets'))" />
124-
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets'))" />
124+
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
125125
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets'))" />
126126
</Target>
127127
<ItemGroup>

‎builds/msvc/vs2022/libbitcoin-protocol-test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<package id="boost_program_options-vc143" version="1.78.0" targetFramework="Native" />
1717
<package id="boost_system-vc143" version="1.78.0" targetFramework="Native" />
1818
<package id="boost_thread-vc143" version="1.78.0" targetFramework="Native" />
19-
<package id="secp256k1_vc143" version="0.1.0.20" targetFramework="Native" />
19+
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
2020
<package id="boost_unit_test_framework-vc143" version="1.78.0" targetFramework="Native" />
2121
</packages>

‎builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets')" />
128128
<Import Project="$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets')" />
129129
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets')" />
130-
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets')" />
130+
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
131131
</ImportGroup>
132132
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
133133
<PropertyGroup>
@@ -143,7 +143,7 @@
143143
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.78.0\build\boost_program_options-vc143.targets'))" />
144144
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc143.1.78.0\build\boost_system-vc143.targets'))" />
145145
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.78.0\build\boost_thread-vc143.targets'))" />
146-
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets'))" />
146+
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
147147
</Target>
148148
<ItemGroup>
149149
<Natvis Include="..\..\debug.natvis" />

‎builds/msvc/vs2022/libbitcoin-protocol/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
<package id="boost_program_options-vc143" version="1.78.0" targetFramework="Native" />
1717
<package id="boost_system-vc143" version="1.78.0" targetFramework="Native" />
1818
<package id="boost_thread-vc143" version="1.78.0" targetFramework="Native" />
19-
<package id="secp256k1_vc143" version="0.1.0.20" targetFramework="Native" />
19+
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
2020
</packages>

‎install-cmake.sh

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,10 @@ display_help()
233233
display_message " accesses this feature, so if you do not intend to "
234234
display_message " use passphrase normalization this dependency can "
235235
display_message " be avoided."
236-
display_message " --build-icu Builds ICU libraries."
237-
display_message " --build-boost Builds Boost libraries."
238236
display_message " --build-zmq Build ZeroMQ libraries."
237+
display_message " --build-icu Build ICU libraries."
238+
display_message " --build-boost Build Boost libraries."
239+
display_message " --build-secp256k1 Build libsecp256k1 libraries."
239240
display_message " --build-dir=<path> Location of downloaded and intermediate files."
240241
display_message " --prefix=<absolute-path> Library install location (defaults to /usr/local)."
241242
display_message " --disable-shared Disables shared library builds."
@@ -264,10 +265,11 @@ parse_command_line_options()
264265
# Common project options.
265266
(--with-icu) WITH_ICU="yes";;
266267

267-
# Custom build options (in the form of --build-<option>).
268-
(--build-icu) BUILD_ICU="yes";;
269-
(--build-zmq) BUILD_ZMQ="yes";;
270-
(--build-boost) BUILD_BOOST="yes";;
268+
# Custom build options.
269+
(--build-zmq) BUILD_ZMQ="yes";;
270+
(--build-icu) BUILD_ICU="yes";;
271+
(--build-boost) BUILD_BOOST="yes";;
272+
(--build-secp256k1) BUILD_SECP256K1="yes";;
271273

272274
# Unique script options.
273275
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
@@ -470,9 +472,10 @@ display_configuration()
470472
display_message "LDFLAGS : $LDFLAGS"
471473
display_message "LDLIBS : $LDLIBS"
472474
display_message "WITH_ICU : $WITH_ICU"
473-
display_message "BUILD_ICU : $BUILD_ICU"
474475
display_message "BUILD_ZMQ : $BUILD_ZMQ"
476+
display_message "BUILD_ICU : $BUILD_ICU"
475477
display_message "BUILD_BOOST : $BUILD_BOOST"
478+
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
476479
display_message "BOOST_ROOT : $BOOST_ROOT"
477480
display_message "BUILD_DIR : $BUILD_DIR"
478481
display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS"
@@ -930,10 +933,10 @@ build_all()
930933
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
931934
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
932935
export CPPFLAGS=$SAVE_CPPFLAGS
933-
create_from_github bitcoin-core secp256k1 v0.5.1 "yes"
936+
create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
934937
local SAVE_CPPFLAGS="$CPPFLAGS"
935938
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
936-
build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
939+
build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
937940
export CPPFLAGS=$SAVE_CPPFLAGS
938941
create_from_github libbitcoin libbitcoin-system master "yes"
939942
local SAVE_CPPFLAGS="$CPPFLAGS"

‎install-cmakepresets.sh

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,10 @@ display_help()
239239
display_message " accesses this feature, so if you do not intend to "
240240
display_message " use passphrase normalization this dependency can "
241241
display_message " be avoided."
242-
display_message " --build-icu Builds ICU libraries."
243-
display_message " --build-boost Builds Boost libraries."
244242
display_message " --build-zmq Build ZeroMQ libraries."
243+
display_message " --build-icu Build ICU libraries."
244+
display_message " --build-boost Build Boost libraries."
245+
display_message " --build-secp256k1 Build libsecp256k1 libraries."
245246
display_message " --build-dir=<path> Location of downloaded and intermediate files."
246247
display_message " --preset=<label> CMakePreset label."
247248
display_message " --prefix=<absolute-path> Library install location (defaults to /usr/local)."
@@ -271,10 +272,11 @@ parse_command_line_options()
271272
# Common project options.
272273
(--with-icu) WITH_ICU="yes";;
273274

274-
# Custom build options (in the form of --build-<option>).
275-
(--build-icu) BUILD_ICU="yes";;
276-
(--build-zmq) BUILD_ZMQ="yes";;
277-
(--build-boost) BUILD_BOOST="yes";;
275+
# Custom build options.
276+
(--build-zmq) BUILD_ZMQ="yes";;
277+
(--build-icu) BUILD_ICU="yes";;
278+
(--build-boost) BUILD_BOOST="yes";;
279+
(--build-secp256k1) BUILD_SECP256K1="yes";;
278280

279281
# Unique script options.
280282
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
@@ -505,9 +507,10 @@ display_configuration()
505507
display_message "LDFLAGS : $LDFLAGS"
506508
display_message "LDLIBS : $LDLIBS"
507509
display_message "WITH_ICU : $WITH_ICU"
508-
display_message "BUILD_ICU : $BUILD_ICU"
509510
display_message "BUILD_ZMQ : $BUILD_ZMQ"
511+
display_message "BUILD_ICU : $BUILD_ICU"
510512
display_message "BUILD_BOOST : $BUILD_BOOST"
513+
display_message "BUILD_SECP256K1 : $BUILD_SECP256K1"
511514
display_message "BOOST_ROOT : $BOOST_ROOT"
512515
display_message "BUILD_DIR : $BUILD_DIR"
513516
display_message "PRESET_ID : $PRESET_ID"
@@ -969,10 +972,10 @@ build_all()
969972
export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
970973
build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
971974
export CPPFLAGS=$SAVE_CPPFLAGS
972-
create_from_github bitcoin-core secp256k1 v0.5.1 "yes"
975+
create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
973976
local SAVE_CPPFLAGS="$CPPFLAGS"
974977
export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
975-
build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
978+
build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
976979
export CPPFLAGS=$SAVE_CPPFLAGS
977980
create_from_github libbitcoin libbitcoin-system master "yes"
978981
local SAVE_CPPFLAGS="$CPPFLAGS"

0 commit comments

Comments
 (0)