From 5f825106c7cb4b22b8971b38b3014011aff41ad3 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:32:21 -0500 Subject: [PATCH 01/11] Make the library modular usable. --- build.jam | 23 +++++++++++++++++++++++ test/Jamfile.v2 | 13 +++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 00000000..46eff1a9 --- /dev/null +++ b/build.jam @@ -0,0 +1,23 @@ +# 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/core + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + include + ; + +explicit + [ alias boost_core ] + [ alias all : boost_core test ] + ; + +call-if : boost-library core + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 2bc6a4b1..eb5b4e51 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -6,11 +6,14 @@ # See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt +require-b2 5.0.1 ; +import-search /boost/config/checks ; +import config : requires ; import modules ; import testing ; project : requirements - + /boost/type_traits//boost_type_traits extra msvc:on clang:on @@ -194,7 +197,7 @@ run underlying_type.cpp ; compile-fail null_deleter_compile_fail_adl.cpp : $(warnings-as-errors-off) ; -run fclose_deleter_test.cpp : : : windows:_CRT_SECURE_NO_WARNINGS windows:_CRT_SECURE_NO_DEPRECATE ; +run fclose_deleter_test.cpp /boost/move//boost_move /boost/smart_ptr//boost_smart_ptr : : : windows:_CRT_SECURE_NO_WARNINGS windows:_CRT_SECURE_NO_DEPRECATE ; compile-fail fclose_deleter_compile_fail_adl.cpp : windows:_CRT_SECURE_NO_WARNINGS windows:_CRT_SECURE_NO_DEPRECATE $(warnings-as-errors-off) ; @@ -358,7 +361,7 @@ run sv_eq_test.cpp ; run sv_lt_test.cpp ; run sv_stream_insert_test.cpp ; run sv_conversion_test.cpp ; -run sv_conversion_test2.cpp : ; +run sv_conversion_test2.cpp /boost/utility//boost_utility : ; run sv_common_reference_test.cpp ; compile sv_common_reference_test2.cpp ; compile sv_windows_h_test.cpp ; @@ -395,11 +398,9 @@ run memory_resource_test.cpp ; run data_test.cpp ; run size_test.cpp ; -import ../../config/checks/config : requires ; - local CPP11 = [ requires cxx11_variadic_templates cxx11_template_aliases cxx11_decltype cxx11_constexpr cxx11_noexcept ] ; -local with-serialization = /boost//serialization/off $(warnings-as-errors-off) norecover:static $(CPP11) ; +local with-serialization = /boost/serialization//boost_serialization/off norecover:static $(CPP11) ; run serialization_nvp_test.cpp : : : $(with-serialization) norecover:no ; run serialization_split_free_test.cpp : : : $(with-serialization) ; From 25b0defdeb20daf681a668e78340d08a46d59749 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:58 -0500 Subject: [PATCH 02/11] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.jam b/build.jam index 46eff1a9..6e0520d9 100644 --- a/build.jam +++ b/build.jam @@ -7,10 +7,10 @@ import project ; project /boost/core : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception + /boost/assert//boost_assert + /boost/config//boost_config + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception include ; From 98a055cf34e849a8cfa50b9641e86a19652688b6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 25 Apr 2024 22:20:12 -0500 Subject: [PATCH 03/11] Add missing lib reference. --- test/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 7346c8df..1e636a7c 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -382,7 +382,7 @@ run sv_stream_insert_test.cpp : : : $(pedantic-errors) ; run sv_conversion_test.cpp : : : $(pedantic-errors) ; -run sv_conversion_test2.cpp : ; +run sv_conversion_test2.cpp /boost/utility//boost_utility : ; run sv_common_reference_test.cpp : : : $(pedantic-errors) ; compile sv_common_reference_test2.cpp ; From a8c757ddf2a0fbf778d2543a96bf878b10cb844d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 04/11] 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 6e0520d9..d15d19c7 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/core From 8b8944dd6e15dfac0ffccd6e77a20e098b0f655b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 05/11] 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 d15d19c7..44aa4707 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/core : common-requirements From 44c32d769109b2e0811dc815a769f26a05f243ac Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:37:53 -0500 Subject: [PATCH 06/11] Change all references to . --- test/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index f921d708..09fa7b6b 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -13,7 +13,7 @@ import modules ; import testing ; project : requirements - /boost/type_traits//boost_type_traits + /boost/type_traits//boost_type_traits extra msvc:on clang:on From 243eec26fe65cf6bb6c20014f28bf42caba42bd4 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:05 -0500 Subject: [PATCH 07/11] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 44aa4707..4f080edf 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 42d0c5954a50e2f468681942a72f45690d9ef614 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:24 -0500 Subject: [PATCH 08/11] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build.jam b/build.jam index 4f080edf..4b15d34b 100644 --- a/build.jam +++ b/build.jam @@ -5,19 +5,22 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception ; + project /boost/core : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception include ; explicit - [ alias boost_core ] + [ alias boost_core : : : : $(boost_dependencies) ] [ alias all : boost_core test ] ; call-if : boost-library core ; + From 040b018ce0fbe146b5c3909223b416da34846a0b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 24 Jul 2024 23:55:54 -0500 Subject: [PATCH 09/11] Restore warnings-as-errors-off that got accidentally removed in a merge. --- test/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 09fa7b6b..ba1f8f76 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -424,7 +424,7 @@ run size_test.cpp ; local CPP11 = [ requires cxx11_variadic_templates cxx11_template_aliases cxx11_decltype cxx11_constexpr cxx11_noexcept ] ; -local with-serialization = /boost/serialization//boost_serialization/off norecover:static $(CPP11) ; +local with-serialization = /boost/serialization//boost_serialization/off $(warnings-as-errors-off) norecover:static $(CPP11) ; run serialization_nvp_test.cpp : : : $(with-serialization) norecover:no ; run serialization_split_free_test.cpp : : : $(with-serialization) ; From 366802b43c7178b322988e7c47381f11f8752971 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Jul 2024 10:42:22 -0500 Subject: [PATCH 10/11] Adjust doc build to avoid boost-root references. --- doc/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index cce135fd..8cc0b355 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -9,7 +9,7 @@ import project ; import doxygen ; import quickbook ; -path-constant INCLUDES : ../../.. ; +path-constant INCLUDES : ../include ; doxygen ref_reference : From 602961e526221e0f055f1e439a18f8a47ed9b924 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 1 Aug 2024 21:30:37 -0500 Subject: [PATCH 11/11] Update build deps. --- test/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index ba1f8f76..7e80c44d 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -13,6 +13,7 @@ import modules ; import testing ; project : requirements + /boost/core//boost_core /boost/type_traits//boost_type_traits extra msvc:on