From 2a8ce8e081126550202e0462541282c08f58e313 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/11] Make the library modular usable. --- build.jam | 26 ++++++++++++++++++++++++++ test/Jamfile.v2 | 4 ++-- test/call_traits_test.cpp | 5 +++-- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..9adff3251 --- /dev/null +++ b/build.jam @@ -0,0 +1,26 @@ +# 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/utility + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/io//boost_io + /boost/preprocessor//boost_preprocessor + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_utility ] + [ alias all : boost_utility test ] + ; + +call-if : boost-library utility + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index fdaef7273..9ae09ed41 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -13,7 +13,7 @@ run base_from_member_ref_test.cpp ; run binary_test.cpp ; -run call_traits_test.cpp : -u ; +run call_traits_test.cpp : -u : : /boost/type_traits//testing ; run compressed_pair_test.cpp ; run compressed_pair_final_test.cpp ; @@ -31,7 +31,7 @@ run string_ref_test2.cpp ; run string_ref_test_io.cpp ; # compile-fail string_view_from_rvalue.cpp ; compile string_view_constexpr_test1.cpp ; -run string_view_test1.cpp ; +run string_view_test1.cpp : : : /boost/container_hash//boost_container_hash ; run string_view_test2.cpp ; run string_view_test_io.cpp ; diff --git a/test/call_traits_test.cpp b/test/call_traits_test.cpp index 57ad67ce9..ea9d5335f 100644 --- a/test/call_traits_test.cpp +++ b/test/call_traits_test.cpp @@ -18,8 +18,9 @@ #include #include -#include -#include +// type_traits/test utilities +#include +#include #ifdef BOOST_MSVC #pragma warning(disable:4181) // : warning C4181: qualifier applied to reference type; ignored From bf21064bfddc2313f81e0c69f01dd2762dca162f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:16:00 -0500 Subject: [PATCH 02/11] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.jam b/build.jam index 9adff3251..33cb61d91 100644 --- a/build.jam +++ b/build.jam @@ -7,13 +7,13 @@ import project ; project /boost/utility : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/io//boost_io - /boost/preprocessor//boost_preprocessor - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/io//boost_io + /boost/preprocessor//boost_preprocessor + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits include ; From 336c00b6592ec131fb98ebb797bec7a156d9f1ff Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 13 Apr 2024 16:21:04 -0500 Subject: [PATCH 03/11] Remove relative references to boost-root in Jamfiles. --- identity_type/doc/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/identity_type/doc/Jamfile.v2 b/identity_type/doc/Jamfile.v2 index 07ca29ec9..cb5954768 100644 --- a/identity_type/doc/Jamfile.v2 +++ b/identity_type/doc/Jamfile.v2 @@ -8,7 +8,7 @@ import quickbook ; using boostbook ; -doxygen reference : ../../../../boost/utility/identity_type.hpp +doxygen reference : ../../include/boost/utility/identity_type.hpp : "Reference" PREDEFINED="DOXYGEN" QUIET=YES From 6d870ad5e3949c0af5b501c73a8ccb4f4cb99dd8 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 33cb61d91..c5e520182 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/utility From a48126623875abc8370af5ed360cc65773bfb93d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -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 c5e520182..bc6164647 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/utility : common-requirements From 79c293351f42a98aa73b066999b05d93b14b3619 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 21:27:39 -0500 Subject: [PATCH 06/11] Change all references to . --- test/Jamfile.v2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 9ae09ed41..b9244e7c1 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -13,7 +13,7 @@ run base_from_member_ref_test.cpp ; run binary_test.cpp ; -run call_traits_test.cpp : -u : : /boost/type_traits//testing ; +run call_traits_test.cpp : -u : : /boost/type_traits//testing ; run compressed_pair_test.cpp ; run compressed_pair_final_test.cpp ; @@ -31,7 +31,7 @@ run string_ref_test2.cpp ; run string_ref_test_io.cpp ; # compile-fail string_view_from_rvalue.cpp ; compile string_view_constexpr_test1.cpp ; -run string_view_test1.cpp : : : /boost/container_hash//boost_container_hash ; +run string_view_test1.cpp : : : /boost/container_hash//boost_container_hash ; run string_view_test2.cpp ; run string_view_test_io.cpp ; From 2a37aaaeb4ef3541b5f823921dc8a051dc3b1102 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -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 bc6164647..653829504 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 8f6116ada4090f5f5c9bbbd74e0692de990e1584 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 08/11] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/build.jam b/build.jam index 653829504..04d3a9c4e 100644 --- a/build.jam +++ b/build.jam @@ -5,22 +5,25 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/io//boost_io + /boost/preprocessor//boost_preprocessor + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits ; + project /boost/utility : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/io//boost_io - /boost/preprocessor//boost_preprocessor - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits include ; explicit - [ alias boost_utility ] + [ alias boost_utility : : : : $(boost_dependencies) ] [ alias all : boost_utility test ] ; call-if : boost-library utility ; + From 171647fb3e8801f7ff8caadbb7ada6fbe2c6bdfb Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Jul 2024 11:51:28 -0500 Subject: [PATCH 09/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 6883c2a70..7c80e8b74 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -8,7 +8,7 @@ import quickbook ; project boost/libs/utility/doc ; -path-constant INCLUDES : ../../.. ; +path-constant INCLUDES : ../include ; path-constant boost-images : ../../../doc/src/images ; # Generate XML doxygen reference for base_from_member component in base_from_member_reference.xml From 9939ea24d1fcdbffbdea006a30278ff73064f5e7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 10 Aug 2024 20:47:03 -0500 Subject: [PATCH 10/11] Update build deps. --- test/Jamfile.v2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index b9244e7c1..67438cabb 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -8,6 +8,8 @@ # bring in rules for testing import testing ; +project : requirements /boost/utility//boost_utility ; + run base_from_member_test.cpp ; run base_from_member_ref_test.cpp ; From 3a5e8f4aba91553a68a1bfcb3041ca1d433ba4a4 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 17 Aug 2024 01:26:12 -0500 Subject: [PATCH 11/11] Minimize the possible header ambiguiity of including the type_traits test headers by only including the more specific header and using non-system search paths bracket. --- test/call_traits_test.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/call_traits_test.cpp b/test/call_traits_test.cpp index ea9d5335f..dea997580 100644 --- a/test/call_traits_test.cpp +++ b/test/call_traits_test.cpp @@ -19,8 +19,7 @@ #include // type_traits/test utilities -#include -#include +#include "check_type.hpp" #ifdef BOOST_MSVC #pragma warning(disable:4181) // : warning C4181: qualifier applied to reference type; ignored