Skip to content

Commit 7a85f57

Browse files
evoskuilevoskuil
authored
Merge pull request #577 from evoskuil/master
Reduce boost dependencies, no nuget import headers, bump to 1.86.0.
2 parents f7a850e + d06be9e commit 7a85f57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2024
-2289
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 879 additions & 0 deletions
Large diffs are not rendered by default.

‎Makefile.am‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ src_libbitcoin_server_la_SOURCES = \
5151
src/services/heartbeat_service.cpp \
5252
src/services/query_service.cpp \
5353
src/services/transaction_service.cpp \
54-
src/web/block_socket.cpp \
55-
src/web/default_page_data.cpp \
56-
src/web/heartbeat_socket.cpp \
57-
src/web/query_socket.cpp \
58-
src/web/transaction_socket.cpp \
5954
src/workers/authenticator.cpp \
6055
src/workers/notification_worker.cpp \
6156
src/workers/query_worker.cpp
@@ -126,14 +121,6 @@ include_bitcoin_server_services_HEADERS = \
126121
include/bitcoin/server/services/query_service.hpp \
127122
include/bitcoin/server/services/transaction_service.hpp
128123

129-
include_bitcoin_server_webdir = ${includedir}/bitcoin/server/web
130-
include_bitcoin_server_web_HEADERS = \
131-
include/bitcoin/server/web/block_socket.hpp \
132-
include/bitcoin/server/web/default_page_data.hpp \
133-
include/bitcoin/server/web/heartbeat_socket.hpp \
134-
include/bitcoin/server/web/query_socket.hpp \
135-
include/bitcoin/server/web/transaction_socket.hpp
136-
137124
include_bitcoin_server_workersdir = ${includedir}/bitcoin/server/workers
138125
include_bitcoin_server_workers_HEADERS = \
139126
include/bitcoin/server/workers/authenticator.hpp \

‎builds/cmake/CMakeLists.txt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ endif()
148148

149149
# Find boost
150150
#------------------------------------------------------------------------------
151-
find_package( Boost 1.76.0 REQUIRED COMPONENTS
151+
find_package( Boost 1.86.0 REQUIRED COMPONENTS
152152
unit_test_framework )
153153

154154
set( boost_unit_test_framework_LIBS "-lboost_unit_test_framework" )
@@ -263,11 +263,6 @@ add_library( ${CANONICAL_LIB_NAME}
263263
"../../src/services/heartbeat_service.cpp"
264264
"../../src/services/query_service.cpp"
265265
"../../src/services/transaction_service.cpp"
266-
"../../src/web/block_socket.cpp"
267-
"../../src/web/default_page_data.cpp"
268-
"../../src/web/heartbeat_socket.cpp"
269-
"../../src/web/query_socket.cpp"
270-
"../../src/web/transaction_socket.cpp"
271266
"../../src/workers/authenticator.cpp"
272267
"../../src/workers/notification_worker.cpp"
273268
"../../src/workers/query_worker.cpp" )

‎builds/msvc/vs2022/bs/bs.vcxproj‎

Lines changed: 60 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,54 @@
6161
<Configuration>ReleaseSEXE</Configuration>
6262
<Platform>x64</Platform>
6363
</ProjectConfiguration>
64+
<ProjectConfiguration Include="DebugDEXE|ARM">
65+
<Configuration>DebugDEXE</Configuration>
66+
<Platform>ARM</Platform>
67+
</ProjectConfiguration>
68+
<ProjectConfiguration Include="ReleaseDEXE|ARM">
69+
<Configuration>ReleaseDEXE</Configuration>
70+
<Platform>ARM</Platform>
71+
</ProjectConfiguration>
72+
<ProjectConfiguration Include="DebugDEXE|ARM64">
73+
<Configuration>DebugDEXE</Configuration>
74+
<Platform>ARM64</Platform>
75+
</ProjectConfiguration>
76+
<ProjectConfiguration Include="ReleaseDEXE|ARM64">
77+
<Configuration>ReleaseDEXE</Configuration>
78+
<Platform>ARM64</Platform>
79+
</ProjectConfiguration>
80+
<ProjectConfiguration Include="DebugLEXE|ARM">
81+
<Configuration>DebugLEXE</Configuration>
82+
<Platform>ARM</Platform>
83+
</ProjectConfiguration>
84+
<ProjectConfiguration Include="ReleaseLEXE|ARM">
85+
<Configuration>ReleaseLEXE</Configuration>
86+
<Platform>ARM</Platform>
87+
</ProjectConfiguration>
88+
<ProjectConfiguration Include="DebugLEXE|ARM64">
89+
<Configuration>DebugLEXE</Configuration>
90+
<Platform>ARM64</Platform>
91+
</ProjectConfiguration>
92+
<ProjectConfiguration Include="ReleaseLEXE|ARM64">
93+
<Configuration>ReleaseLEXE</Configuration>
94+
<Platform>ARM64</Platform>
95+
</ProjectConfiguration>
96+
<ProjectConfiguration Include="DebugSEXE|ARM">
97+
<Configuration>DebugSEXE</Configuration>
98+
<Platform>ARM</Platform>
99+
</ProjectConfiguration>
100+
<ProjectConfiguration Include="ReleaseSEXE|ARM">
101+
<Configuration>ReleaseSEXE</Configuration>
102+
<Platform>ARM</Platform>
103+
</ProjectConfiguration>
104+
<ProjectConfiguration Include="DebugSEXE|ARM64">
105+
<Configuration>DebugSEXE</Configuration>
106+
<Platform>ARM64</Platform>
107+
</ProjectConfiguration>
108+
<ProjectConfiguration Include="ReleaseSEXE|ARM64">
109+
<Configuration>ReleaseSEXE</Configuration>
110+
<Platform>ARM64</Platform>
111+
</ProjectConfiguration>
64112
</ItemGroup>
65113
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
66114
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -86,34 +134,26 @@
86134
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
87135
<ImportGroup Label="ExtensionTargets" />
88136
<ImportGroup Label="ExtensionSettings">
89-
<Import Project="$(NuGetPackageRoot)boost.1.78.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.78.0\build\boost.targets')" />
90-
<Import Project="$(NuGetPackageRoot)boost_chrono-vc143.1.78.0\build\boost_chrono-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.78.0\build\boost_chrono-vc143.targets')" />
91-
<Import Project="$(NuGetPackageRoot)boost_container-vc143.1.78.0\build\boost_container-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_container-vc143.1.78.0\build\boost_container-vc143.targets')" />
92-
<Import Project="$(NuGetPackageRoot)boost_iostreams-vc143.1.78.0\build\boost_iostreams-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.78.0\build\boost_iostreams-vc143.targets')" />
93-
<Import Project="$(NuGetPackageRoot)boost_json-vc143.1.78.0\build\boost_json-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_json-vc143.1.78.0\build\boost_json-vc143.targets')" />
94-
<Import Project="$(NuGetPackageRoot)boost_locale-vc143.1.78.0\build\boost_locale-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc143.1.78.0\build\boost_locale-vc143.targets')" />
95-
<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')" />
96-
<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')" />
97-
<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')" />
137+
<Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
138+
<Import Project="$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" />
139+
<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')" />
140+
<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')" />
141+
<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')" />
98142
<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')" />
99-
<Import Project="$(NuGetPackageRoot)boost_regex-vc143.1.78.0\build\boost_regex-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc143.1.78.0\build\boost_regex-vc143.targets')" />
143+
<Import Project="$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets')" />
100144
<Import Project="$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" />
101145
</ImportGroup>
102146
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
103147
<PropertyGroup>
104148
<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>
105149
</PropertyGroup>
106-
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.78.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.78.0\build\boost.targets'))" />
107-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.78.0\build\boost_chrono-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc143.1.78.0\build\boost_chrono-vc143.targets'))" />
108-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_container-vc143.1.78.0\build\boost_container-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_container-vc143.1.78.0\build\boost_container-vc143.targets'))" />
109-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.78.0\build\boost_iostreams-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc143.1.78.0\build\boost_iostreams-vc143.targets'))" />
110-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_json-vc143.1.78.0\build\boost_json-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_json-vc143.1.78.0\build\boost_json-vc143.targets'))" />
111-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc143.1.78.0\build\boost_locale-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc143.1.78.0\build\boost_locale-vc143.targets'))" />
112-
<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'))" />
113-
<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'))" />
114-
<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'))" />
150+
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
151+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets'))" />
152+
<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'))" />
153+
<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'))" />
154+
<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'))" />
115155
<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'))" />
116-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc143.1.78.0\build\boost_regex-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc143.1.78.0\build\boost_regex-vc143.targets'))" />
156+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets'))" />
117157
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets'))" />
118158
</Target>
119159
<ItemGroup>

‎builds/msvc/vs2022/bs/packages.config‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@
66
|
77
-->
88
<packages>
9-
<package id="boost" version="1.78.0" targetFramework="Native" />
10-
<package id="boost_chrono-vc143" version="1.78.0" targetFramework="Native" />
11-
<package id="boost_container-vc143" version="1.78.0" targetFramework="Native" />
12-
<package id="boost_iostreams-vc143" version="1.78.0" targetFramework="Native" />
13-
<package id="boost_json-vc143" version="1.78.0" targetFramework="Native" />
14-
<package id="boost_locale-vc143" version="1.78.0" targetFramework="Native" />
15-
<package id="boost_program_options-vc143" version="1.78.0" targetFramework="Native" />
16-
<package id="boost_system-vc143" version="1.78.0" targetFramework="Native" />
17-
<package id="boost_thread-vc143" version="1.78.0" targetFramework="Native" />
9+
<package id="boost" version="1.86.0" targetFramework="Native" />
10+
<package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
11+
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
12+
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
13+
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1814
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
19-
<package id="boost_regex-vc143" version="1.78.0" targetFramework="Native" />
15+
<package id="boost_regex-vc143" version="1.86.0" targetFramework="Native" />
2016
<package id="libzmq_vc143" version="4.3.2" targetFramework="Native" />
2117
</packages>

‎builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<ItemDefinitionGroup>
1313
<ClCompile>
1414
<EnablePREfast>false</EnablePREfast>
15-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1615
</ClCompile>
1716
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1817
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

0 commit comments

Comments
 (0)