Merge pull request #276 from pmienk/master

Regenerate artifacts.
libbitcoin · Dec 12, 2024 · 4a75fcf · 4a75fcf
2 parents d0f4efd + d3913ed
commit 4a75fcf
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,6 +25,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "clang-15"
             flags: "-Og -fPIE"
@@ -40,6 +41,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "clang-15"
             flags: "-Os -fPIE"
@@ -55,6 +57,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "gcc-11"
             flags: "-Os -fPIE"
@@ -70,6 +73,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "gcc-11"
             flags: "-Os -fPIE"
@@ -85,6 +89,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "clang"
             flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
@@ -100,6 +105,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "clang"
             flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
@@ -176,6 +182,7 @@ jobs:
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
           ${{ matrix.icu }}
+          ${{ matrix.secp256k1 }}
           ${{ matrix.zmq }}
 
       - name: Coveralls Calculation
@@ -257,6 +264,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "clang-15"
             flags: "-Og -fPIE"
@@ -272,6 +280,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "clang-15"
             flags: "-Os -fPIE"
@@ -287,6 +296,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "gcc-11"
             flags: "-Os -fPIE"
@@ -302,6 +312,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "gcc-11"
             flags: "-Os -fPIE"
@@ -317,6 +328,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "clang"
             flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
@@ -332,6 +344,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "clang"
             flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
@@ -411,6 +424,7 @@ jobs:
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
           ${{ matrix.icu }}
+          ${{ matrix.secp256k1 }}
           ${{ matrix.zmq }}
 
       - name: Coveralls Calculation
@@ -503,6 +517,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "clang-15"
             flags: "-Og -fPIE"
@@ -519,6 +534,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "clang-15"
             flags: "-Os -fPIE"
@@ -535,6 +551,7 @@ jobs:
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
+            secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
             cc: "gcc-11"
             flags: "-Os -fPIE"
@@ -615,6 +632,7 @@ jobs:
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
           ${{ matrix.icu }}
+          ${{ matrix.secp256k1 }}
           ${{ matrix.zmq }}
 
       - name: Coveralls Calculation

diff --git a/builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj b/builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj
@@ -104,7 +104,7 @@
     <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')" />
     <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')" />
     <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')" />
-    <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')" />
+    <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')" />
     <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')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -121,7 +121,7 @@
     <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'))" />
     <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'))" />
     <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'))" />
-    <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'))" />
+    <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'))" />
     <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'))" />
   </Target>
   <ItemGroup>

diff --git a/builds/msvc/vs2022/libbitcoin-protocol-test/packages.config b/builds/msvc/vs2022/libbitcoin-protocol-test/packages.config
@@ -16,6 +16,6 @@
   <package id="boost_program_options-vc143" version="1.78.0" targetFramework="Native" />
   <package id="boost_system-vc143" version="1.78.0" targetFramework="Native" />
   <package id="boost_thread-vc143" version="1.78.0" targetFramework="Native" />
-  <package id="secp256k1_vc143" version="0.1.0.20" targetFramework="Native" />
+  <package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
   <package id="boost_unit_test_framework-vc143" version="1.78.0" targetFramework="Native" />
 </packages>
diff --git a/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj b/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj
@@ -127,7 +127,7 @@
     <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')" />
     <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')" />
     <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')" />
-    <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')" />
+    <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')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -143,7 +143,7 @@
     <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'))" />
     <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'))" />
     <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'))" />
-    <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'))" />
+    <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'))" />
   </Target>
   <ItemGroup>
     <Natvis Include="..\..\debug.natvis" />

diff --git a/builds/msvc/vs2022/libbitcoin-protocol/packages.config b/builds/msvc/vs2022/libbitcoin-protocol/packages.config
@@ -16,5 +16,5 @@
   <package id="boost_program_options-vc143" version="1.78.0" targetFramework="Native" />
   <package id="boost_system-vc143" version="1.78.0" targetFramework="Native" />
   <package id="boost_thread-vc143" version="1.78.0" targetFramework="Native" />
-  <package id="secp256k1_vc143" version="0.1.0.20" targetFramework="Native" />
+  <package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
 </packages>
diff --git a/install-cmake.sh b/install-cmake.sh
@@ -233,9 +233,10 @@ display_help()
     display_message "                             accesses this feature, so if you do not intend to "
     display_message "                             use passphrase normalization this dependency can "
     display_message "                             be avoided."
-    display_message "  --build-icu              Builds ICU libraries."
-    display_message "  --build-boost            Builds Boost libraries."
     display_message "  --build-zmq              Build ZeroMQ libraries."
+    display_message "  --build-icu              Build ICU libraries."
+    display_message "  --build-boost            Build Boost libraries."
+    display_message "  --build-secp256k1        Build libsecp256k1 libraries."
     display_message "  --build-dir=<path>       Location of downloaded and intermediate files."
     display_message "  --prefix=<absolute-path> Library install location (defaults to /usr/local)."
     display_message "  --disable-shared         Disables shared library builds."
@@ -264,10 +265,11 @@ parse_command_line_options()
             # Common project options.
             (--with-icu)            WITH_ICU="yes";;
 
-            # Custom build options (in the form of --build-<option>).
-            (--build-icu)           BUILD_ICU="yes";;
-            (--build-zmq)           BUILD_ZMQ="yes";;
-            (--build-boost)         BUILD_BOOST="yes";;
+            # Custom build options.
+            (--build-zmq)                              BUILD_ZMQ="yes";;
+            (--build-icu)                              BUILD_ICU="yes";;
+            (--build-boost)                            BUILD_BOOST="yes";;
+            (--build-secp256k1)                        BUILD_SECP256K1="yes";;
 
             # Unique script options.
             (--build-dir=*)         BUILD_DIR="${OPTION#*=}";;
@@ -470,9 +472,10 @@ display_configuration()
     display_message "LDFLAGS               : $LDFLAGS"
     display_message "LDLIBS                : $LDLIBS"
     display_message "WITH_ICU              : $WITH_ICU"
-    display_message "BUILD_ICU             : $BUILD_ICU"
     display_message "BUILD_ZMQ             : $BUILD_ZMQ"
+    display_message "BUILD_ICU             : $BUILD_ICU"
     display_message "BUILD_BOOST           : $BUILD_BOOST"
+    display_message "BUILD_SECP256K1       : $BUILD_SECP256K1"
     display_message "BOOST_ROOT            : $BOOST_ROOT"
     display_message "BUILD_DIR                      : $BUILD_DIR"
     display_message "CUMULATIVE_FILTERED_ARGS       : $CUMULATIVE_FILTERED_ARGS"
@@ -930,10 +933,10 @@ build_all()
     export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
     build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
     export CPPFLAGS=$SAVE_CPPFLAGS
-    create_from_github bitcoin-core secp256k1 v0.5.1 "yes"
+    create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
     local SAVE_CPPFLAGS="$CPPFLAGS"
     export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
-    build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
+    build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
     export CPPFLAGS=$SAVE_CPPFLAGS
     create_from_github libbitcoin libbitcoin-system master "yes"
     local SAVE_CPPFLAGS="$CPPFLAGS"

diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh
@@ -239,9 +239,10 @@ display_help()
     display_message "                             accesses this feature, so if you do not intend to "
     display_message "                             use passphrase normalization this dependency can "
     display_message "                             be avoided."
-    display_message "  --build-icu              Builds ICU libraries."
-    display_message "  --build-boost            Builds Boost libraries."
     display_message "  --build-zmq              Build ZeroMQ libraries."
+    display_message "  --build-icu              Build ICU libraries."
+    display_message "  --build-boost            Build Boost libraries."
+    display_message "  --build-secp256k1        Build libsecp256k1 libraries."
     display_message "  --build-dir=<path>       Location of downloaded and intermediate files."
     display_message "  --preset=<label>         CMakePreset label."
     display_message "  --prefix=<absolute-path> Library install location (defaults to /usr/local)."
@@ -271,10 +272,11 @@ parse_command_line_options()
             # Common project options.
             (--with-icu)            WITH_ICU="yes";;
 
-            # Custom build options (in the form of --build-<option>).
-            (--build-icu)           BUILD_ICU="yes";;
-            (--build-zmq)           BUILD_ZMQ="yes";;
-            (--build-boost)         BUILD_BOOST="yes";;
+            # Custom build options.
+            (--build-zmq)                              BUILD_ZMQ="yes";;
+            (--build-icu)                              BUILD_ICU="yes";;
+            (--build-boost)                            BUILD_BOOST="yes";;
+            (--build-secp256k1)                        BUILD_SECP256K1="yes";;
 
             # Unique script options.
             (--build-dir=*)         BUILD_DIR="${OPTION#*=}";;
@@ -505,9 +507,10 @@ display_configuration()
     display_message "LDFLAGS               : $LDFLAGS"
     display_message "LDLIBS                : $LDLIBS"
     display_message "WITH_ICU              : $WITH_ICU"
-    display_message "BUILD_ICU             : $BUILD_ICU"
     display_message "BUILD_ZMQ             : $BUILD_ZMQ"
+    display_message "BUILD_ICU             : $BUILD_ICU"
     display_message "BUILD_BOOST           : $BUILD_BOOST"
+    display_message "BUILD_SECP256K1       : $BUILD_SECP256K1"
     display_message "BOOST_ROOT            : $BOOST_ROOT"
     display_message "BUILD_DIR                      : $BUILD_DIR"
     display_message "PRESET_ID                      : $PRESET_ID"
@@ -969,10 +972,10 @@ build_all()
     export CPPFLAGS="$CPPFLAGS ${BOOST_FLAGS[@]}"
     build_from_tarball_boost "$BOOST_ARCHIVE" "$PARALLEL" "$BUILD_BOOST" "${BOOST_OPTIONS[@]}"
     export CPPFLAGS=$SAVE_CPPFLAGS
-    create_from_github bitcoin-core secp256k1 v0.5.1 "yes"
+    create_from_github bitcoin-core secp256k1 v0.5.1 "$BUILD_SECP256K1"
     local SAVE_CPPFLAGS="$CPPFLAGS"
     export CPPFLAGS="$CPPFLAGS ${SECP256K1_FLAGS[@]}"
-    build_from_github secp256k1 "$PARALLEL" false "yes" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
+    build_from_github secp256k1 "$PARALLEL" false "$BUILD_SECP256K1" "${SECP256K1_OPTIONS[@]}" $CUMULATIVE_FILTERED_ARGS
     export CPPFLAGS=$SAVE_CPPFLAGS
     create_from_github libbitcoin libbitcoin-system master "yes"
     local SAVE_CPPFLAGS="$CPPFLAGS"