Skip to content

Commit

Permalink
Merge pull request #737 from pmienk/version3
Browse files Browse the repository at this point in the history
Regenerate with boost 1.73.0 minimum version.
  • Loading branch information
pmienk authored Sep 1, 2023
2 parents a7f63ce + dc535bf commit 6c43b1c
Show file tree
Hide file tree
Showing 12 changed files with 132 additions and 132 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Installation of libbitcoin-explorer comes with requirements listed below.

Use of `install-cmake.sh` additionally requires [cmake](https://cmake.org) 3.5+.

A minimal libbitcoin-explorer build requires boost 1.72.0 to 1.76.0i, libsecp256k1, and [zmq](http://www.zeromq.org) 4.3.4. The [libbitcoin/secp256k1](https://github.com/libbitcoin/secp256k1/tree/version7) repository is forked from [bitcoin-core/secp256k1](https://github.com/bitcoin-core/secp256k1) in order to control for changes and to incorporate the necessary Visual Studio build. The original repository can be used directly but recent changes to the public interface may cause build breaks. The `--enable-module-recovery` switch is required. Both of these are able to be provided via the installation script(s).
A minimal libbitcoin-explorer build requires boost 1.73.0 to 1.76.0i, libsecp256k1, and [zmq](http://www.zeromq.org) 4.3.4. The [libbitcoin/secp256k1](https://github.com/libbitcoin/secp256k1/tree/version7) repository is forked from [bitcoin-core/secp256k1](https://github.com/bitcoin-core/secp256k1) in order to control for changes and to incorporate the necessary Visual Studio build. The original repository can be used directly but recent changes to the public interface may cause build breaks. The `--enable-module-recovery` switch is required. Both of these are able to be provided via the installation script(s).

Detailed instructions are provided below.

Expand Down Expand Up @@ -101,7 +101,7 @@ $ sudo apt install build-essential autoconf automake libtool pkg-config git

#### Boost (Not Recommended)

Next install the [Boost](http://www.boost.org) (1.72.0 - 1.76.0) development package. This can be accomplished via parameterization of the installation script during libbitcoin-explorer installation and it is recommended to the reader that this approach be used.
Next install the [Boost](http://www.boost.org) (1.73.0 - 1.76.0) development package. This can be accomplished via parameterization of the installation script during libbitcoin-explorer installation and it is recommended to the reader that this approach be used.

Due to the current state of packaging, boost is not provided by the standard packaging system at the required minimum version. This requires either manual source compilation (as is controlled within the installation scripts) or trusting a 3rd party [Personal Package Archive](https://launchpad.net/ubuntu/+ppas). Verification of the build is done against the sources (required for proper use of ICU).

Expand Down
2 changes: 1 addition & 1 deletion builds/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ endif()

# Find boost
#------------------------------------------------------------------------------
find_package( Boost 1.72.0 REQUIRED COMPONENTS
find_package( Boost 1.73.0 REQUIRED COMPONENTS
unit_test_framework )

set( boost_unit_test_framework_LIBS "-lboost_unit_test_framework" )
Expand Down
52 changes: 26 additions & 26 deletions builds/msvc/vs2022/bx/bx.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -84,39 +84,39 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets')" />
<Import Project="$(NuGetPackageRoot)boost_atomic-vc141.1.72.0.0\build\boost_atomic-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_atomic-vc141.1.72.0.0\build\boost_atomic-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_chrono-vc141.1.72.0.0\build\boost_chrono-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc141.1.72.0.0\build\boost_chrono-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_date_time-vc141.1.72.0.0\build\boost_date_time-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_date_time-vc141.1.72.0.0\build\boost_date_time-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_filesystem-vc141.1.72.0.0\build\boost_filesystem-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_filesystem-vc141.1.72.0.0\build\boost_filesystem-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_iostreams-vc141.1.72.0.0\build\boost_iostreams-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc141.1.72.0.0\build\boost_iostreams-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_locale-vc141.1.72.0.0\build\boost_locale-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc141.1.72.0.0\build\boost_locale-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_log_setup-vc141.1.72.0.0\build\boost_log_setup-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_log_setup-vc141.1.72.0.0\build\boost_log_setup-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_log-vc141.1.72.0.0\build\boost_log-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_log-vc141.1.72.0.0\build\boost_log-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_program_options-vc141.1.72.0.0\build\boost_program_options-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc141.1.72.0.0\build\boost_program_options-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_system-vc141.1.72.0.0\build\boost_system-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc141.1.72.0.0\build\boost_system-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc141.1.72.0.0\build\boost_thread-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc141.1.72.0.0\build\boost_thread-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets')" />
<Import Project="$(NuGetPackageRoot)boost_atomic-vc141.1.73.0.0\build\boost_atomic-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_atomic-vc141.1.73.0.0\build\boost_atomic-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_chrono-vc141.1.73.0.0\build\boost_chrono-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc141.1.73.0.0\build\boost_chrono-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_date_time-vc141.1.73.0.0\build\boost_date_time-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_date_time-vc141.1.73.0.0\build\boost_date_time-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_filesystem-vc141.1.73.0.0\build\boost_filesystem-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_filesystem-vc141.1.73.0.0\build\boost_filesystem-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_iostreams-vc141.1.73.0.0\build\boost_iostreams-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc141.1.73.0.0\build\boost_iostreams-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_locale-vc141.1.73.0.0\build\boost_locale-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc141.1.73.0.0\build\boost_locale-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_log_setup-vc141.1.73.0.0\build\boost_log_setup-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_log_setup-vc141.1.73.0.0\build\boost_log_setup-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_log-vc141.1.73.0.0\build\boost_log-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_log-vc141.1.73.0.0\build\boost_log-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_program_options-vc141.1.73.0.0\build\boost_program_options-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc141.1.73.0.0\build\boost_program_options-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_regex-vc141.1.73.0.0\build\boost_regex-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc141.1.73.0.0\build\boost_regex-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_system-vc141.1.73.0.0\build\boost_system-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc141.1.73.0.0\build\boost_system-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc141.1.73.0.0\build\boost_thread-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc141.1.73.0.0\build\boost_thread-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets')" />
<Import Project="$(NuGetPackageRoot)libzmq_vc141.4.3.2\build\native\libzmq_vc141.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc141.4.3.2\build\native\libzmq_vc141.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_atomic-vc141.1.72.0.0\build\boost_atomic-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_atomic-vc141.1.72.0.0\build\boost_atomic-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc141.1.72.0.0\build\boost_chrono-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc141.1.72.0.0\build\boost_chrono-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_date_time-vc141.1.72.0.0\build\boost_date_time-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_date_time-vc141.1.72.0.0\build\boost_date_time-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_filesystem-vc141.1.72.0.0\build\boost_filesystem-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_filesystem-vc141.1.72.0.0\build\boost_filesystem-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc141.1.72.0.0\build\boost_iostreams-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc141.1.72.0.0\build\boost_iostreams-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc141.1.72.0.0\build\boost_locale-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc141.1.72.0.0\build\boost_locale-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_log_setup-vc141.1.72.0.0\build\boost_log_setup-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log_setup-vc141.1.72.0.0\build\boost_log_setup-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_log-vc141.1.72.0.0\build\boost_log-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log-vc141.1.72.0.0\build\boost_log-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc141.1.72.0.0\build\boost_program_options-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc141.1.72.0.0\build\boost_program_options-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc141.1.72.0.0\build\boost_system-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc141.1.72.0.0\build\boost_system-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc141.1.72.0.0\build\boost_thread-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc141.1.72.0.0\build\boost_thread-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_atomic-vc141.1.73.0.0\build\boost_atomic-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_atomic-vc141.1.73.0.0\build\boost_atomic-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc141.1.73.0.0\build\boost_chrono-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc141.1.73.0.0\build\boost_chrono-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_date_time-vc141.1.73.0.0\build\boost_date_time-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_date_time-vc141.1.73.0.0\build\boost_date_time-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_filesystem-vc141.1.73.0.0\build\boost_filesystem-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_filesystem-vc141.1.73.0.0\build\boost_filesystem-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc141.1.73.0.0\build\boost_iostreams-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc141.1.73.0.0\build\boost_iostreams-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc141.1.73.0.0\build\boost_locale-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc141.1.73.0.0\build\boost_locale-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_log_setup-vc141.1.73.0.0\build\boost_log_setup-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log_setup-vc141.1.73.0.0\build\boost_log_setup-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_log-vc141.1.73.0.0\build\boost_log-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log-vc141.1.73.0.0\build\boost_log-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc141.1.73.0.0\build\boost_program_options-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc141.1.73.0.0\build\boost_program_options-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc141.1.73.0.0\build\boost_regex-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc141.1.73.0.0\build\boost_regex-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc141.1.73.0.0\build\boost_system-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc141.1.73.0.0\build\boost_system-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc141.1.73.0.0\build\boost_thread-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc141.1.73.0.0\build\boost_thread-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc141.4.3.2\build\native\libzmq_vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc141.4.3.2\build\native\libzmq_vc141.targets'))" />
</Target>
Expand Down
26 changes: 13 additions & 13 deletions builds/msvc/vs2022/bx/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
|
-->
<packages>
<package id="boost" version="1.72.0.0" targetFramework="Native" />
<package id="boost_atomic-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_chrono-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_date_time-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_filesystem-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_iostreams-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_locale-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_log_setup-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_log-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_program_options-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_regex-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_system-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_thread-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost" version="1.73.0.0" targetFramework="Native" />
<package id="boost_atomic-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_chrono-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_date_time-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_filesystem-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_iostreams-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_locale-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_log_setup-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_log-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_program_options-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_regex-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_system-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_thread-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="secp256k1_vc141" version="0.1.0.19" targetFramework="Native" />
<package id="libzmq_vc141" version="4.3.2" targetFramework="Native" />
</packages>
Loading

0 comments on commit 6c43b1c

Please sign in to comment.