Skip to content

Commit cbc0647

Browse files
pmienkpmienk
authored
Merge pull request #801 from pmienk/master
Regenerate with boost container, json.
2 parents bdb78c8 + c2b1825 commit cbc0647

15 files changed

Lines changed: 42 additions & 0 deletions

File tree

‎builds/cmake/install-cmake.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,9 @@ main()
402402
"-Wno-enum-constexpr-conversion")
403403

404404
boost_OPTIONS=(
405+
"--with-container"
405406
"--with-iostreams"
407+
"--with-json"
406408
"--with-locale"
407409
"--with-program_options"
408410
"--with-regex"

‎builds/cmake/install-presets.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,9 @@ main()
418418
"-Wno-enum-constexpr-conversion")
419419

420420
boost_OPTIONS=(
421+
"--with-container"
421422
"--with-iostreams"
423+
"--with-json"
422424
"--with-locale"
423425
"--with-program_options"
424426
"--with-regex"

‎builds/gnu/install-gnu.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,9 @@ main()
384384
"-Wno-enum-constexpr-conversion")
385385

386386
boost_OPTIONS=(
387+
"--with-container"
387388
"--with-iostreams"
389+
"--with-json"
388390
"--with-locale"
389391
"--with-program_options"
390392
"--with-regex"

‎builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,9 @@
227227
<ImportGroup Label="ExtensionTargets" />
228228
<ImportGroup Label="ExtensionSettings">
229229
<Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
230+
<Import Project="$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" />
230231
<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')" />
232+
<Import Project="$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" />
231233
<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')" />
232234
<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')" />
233235
<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')" />
@@ -240,7 +242,9 @@
240242
<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>
241243
</PropertyGroup>
242244
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
245+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets'))" />
243246
<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'))" />
247+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets'))" />
244248
<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'))" />
245249
<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'))" />
246250
<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'))" />

‎builds/msvc/vs2022/libbitcoin-database-test/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
-->
88
<packages>
99
<package id="boost" version="1.86.0" targetFramework="Native" />
10+
<package id="boost_container-vc143" version="1.86.0" targetFramework="Native" />
1011
<package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
12+
<package id="boost_json-vc143" version="1.86.0" targetFramework="Native" />
1113
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
1214
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1315
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />

‎builds/msvc/vs2022/libbitcoin-database-tools/libbitcoin-database-tools.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@
127127
<ImportGroup Label="ExtensionTargets" />
128128
<ImportGroup Label="ExtensionSettings">
129129
<Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
130+
<Import Project="$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" />
130131
<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')" />
132+
<Import Project="$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" />
131133
<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')" />
132134
<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')" />
133135
<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')" />
@@ -139,7 +141,9 @@
139141
<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>
140142
</PropertyGroup>
141143
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
144+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets'))" />
142145
<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'))" />
146+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets'))" />
143147
<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'))" />
144148
<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'))" />
145149
<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'))" />

‎builds/msvc/vs2022/libbitcoin-database-tools/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
-->
88
<packages>
99
<package id="boost" version="1.86.0" targetFramework="Native" />
10+
<package id="boost_container-vc143" version="1.86.0" targetFramework="Native" />
1011
<package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
12+
<package id="boost_json-vc143" version="1.86.0" targetFramework="Native" />
1113
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
1214
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1315
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />

‎builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,9 @@
268268
<ImportGroup Label="ExtensionTargets" />
269269
<ImportGroup Label="ExtensionSettings">
270270
<Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
271+
<Import Project="$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" />
271272
<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')" />
273+
<Import Project="$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" />
272274
<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')" />
273275
<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')" />
274276
<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')" />
@@ -280,7 +282,9 @@
280282
<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>
281283
</PropertyGroup>
282284
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
285+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets'))" />
283286
<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'))" />
287+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets'))" />
284288
<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'))" />
285289
<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'))" />
286290
<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'))" />

‎builds/msvc/vs2022/libbitcoin-database/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
-->
88
<packages>
99
<package id="boost" version="1.86.0" targetFramework="Native" />
10+
<package id="boost_container-vc143" version="1.86.0" targetFramework="Native" />
1011
<package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
12+
<package id="boost_json-vc143" version="1.86.0" targetFramework="Native" />
1113
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
1214
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1315
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />

‎builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,9 @@
227227
<ImportGroup Label="ExtensionTargets" />
228228
<ImportGroup Label="ExtensionSettings">
229229
<Import Project="$(NuGetPackageRoot)libbitcoin-boost.1.91.0\build\libbitcoin-boost.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost.1.91.0\build\libbitcoin-boost.targets')" />
230+
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0\build\libbitcoin-boost_container-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0\build\libbitcoin-boost_container-vc145.targets')" />
230231
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_iostreams-vc145.1.91.0\build\libbitcoin-boost_iostreams-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_iostreams-vc145.1.91.0\build\libbitcoin-boost_iostreams-vc145.targets')" />
232+
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0\build\libbitcoin-boost_json-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0\build\libbitcoin-boost_json-vc145.targets')" />
231233
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_locale-vc145.1.91.0\build\libbitcoin-boost_locale-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_locale-vc145.1.91.0\build\libbitcoin-boost_locale-vc145.targets')" />
232234
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0\build\libbitcoin-boost_program_options-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0\build\libbitcoin-boost_program_options-vc145.targets')" />
233235
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets')" />
@@ -240,7 +242,9 @@
240242
<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>
241243
</PropertyGroup>
242244
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost.1.91.0\build\libbitcoin-boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost.1.91.0\build\libbitcoin-boost.targets'))" />
245+
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0\build\libbitcoin-boost_container-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_container-vc145.1.91.0\build\libbitcoin-boost_container-vc145.targets'))" />
243246
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_iostreams-vc145.1.91.0\build\libbitcoin-boost_iostreams-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_iostreams-vc145.1.91.0\build\libbitcoin-boost_iostreams-vc145.targets'))" />
247+
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0\build\libbitcoin-boost_json-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_json-vc145.1.91.0\build\libbitcoin-boost_json-vc145.targets'))" />
244248
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_locale-vc145.1.91.0\build\libbitcoin-boost_locale-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_locale-vc145.1.91.0\build\libbitcoin-boost_locale-vc145.targets'))" />
245249
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0\build\libbitcoin-boost_program_options-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_program_options-vc145.1.91.0\build\libbitcoin-boost_program_options-vc145.targets'))" />
246250
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets'))" />

0 commit comments

Comments
 (0)