From f3a981174086125a04a66e822cad2f4b8954111c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/13] Make the library modular usable. --- build.jam | 43 ++++++++++++++++++++++++++++++++++++++++++ build/Jamfile.v2 | 10 +++++----- example/Jamfile.v2 | 1 - performance/Jamfile.v2 | 2 -- test/Jamfile.v2 | 7 ++++--- util/test.jam | 2 +- 6 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000000..45cdfc8545 --- /dev/null +++ b/build.jam @@ -0,0 +1,43 @@ +# Copyright René Ferdinand Rivera Morell 2023 +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import project ; + +project /boost/serialization + : common-requirements + /boost/array//boost_array + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/detail//boost_detail + /boost/function//boost_function + /boost/integer//boost_integer + /boost/io//boost_io + /boost/iterator//boost_iterator + /boost/move//boost_move + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/predef//boost_predef + /boost/preprocessor//boost_preprocessor + /boost/smart_ptr//boost_smart_ptr + /boost/spirit//boost_spirit + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/unordered//boost_unordered + /boost/utility//boost_utility + /boost/variant//boost_variant + include + ; + +explicit + [ alias boost_serialization : build//boost_serialization ] + [ alias boost_wserialization : build//boost_wserialization ] + [ alias all : boost_serialization boost_wserialization example test ] + ; + +call-if : boost-library serialization + : install boost_serialization boost_wserialization + ; diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 2ad5754d3b..285d2222cf 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -6,14 +6,16 @@ # # See http://www.boost.org/libs/serialization for the library home page. -project boost/serialization +require-b2 5.0.1 ; +import-search /boost/config/checks ; +import config : requires ; + +project : source-location ../src : requirements @include-spirit ; -import ../../config/checks/config : requires ; - SPIRIT_ROOT = [ modules.peek : SPIRIT_ROOT ] ; rule include-spirit ( properties * ) { @@ -144,5 +146,3 @@ lib boost_wserialization # switch - don't change it to BOOST_WSERIALIZATION_DYN_LINK shared:BOOST_SERIALIZATION_DYN_LINK=1 ; - -boost-install boost_serialization boost_wserialization ; diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index cce6ee65fc..a467dc9341 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -19,7 +19,6 @@ import ../util/test : test-bsl-run test-bsl-run_archive test-bsl-run_files - test-bsl-run_polymorphic_archive ; test-suite "demo-suite" : diff --git a/performance/Jamfile.v2 b/performance/Jamfile.v2 index 5ec2a29687..a5295b38eb 100644 --- a/performance/Jamfile.v2 +++ b/performance/Jamfile.v2 @@ -21,7 +21,6 @@ import ../util/test : test-bsl-run test-bsl-run_archive test-bsl-run_files - test-bsl-run_polymorphic_archive ; BOOST_ARCHIVE_LIST = [ modules.peek : BOOST_ARCHIVE_LIST ] ; @@ -33,7 +32,6 @@ test-suite "performance" : # [ test-bsl-run_files performance_vector ] # [ test-bsl-run_files performance_no_rtti ] # [ test-bsl-run_files performance_simple_class ] -# [ test-bsl-run_polymorphic_archive performance_polymorphic : ../test/test_polymorphic_A ] [ test-bsl-run-no-lib performance_iterators ] [ test-bsl-run-no-lib performance_iterators_base64 ] diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 3e69b981db..2883df3f9a 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -6,13 +6,14 @@ # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -project libs/serialization/test +project : id serialization_test - : requirements /boost/filesystem + : requirements /boost/filesystem//boost_filesystem + /boost/math//boost_math ; # import rules for testing conditional on config file variables -import ../../config/checks/config : requires ; +import config : requires ; # import rules from the boost serialization test import ../util/test : diff --git a/util/test.jam b/util/test.jam index 217e41b726..db11ab0c93 100644 --- a/util/test.jam +++ b/util/test.jam @@ -11,7 +11,7 @@ # tests. # import rules for testing conditional on config file variables -import ../../config/checks/config : requires ; +import config : requires ; BOOST_ARCHIVE_LIST = [ modules.peek : BOOST_ARCHIVE_LIST ] ; From 6b64c89e2bd3521133da48ef80bf261dff22950d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 02/13] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/build.jam b/build.jam index 45cdfc8545..ce5c163e6c 100644 --- a/build.jam +++ b/build.jam @@ -7,28 +7,28 @@ import project ; project /boost/serialization : common-requirements - /boost/array//boost_array - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/detail//boost_detail - /boost/function//boost_function - /boost/integer//boost_integer - /boost/io//boost_io - /boost/iterator//boost_iterator - /boost/move//boost_move - /boost/mpl//boost_mpl - /boost/optional//boost_optional - /boost/predef//boost_predef - /boost/preprocessor//boost_preprocessor - /boost/smart_ptr//boost_smart_ptr - /boost/spirit//boost_spirit - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/unordered//boost_unordered - /boost/utility//boost_utility - /boost/variant//boost_variant + /boost/array//boost_array + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/detail//boost_detail + /boost/function//boost_function + /boost/integer//boost_integer + /boost/io//boost_io + /boost/iterator//boost_iterator + /boost/move//boost_move + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/predef//boost_predef + /boost/preprocessor//boost_preprocessor + /boost/smart_ptr//boost_smart_ptr + /boost/spirit//boost_spirit + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/unordered//boost_unordered + /boost/utility//boost_utility + /boost/variant//boost_variant include ; From ab0b5d6154a206add66942e1ef51bfc42377953b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 26 Apr 2024 23:15:22 -0500 Subject: [PATCH 03/13] Fix cross lib relative build ref. --- build/Jamfile.v2 | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 285d2222cf..6d31429af5 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -1,7 +1,7 @@ # Boost serialization Library Build Jamfile # (C) Copyright Robert Ramey 2002-2004. -# Use, modification, and distribution are subject to the -# Boost Software License, Version 1.0. (See accompanying file +# Use, modification, and distribution are subject to the +# Boost Software License, Version 1.0. (See accompanying file # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # # See http://www.boost.org/libs/serialization for the library home page. @@ -22,41 +22,41 @@ rule include-spirit ( properties * ) local old-compiler ; if borland in $(properties) { - if ! 6.1.0 in $(properties) - { - old-compiler = true ; - } + if ! 6.1.0 in $(properties) + { + old-compiler = true ; + } } else if msvc in $(properties) { if 6.5 in $(properties) || 7.0 in $(properties) - { + { old-compiler = true ; - } + } } - + local result ; if $(old-compiler) - { + { if $(SPIRIT_ROOT) { - # note - we can't use $(SPIRIT_ROOT) because + # note - we can't use $(SPIRIT_ROOT) because # it puts -I$(SPIRIT_ROOT) AFTER the "../../.." in the command line. - # so use these instead + # so use these instead result = -I$(SPIRIT_ROOT) ; } - else + else { echo **** spirit 1.6x required to build library with this compiler **** ; result = no ; } - } + } return $(result) ; } -SOURCES = +SOURCES = archive_exception basic_archive basic_iarchive @@ -92,12 +92,12 @@ SOURCES = codecvt_null ; -SOURCES_HAS_STD_WSTREAMBUF = +SOURCES_HAS_STD_WSTREAMBUF = xml_oarchive utf8_codecvt_facet ; -WSOURCES = +WSOURCES = basic_text_wiprimitive basic_text_woprimitive text_wiarchive @@ -112,11 +112,11 @@ WSOURCES = codecvt_null ; -lib boost_serialization +lib boost_serialization : ## sources ## $(SOURCES).cpp : ## requirements ## - [ check-target-builds ../../config/checks//std_wstreambuf : ../src/$(SOURCES_HAS_STD_WSTREAMBUF).cpp ] + [ check-target-builds /boost/config/checks//std_wstreambuf : ../src/$(SOURCES_HAS_STD_WSTREAMBUF).cpp ] msvc:/Gy msvc:_SCL_SECURE_NO_WARNINGS msvc:_CRT_SECURE_NO_WARNINGS @@ -129,11 +129,11 @@ lib boost_serialization shared:BOOST_SERIALIZATION_DYN_LINK=1 ; -lib boost_wserialization - : $(WSOURCES).cpp boost_serialization - : +lib boost_wserialization + : $(WSOURCES).cpp boost_serialization + : [ requires std_wstreambuf ] - msvc:/Gy + msvc:/Gy msvc:_SCL_SECURE_NO_WARNINGS msvc:_CRT_SECURE_NO_WARNINGS clang:"-fvisibility=hidden -fvisibility-inlines-hidden" From 431063710566550925e916fa0c9f3357b3cef8b1 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Apr 2024 20:16:45 -0500 Subject: [PATCH 04/13] Add missing NO_LIB usage requirements. --- build/Jamfile.v2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 6d31429af5..10a318fc04 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -14,6 +14,8 @@ project : source-location ../src : requirements @include-spirit + : usage-requirements + BOOST_SERIALIZATION_NO_LIB=1 ; SPIRIT_ROOT = [ modules.peek : SPIRIT_ROOT ] ; From 120970758158060f85951fa3f14aae65bfffd663 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 4 May 2024 23:32:31 -0500 Subject: [PATCH 05/13] Add missing import-search for cconfig/predef checks. --- test/Jamfile.v2 | 15 +++++++------ util/test.jam | 57 +++++++++++++++++++++++++------------------------ 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 2883df3f9a..b3d21c6ef1 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -1,8 +1,8 @@ # Boost serialization Library test Jamfile # (C) Copyright Robert Ramey 2002-2004. -# Use, modification, and distribution are subject to the -# Boost Software License, Version 1.0. (See accompanying file +# Use, modification, and distribution are subject to the +# Boost Software License, Version 1.0. (See accompanying file # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # @@ -13,6 +13,7 @@ project ; # import rules for testing conditional on config file variables +import-search /boost/config/checks ; import config : requires ; # import rules from the boost serialization test @@ -28,9 +29,9 @@ import ../util/test : ; BOOST_ARCHIVE_LIST = [ modules.peek : BOOST_ARCHIVE_LIST ] ; - + lib dll_a - : + : dll_a.cpp ../build//boost_serialization : @@ -39,7 +40,7 @@ lib dll_a lib dll_polymorphic_base : - dll_polymorphic_base.cpp + dll_polymorphic_base.cpp ../build//boost_serialization : shared @@ -131,7 +132,7 @@ test-suite "serialization" : ; if ! $(BOOST_ARCHIVE_LIST) { - test-suite "serialization2" : + test-suite "serialization2" : [ test-bsl-run test_inclusion ] [ test-bsl-run test_inclusion2 ] @@ -179,7 +180,7 @@ if ! $(BOOST_ARCHIVE_LIST) { #[ compile test_const_save_warn1_nvp.cpp ] #[ compile test_const_save_warn2_nvp.cpp ] #[ compile test_const_save_warn3_nvp.cpp ] - + # should compile [ compile test_traits_pass.cpp ] [ compile test_const_pass.cpp ] diff --git a/util/test.jam b/util/test.jam index db11ab0c93..145283d5e4 100644 --- a/util/test.jam +++ b/util/test.jam @@ -1,8 +1,8 @@ # Boost serialization Library utility test Jamfile # (C) Copyright Robert Ramey 2002-2004. -# Use, modification, and distribution are subject to the -# Boost Software License, Version 1.0. (See accompanying file +# Use, modification, and distribution are subject to the +# Boost Software License, Version 1.0. (See accompanying file # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # @@ -11,6 +11,7 @@ # tests. # import rules for testing conditional on config file variables +import-search /boost/config/checks ; import config : requires ; BOOST_ARCHIVE_LIST = [ modules.peek : BOOST_ARCHIVE_LIST ] ; @@ -18,12 +19,12 @@ BOOST_ARCHIVE_LIST = [ modules.peek : BOOST_ARCHIVE_LIST ] ; # these are used to shorten testing while in development. It permits # testing to be applied to just a particular type of archive if ! $(BOOST_ARCHIVE_LIST) { - BOOST_ARCHIVE_LIST = - "text_archive.hpp" - "text_warchive.hpp" - "binary_archive.hpp" - "xml_archive.hpp" - "xml_warchive.hpp" + BOOST_ARCHIVE_LIST = + "text_archive.hpp" + "text_warchive.hpp" + "binary_archive.hpp" + "xml_archive.hpp" + "xml_warchive.hpp" ; # enable the tests which don't depend on a particular archive BOOST_SERIALIZATION_TEST = true ; @@ -57,8 +58,8 @@ rule run-template ( test-name : sources * : files * : requirements * ) { darwin:"-ftemplate-depth-255" msvc:"-Gy" # linking - shared:BOOST_SERIALIZATION_DYN_LINK=1 - shared:BOOST_WSERIALIZATION_DYN_LINK=1 + shared:BOOST_SERIALIZATION_DYN_LINK=1 + shared:BOOST_WSERIALIZATION_DYN_LINK=1 $(requirements) : # test name $(test-name) @@ -73,7 +74,7 @@ rule dependency-save-test ( test ) if $(m) { return $(m[1])save$(m[2]) ; - } + } } # each of the following tests is run with each type of archive @@ -82,7 +83,7 @@ rule run-invoke ( test-name : sources * : files * : requirements * ) local save-test = [ dependency-save-test $(test-name) ] ; local tests ; - tests += [ + tests += [ run-template $(test-name) : # sources $(sources) @@ -102,7 +103,7 @@ rule run-winvoke ( test-name : sources * : files * : requirements * ) local save-test = [ dependency-save-test $(test-name) ] ; local tests ; - tests += [ + tests += [ run-template $(test-name) : # sources $(sources) @@ -124,7 +125,7 @@ rule run-winvoke ( test-name : sources * : files * : requirements * ) rule test-bsl-run-no-lib ( test-name : sources * : requirements * ) { local tests ; - tests += [ + tests += [ run-template $(test-name) : # sources $(test-name).cpp $(sources).cpp @@ -139,8 +140,8 @@ rule test-bsl-run-no-lib ( test-name : sources * : requirements * ) rule test-bsl-run ( test-name : sources * : libs * : requirements * ) { local tests ; - tests += [ - run-invoke $(test-name) + tests += [ + run-invoke $(test-name) : # sources $(test-name).cpp $(sources).cpp $(libs) : # input files @@ -191,27 +192,27 @@ rule test-bsl-run_archive ( test-name : archive-name : sources * : libs * : requ rule test-bsl-run_files ( test-name : sources * : libs * : requirements * ) { local tests ; for local defn in $(BOOST_ARCHIVE_LIST) { - tests += [ - test-bsl-run_archive $(test-name) - : $(defn:LB) - : $(test-name) $(sources) - : $(libs) - : $(requirements) + tests += [ + test-bsl-run_archive $(test-name) + : $(defn:LB) + : $(test-name) $(sources) + : $(libs) + : $(requirements) ] ; } return $(tests) ; } - + rule test-bsl-run_polymorphic_files ( test-name : sources * : libs * : requirements * ) { local tests ; for local defn in $(BOOST_ARCHIVE_LIST) { #ECHO polymorphic_$(defn:LB) ; - tests += [ - test-bsl-run_archive $(test-name) + tests += [ + test-bsl-run_archive $(test-name) : polymorphic_$(defn:LB) - : $(test-name) $(sources) - : $(libs) - : $(requirements) + : $(test-name) $(sources) + : $(libs) + : $(requirements) ] ; } return $(tests) ; From 58c43bc28390087c63e1b2ac917d43ad87a913c8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 08:09:42 -0500 Subject: [PATCH 06/13] Remove import-search from non-project jam file. --- util/test.jam | 1 - 1 file changed, 1 deletion(-) diff --git a/util/test.jam b/util/test.jam index 145283d5e4..ad8df73f40 100644 --- a/util/test.jam +++ b/util/test.jam @@ -11,7 +11,6 @@ # tests. # import rules for testing conditional on config file variables -import-search /boost/config/checks ; import config : requires ; BOOST_ARCHIVE_LIST = [ modules.peek : BOOST_ARCHIVE_LIST ] ; From a08d9d54cc9484410f2711f8f3d995b093023f15 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 07/13] Add requires-b2 check to top-level build file. --- build.jam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.jam b/build.jam index ce5c163e6c..0a0a0bc2a7 100644 --- a/build.jam +++ b/build.jam @@ -3,6 +3,8 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +require-b2 5.1 ; + import project ; project /boost/serialization From caa3806dcb0fd7d660230e53976736c62e855d7a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 13 May 2024 21:47:19 -0500 Subject: [PATCH 08/13] Update dependencies. --- build.jam | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 0a0a0bc2a7..948de0ff43 100644 --- a/build.jam +++ b/build.jam @@ -19,6 +19,7 @@ project /boost/serialization /boost/io//boost_io /boost/iterator//boost_iterator /boost/move//boost_move + /boost/mp11//boost_mp11 /boost/mpl//boost_mpl /boost/optional//boost_optional /boost/predef//boost_predef @@ -28,9 +29,9 @@ project /boost/serialization /boost/static_assert//boost_static_assert /boost/throw_exception//boost_throw_exception /boost/type_traits//boost_type_traits - /boost/unordered//boost_unordered /boost/utility//boost_utility /boost/variant//boost_variant + /boost/variant2//boost_variant2 include ; From 3fa840faa721679e58d36040115bb10b56746de7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 09/13] Bump B2 require to 5.2 --- build.jam | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.jam b/build.jam index 948de0ff43..898e53d2f0 100644 --- a/build.jam +++ b/build.jam @@ -3,9 +3,7 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -require-b2 5.1 ; - -import project ; +require-b2 5.2 ; project /boost/serialization : common-requirements From 6e84870afd7a867cc5ee5d8bffc3d7ad0abeae00 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:03 -0500 Subject: [PATCH 10/13] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 898e53d2f0..f2d9dd8bee 100644 --- a/build.jam +++ b/build.jam @@ -1,4 +1,4 @@ -# Copyright René Ferdinand Rivera Morell 2023 +# Copyright René Ferdinand Rivera Morell 2023-2024 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) From aaaa80d148534168d1eed00a4b6efd0af25db099 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 11/13] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 49 +++++++++++++++++++++++++----------------------- build/Jamfile.v2 | 1 + 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/build.jam b/build.jam index f2d9dd8bee..2512f96cdc 100644 --- a/build.jam +++ b/build.jam @@ -5,31 +5,33 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/array//boost_array + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/detail//boost_detail + /boost/function//boost_function + /boost/integer//boost_integer + /boost/io//boost_io + /boost/iterator//boost_iterator + /boost/move//boost_move + /boost/mp11//boost_mp11 + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/predef//boost_predef + /boost/preprocessor//boost_preprocessor + /boost/smart_ptr//boost_smart_ptr + /boost/spirit//boost_spirit + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility + /boost/variant//boost_variant + /boost/variant2//boost_variant2 ; + project /boost/serialization : common-requirements - /boost/array//boost_array - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/detail//boost_detail - /boost/function//boost_function - /boost/integer//boost_integer - /boost/io//boost_io - /boost/iterator//boost_iterator - /boost/move//boost_move - /boost/mp11//boost_mp11 - /boost/mpl//boost_mpl - /boost/optional//boost_optional - /boost/predef//boost_predef - /boost/preprocessor//boost_preprocessor - /boost/smart_ptr//boost_smart_ptr - /boost/spirit//boost_spirit - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/utility//boost_utility - /boost/variant//boost_variant - /boost/variant2//boost_variant2 include ; @@ -42,3 +44,4 @@ explicit call-if : boost-library serialization : install boost_serialization boost_wserialization ; + diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 43af38d0e5..f64e407ce4 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -12,6 +12,7 @@ import config : requires ; project : source-location ../src + : common-requirements $(boost_dependencies) : requirements @include-spirit : usage-requirements From 36f1ea63748be4d8a9aa6885564efee123630f4d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 26 Jul 2024 17:46:20 -0500 Subject: [PATCH 12/13] Split b2 dependencies into public and private. --- build.jam | 1 - build/Jamfile.v2 | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 2512f96cdc..7a91e3874a 100644 --- a/build.jam +++ b/build.jam @@ -11,7 +11,6 @@ constant boost_dependencies : /boost/config//boost_config /boost/core//boost_core /boost/detail//boost_detail - /boost/function//boost_function /boost/integer//boost_integer /boost/io//boost_io /boost/iterator//boost_iterator diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index f64e407ce4..50fcce7fb3 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -10,11 +10,16 @@ require-b2 5.0.1 ; import-search /boost/config/checks ; import config : requires ; +constant boost_dependencies_private : + /boost/function//boost_function + ; + project : source-location ../src : common-requirements $(boost_dependencies) : requirements @include-spirit + $(boost_dependencies_private) : usage-requirements BOOST_SERIALIZATION_NO_LIB=1 ; From 03f542ab4e693a55949a446cd857bb717cdd8475 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 11 Aug 2024 09:23:25 -0500 Subject: [PATCH 13/13] Change math dep real target math/tr1. --- test/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index b3d21c6ef1..1add4d5206 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -9,7 +9,7 @@ project : id serialization_test : requirements /boost/filesystem//boost_filesystem - /boost/math//boost_math + /boost/math//boost_math_tr1 ; # import rules for testing conditional on config file variables