From 582723195633e2393a299a921f2c39ae929161c1 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 1/5] Make the library modular usable. --- build.jam | 34 ++++++++++++++++++++++++++++++++++ test/Jamfile.v2 | 16 +++++++++------- 2 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 00000000..1f47a5a9 --- /dev/null +++ b/build.jam @@ -0,0 +1,34 @@ +# 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/variant + : common-requirements + /boost/assert//boost_assert + /boost/bind//boost_bind + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/core//boost_core + /boost/detail//boost_detail + /boost/integer//boost_integer + /boost/move//boost_move + /boost/mpl//boost_mpl + /boost/preprocessor//boost_preprocessor + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_index//boost_type_index + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility + include + ; + +explicit + [ alias boost_variant ] + [ alias all : boost_variant test ] + ; + +call-if : boost-library variant + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 491be2c0..b256fa47 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -8,8 +8,10 @@ # http://www.boost.org/LICENSE_1_0.txt) # +require-b2 5.0.1 ; +import-search /boost/config/checks ; +import config : requires ; import testing ; -import ../../config/checks/config : requires ; local below_cpp14 = 98 03 0x 11 ; local since_cpp20 = 2a 20 latest ; @@ -30,7 +32,7 @@ test-suite variant [ run test6.cpp : : : : variant_test6 ] [ run test7.cpp : : : : variant_test7 ] [ run test8.cpp : : : : variant_test8 ] - [ run test9.cpp : : : : variant_test9 ] + [ run test9.cpp : : : /boost/fusion//boost_fusion : variant_test9 ] [ run recursive_variant_test.cpp ] [ run variant_reference_test.cpp ] [ run variant_comparison_test.cpp ] @@ -39,7 +41,7 @@ test-suite variant [ run variant_get_test.cpp ] [ compile-fail variant_rvalue_get_with_ampersand_test.cpp ] [ compile-fail no_rvalue_to_nonconst_visitation.cpp ] - [ compile fusion_interop.cpp ] + [ compile fusion_interop.cpp : /boost/fusion//boost_fusion ] [ run variant_polymorphic_get_test.cpp ] [ run variant_multivisit_test.cpp ] [ run hash_variant_test.cpp ] @@ -58,13 +60,13 @@ test-suite variant [ run recursive_variant_test.cpp : : : off BOOST_NO_RTTI BOOST_NO_TYPEID : variant_no_rtti_test ] [ run hash_recursive_variant_test.cpp ] [ run variant_swap_test.cpp ] - [ run auto_visitors.cpp ] + [ run auto_visitors.cpp : : : /boost/lexical_cast//boost_lexical_cast ] [ run issue42.cpp ] - [ run issue53.cpp ] + [ run issue53.cpp : : : /boost/thread//boost_thread ] [ run overload_selection.cpp : : : "$(since_cpp20)"\:no ] - [ run recursive_wrapper_move_test.cpp ] + [ run recursive_wrapper_move_test.cpp : : : /boost/array//boost_array ] [ run variant_over_joint_view_test.cpp ] - [ run const_ref_apply_visitor.cpp ] + [ run const_ref_apply_visitor.cpp : : : /boost/lexical_cast//boost_lexical_cast ] ; From cd35ae95669c59d1d069309caba11ae011ac7e06 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:16:00 -0500 Subject: [PATCH 2/5] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build.jam b/build.jam index 1f47a5a9..35a69f24 100644 --- a/build.jam +++ b/build.jam @@ -7,21 +7,21 @@ import project ; project /boost/variant : common-requirements - /boost/assert//boost_assert - /boost/bind//boost_bind - /boost/config//boost_config - /boost/container_hash//boost_container_hash - /boost/core//boost_core - /boost/detail//boost_detail - /boost/integer//boost_integer - /boost/move//boost_move - /boost/mpl//boost_mpl - /boost/preprocessor//boost_preprocessor - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_index//boost_type_index - /boost/type_traits//boost_type_traits - /boost/utility//boost_utility + /boost/assert//boost_assert + /boost/bind//boost_bind + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/core//boost_core + /boost/detail//boost_detail + /boost/integer//boost_integer + /boost/move//boost_move + /boost/mpl//boost_mpl + /boost/preprocessor//boost_preprocessor + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_index//boost_type_index + /boost/type_traits//boost_type_traits + /boost/utility//boost_utility include ; From 212a4f001ff911da2acbfb921c1577bd5e88dd69 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 3/5] 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 35a69f24..adc1dc37 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/variant From 778f8d8006ea66de0b5cb6f7f58594f55e3c2df5 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 13 May 2024 21:48:40 -0500 Subject: [PATCH 4/5] Update dependencies. --- build.jam | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.jam b/build.jam index adc1dc37..01cf82ff 100644 --- a/build.jam +++ b/build.jam @@ -10,13 +10,11 @@ import project ; project /boost/variant : common-requirements /boost/assert//boost_assert - /boost/bind//boost_bind /boost/config//boost_config /boost/container_hash//boost_container_hash /boost/core//boost_core /boost/detail//boost_detail /boost/integer//boost_integer - /boost/move//boost_move /boost/mpl//boost_mpl /boost/preprocessor//boost_preprocessor /boost/static_assert//boost_static_assert From 97f7df541467aab1fa6350add4c5f875e026b0da Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 5/5] 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 01cf82ff..961cc3c5 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/variant : common-requirements