Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ jobs:
detectcpuflags: "ignore"
boost: "--build-boost"
icu: ""
llvm: "llvm@16"
llvm: ""
secp256k1: "--build-secp256k1"
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
options: "--enable-isystem"
packager: "brew"
packages: "llvm@16 icu4c"
packages: "icu4c"

- os: macos-latest
cxx: "clang++"
Expand All @@ -116,14 +116,14 @@ jobs:
detectcpuflags: "ignore"
boost: "--build-boost"
icu: ""
llvm: "llvm@16"
llvm: ""
secp256k1: "--build-secp256k1"
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fvisibility=hidden -fPIE"
options: "--enable-isystem"
packager: "brew"
packages: "llvm@16 icu4c"
packages: "icu4c"


runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
if: ${{ matrix.packager == 'brew' }}
run: |
brew install autoconf automake libtool ${{ matrix.packages }}
if [[ -n ${{ matrix.llvm }} ]]; then
if [[ -n "${{ matrix.llvm }}" ]]; then
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
fi

Expand Down Expand Up @@ -376,14 +376,14 @@ jobs:
detectcpuflags: "ignore"
boost: "--build-boost"
icu: ""
llvm: "llvm@16"
llvm: ""
secp256k1: "--build-secp256k1"
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
options: ""
packager: "brew"
packages: "llvm@16 icu4c"
packages: "icu4c"

- os: macos-latest
cxx: "clang++"
Expand All @@ -394,14 +394,14 @@ jobs:
detectcpuflags: "ignore"
boost: "--build-boost"
icu: ""
llvm: "llvm@16"
llvm: ""
secp256k1: "--build-secp256k1"
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fvisibility=hidden -fPIE"
options: ""
packager: "brew"
packages: "llvm@16 icu4c"
packages: "icu4c"


runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -431,7 +431,7 @@ jobs:
if: ${{ matrix.packager == 'brew' }}
run: |
brew install autoconf automake libtool ${{ matrix.packages }}
if [[ -n ${{ matrix.llvm }} ]]; then
if [[ -n "${{ matrix.llvm }}" ]]; then
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
fi

Expand Down Expand Up @@ -671,7 +671,7 @@ jobs:
if: ${{ matrix.packager == 'brew' }}
run: |
brew install autoconf automake libtool ${{ matrix.packages }}
if [[ -n ${{ matrix.llvm }} ]]; then
if [[ -n "${{ matrix.llvm }}" ]]; then
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
fi

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
<Import Project="$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-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.86.0\build\boost_unit_test_framework-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" />
</ImportGroup>
Expand All @@ -161,6 +162,7 @@
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-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.86.0\build\boost_unit_test_framework-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets'))" />
</Target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
<package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
<Import Project="$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-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">
Expand All @@ -178,6 +179,7 @@
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-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>
Expand Down
1 change: 1 addition & 0 deletions builds/msvc/vs2022/libbitcoin-protocol/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
</packages>
1 change: 1 addition & 0 deletions install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,7 @@ BOOST_OPTIONS=(
"--with-locale" \
"--with-program_options" \
"--with-thread" \
"--with-url" \
"--with-test")

# Define secp256k1 options.
Expand Down
1 change: 1 addition & 0 deletions install-cmakepresets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,7 @@ BOOST_OPTIONS=(
"--with-locale" \
"--with-program_options" \
"--with-thread" \
"--with-url" \
"--with-test")

# Define secp256k1 options.
Expand Down
1 change: 1 addition & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@ BOOST_OPTIONS=(
"--with-locale" \
"--with-program_options" \
"--with-thread" \
"--with-url" \
"--with-test")

# Define secp256k1 options.
Expand Down
Loading