Skip to content

Commit ce2a71d

Browse files
committed
Bump vc++ builds to boost 1.86, statically link boost test.
1 parent c25a6f4 commit ce2a71d

File tree

11 files changed

+21
-49
lines changed

11 files changed

+21
-49
lines changed

generate4.xml

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,16 @@
2828
<!-- https://trac.macports.org/ticket/42282 [clang, 1.55] -->
2929
<!-- https://svn.boost.org/trac/boost/ticket/8973 [gcc, 1.54] -->
3030
<!-- https://svn.boost.org/trac/boost/ticket/6851 [gcc, 1.50-1.53] -->
31-
<!-- [log rotation derivation for customization] [???? 1.56] -->
3231
<!-- [compiler failure] [vc120 1.62-1.72] -->
3332
<dependency name="boost" version="1.76.0" />
3433
<!-- boost atomic is header-only for lock-free cases. -->
35-
<!-- www.boost.org/doc/libs/1_78_0/doc/html/atomic/interface.html
36-
<dependency name="boost_atomic" m4="none" />
37-
-->
3834
<dependency name="boost_chrono" />
3935
<dependency name="boost_container" m4="none" />
40-
<!-- <dependency name="boost_date_time" /> -->
41-
<!-- <dependency name="boost_filesystem" /> -->
4236
<dependency name="boost_iostreams" />
4337
<!-- boost json is not used in the header-only configuration. -->
4438
<dependency name="boost_json" />
4539
<dependency name="boost_locale" />
4640
<dependency name="boost_program_options" />
47-
<!-- <dependency name="boost_regex" /> -->
4841
<dependency name="boost_system" />
4942
<dependency name="boost_thread" />
5043
<dependency name="boost_unit_test_framework" option="tests" />
@@ -161,13 +154,10 @@
161154
<flag substitute="icu" />
162155
<library name="boost" />
163156
<library name="boost_chrono" />
164-
<!-- <library name="boost_date_time" /> -->
165-
<!-- <library name="boost_filesystem" /> -->
166157
<library name="boost_iostreams" />
167158
<library name="boost_json" />
168159
<library name="boost_locale" />
169160
<library name="boost_program_options" />
170-
<!-- <library name="boost_regex" /> -->
171161
<library name="boost_system" />
172162
<library name="boost_thread" />
173163
<library name="pthread" />
@@ -2117,7 +2107,7 @@
21172107
<resource canonical="boost">
21182108
<package compiler="vc141" name="boost" version="1.76.0.0" />
21192109
<package compiler="vc142" name="boost" version="1.76.0.0" />
2120-
<package compiler="vc143" name="boost" version="1.78.0" />
2110+
<package compiler="vc143" name="boost" version="1.86.0" />
21212111
</resource>
21222112
<!-- boost atomic is header-only for lock-free cases. -->
21232113
<!-- www.boost.org/doc/libs/1_78_0/doc/html/atomic/interface.html -->
@@ -2128,7 +2118,7 @@
21282118
<resource canonical="boost_chrono">
21292119
<package compiler="vc141" name="boost_chrono-vc141" version="1.76.0.0" />
21302120
<package compiler="vc142" name="boost_chrono-vc142" version="1.76.0.0" />
2131-
<package compiler="vc143" name="boost_chrono-vc143" version="1.78.0" />
2121+
<package compiler="vc143" name="boost_chrono-vc143" version="1.86.0" />
21322122
</resource>
21332123
<resource canonical="boost_container">
21342124
<!-- boost container is a header-only library, except if you use -->
@@ -2137,57 +2127,47 @@
21372127
<!-- These are required by use of boost json (even as headers only). -->
21382128
<package compiler="vc141" name="boost_container-vc141" version="1.76.0.0" />
21392129
<package compiler="vc142" name="boost_container-vc142" version="1.76.0.0" />
2140-
<package compiler="vc143" name="boost_container-vc143" version="1.78.0" />
2130+
<package compiler="vc143" name="boost_container-vc143" version="1.86.0" />
21412131
</resource>
2142-
<!-- <resource canonical="boost_date_time">
2143-
<package compiler="vc141" name="boost_date_time-vc141" version="1.76.0.0" />
2144-
<package compiler="vc142" name="boost_date_time-vc142" version="1.76.0.0" />
2145-
<package compiler="vc143" name="boost_date_time-vc143" version="1.78.0" />
2146-
</resource> -->
2147-
<!-- <resource canonical="boost_filesystem">
2148-
<package compiler="vc141" name="boost_filesystem-vc141" version="1.76.0.0" />
2149-
<package compiler="vc142" name="boost_filesystem-vc142" version="1.76.0.0" />
2150-
<package compiler="vc143" name="boost_filesystem-vc143" version="1.78.0" />
2151-
</resource> -->
21522132
<resource canonical="boost_iostreams">
21532133
<package compiler="vc141" name="boost_iostreams-vc141" version="1.76.0.0" />
21542134
<package compiler="vc142" name="boost_iostreams-vc142" version="1.76.0.0" />
2155-
<package compiler="vc143" name="boost_iostreams-vc143" version="1.78.0" />
2135+
<package compiler="vc143" name="boost_iostreams-vc143" version="1.86.0" />
21562136
</resource>
21572137
<resource canonical="boost_json">
21582138
<package compiler="vc141" name="boost_json-vc141" version="1.76.0.0" />
21592139
<package compiler="vc142" name="boost_json-vc142" version="1.76.0.0" />
2160-
<package compiler="vc143" name="boost_json-vc143" version="1.78.0" />
2140+
<package compiler="vc143" name="boost_json-vc143" version="1.86.0" />
21612141
</resource>
21622142
<resource canonical="boost_locale">
21632143
<package compiler="vc141" name="boost_locale-vc141" version="1.76.0.0" />
21642144
<package compiler="vc142" name="boost_locale-vc142" version="1.76.0.0" />
2165-
<package compiler="vc143" name="boost_locale-vc143" version="1.78.0" />
2145+
<package compiler="vc143" name="boost_locale-vc143" version="1.86.0" />
21662146
</resource>
21672147
<resource canonical="boost_program_options">
21682148
<package compiler="vc141" name="boost_program_options-vc141" version="1.76.0.0" />
21692149
<package compiler="vc142" name="boost_program_options-vc142" version="1.76.0.0" />
2170-
<package compiler="vc143" name="boost_program_options-vc143" version="1.78.0" />
2150+
<package compiler="vc143" name="boost_program_options-vc143" version="1.86.0" />
21712151
</resource>
21722152
<resource canonical="boost_regex">
21732153
<package compiler="vc141" name="boost_regex-vc141" version="1.76.0.0" />
21742154
<package compiler="vc142" name="boost_regex-vc142" version="1.76.0.0" />
2175-
<package compiler="vc143" name="boost_regex-vc143" version="1.78.0" />
2155+
<package compiler="vc143" name="boost_regex-vc143" version="1.86.0" />
21762156
</resource>
21772157
<resource canonical="boost_system">
21782158
<package compiler="vc141" name="boost_system-vc141" version="1.76.0.0" />
21792159
<package compiler="vc142" name="boost_system-vc142" version="1.76.0.0" />
2180-
<package compiler="vc143" name="boost_system-vc143" version="1.78.0" />
2160+
<package compiler="vc143" name="boost_system-vc143" version="1.86.0" />
21812161
</resource>
21822162
<resource canonical="boost_thread">
21832163
<package compiler="vc141" name="boost_thread-vc141" version="1.76.0.0" />
21842164
<package compiler="vc142" name="boost_thread-vc142" version="1.76.0.0" />
2185-
<package compiler="vc143" name="boost_thread-vc143" version="1.78.0" />
2165+
<package compiler="vc143" name="boost_thread-vc143" version="1.86.0" />
21862166
</resource>
21872167
<resource canonical="boost_unit_test_framework">
21882168
<package compiler="vc141" name="boost_unit_test_framework-vc141" version="1.76.0.0" />
21892169
<package compiler="vc142" name="boost_unit_test_framework-vc142" version="1.76.0.0" />
2190-
<package compiler="vc143" name="boost_unit_test_framework-vc143" version="1.78.0" />
2170+
<package compiler="vc143" name="boost_unit_test_framework-vc143" version="1.86.0" />
21912171
</resource>
21922172
<resource canonical="secp256k1">
21932173
<!-- The vc120 secp256k1 nuget package is no longer supported -->
@@ -2300,14 +2280,6 @@
23002280
<!-- vscode -->
23012281
<template name="gsl.vscode.settings.json" />
23022282
<template name="gsl.code-workspace" />
2303-
2304-
<!-- no longer supported -->
2305-
<!-- <template name="gsl.interface.swg" /> -->
2306-
<!-- <template name="gsl.bindings.sh" /> -->
2307-
<!-- <template name="gsl.bindings.bat" /> -->
2308-
<!-- <template name="gsl.travis.yml" /> -->
2309-
<!-- <template name="gsl.build.ps1" /> -->
2310-
<!-- <template name="gsl.appveyor.yml" /> -->
23112283
</templates>
23122284

23132285
</generate>

props/version4/project/libbitcoin-blockchain/libbitcoin-blockchain-test/libbitcoin-blockchain-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ClCompile>
1414
<AdditionalIncludeDirectories>$(RepoRoot)include\;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1515
<EnablePREfast>false</EnablePREfast>
16-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
16+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1717
</ClCompile>
1818
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1919
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

props/version4/project/libbitcoin-client/libbitcoin-client-test/libbitcoin-client-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ClCompile>
1414
<EnablePREfast>false</EnablePREfast>
1515
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
16-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
16+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1717
</ClCompile>
1818
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1919
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

props/version4/project/libbitcoin-consensus/libbitcoin-consensus-test/libbitcoin-consensus-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<!-- 4996: (2) unchecked iterator, call to 'std::copy' with parameters that may be unsafe. -->
2323
<!-- 4100: (7) unreferenced formal parameter. -->
2424
<DisableSpecificWarnings>4018;4100;4244;4267;4715;4800;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
25-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
25+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
2626
</ClCompile>
2727
<!-- We have a problem in configuration of boost test with dynamic lib, run tests after release builds. -->
2828
<PostBuildEvent Condition="'$(DefaultLinkage)' != 'dynamic' and '$(DebugOrRelease)' == 'release'">

props/version4/project/libbitcoin-database/libbitcoin-database-test/libbitcoin-database-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ClCompile>
1414
<AdditionalIncludeDirectories>$(RepoRoot)include\;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1515
<EnablePREfast>false</EnablePREfast>
16-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
16+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1717
</ClCompile>
1818
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1919
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

props/version4/project/libbitcoin-explorer/libbitcoin-explorer-test/libbitcoin-explorer-test.props

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

props/version4/project/libbitcoin-network/libbitcoin-network-test/libbitcoin-network-test.props

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

props/version4/project/libbitcoin-node/libbitcoin-node-test/libbitcoin-node-test.props

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

props/version4/project/libbitcoin-protocol/libbitcoin-protocol-test/libbitcoin-protocol-test.props

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

props/version4/project/libbitcoin-server/libbitcoin-server-test/libbitcoin-server-test.props

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

props/version4/project/libbitcoin-system/libbitcoin-system-test/libbitcoin-system-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<!--<Optimization>Disabled</Optimization>-->
2222
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
2323
<EnablePREfast>false</EnablePREfast>
24-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
24+
<!--<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->-->
2525
</ClCompile>
2626
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
2727
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

0 commit comments

Comments
 (0)