From d3913edd663829b4a9b2d75e98775bb214f6dc26 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Tue, 10 Dec 2024 12:29:26 -0800 Subject: [PATCH] Regenerate artifacts. --- .github/workflows/ci.yml | 18 ++++++++++++++++ .../libbitcoin-protocol-test.vcxproj | 4 ++-- .../libbitcoin-protocol-test/packages.config | 2 +- .../libbitcoin-protocol.vcxproj | 4 ++-- .../libbitcoin-protocol/packages.config | 2 +- install-cmake.sh | 21 +++++++++++-------- install-cmakepresets.sh | 21 +++++++++++-------- install.sh | 21 +++++++++++-------- 8 files changed, 60 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bccd09..c3e93f9 100644 --- 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 index b84b78a..6397c64 100644 --- 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 @@ - + @@ -121,7 +121,7 @@ - + diff --git a/builds/msvc/vs2022/libbitcoin-protocol-test/packages.config b/builds/msvc/vs2022/libbitcoin-protocol-test/packages.config index 18de699..71c0da7 100644 --- a/builds/msvc/vs2022/libbitcoin-protocol-test/packages.config +++ b/builds/msvc/vs2022/libbitcoin-protocol-test/packages.config @@ -16,6 +16,6 @@ - + diff --git a/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj b/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj index 3d80c43..019ae4e 100644 --- a/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj @@ -127,7 +127,7 @@ - + @@ -143,7 +143,7 @@ - + diff --git a/builds/msvc/vs2022/libbitcoin-protocol/packages.config b/builds/msvc/vs2022/libbitcoin-protocol/packages.config index 8026603..0221c2c 100644 --- a/builds/msvc/vs2022/libbitcoin-protocol/packages.config +++ b/builds/msvc/vs2022/libbitcoin-protocol/packages.config @@ -16,5 +16,5 @@ - + diff --git a/install-cmake.sh b/install-cmake.sh index 5e8e764..c02fe6d 100755 --- 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= Location of downloaded and intermediate files." display_message " --prefix= 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-