From 9f8fb818ba1681b49c8758f878c8b117156425f4 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:27:02 -0500 Subject: [PATCH 01/11] Make the library modular usable. --- build.jam | 26 ++++++++++++++++++++++++++ test/Jamfile.v2 | 14 ++++++++------ test/unique_any/Jamfile.v2 | 4 +++- 3 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..5eddc93 --- /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/any + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_index//boost_type_index + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_any ] + [ alias all : boost_any test ] + ; + +call-if : boost-library any + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 527b75d..9fccfe6 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -6,9 +6,11 @@ # For more information, see http://www.boost.org/libs/any # -build-project unique_any ; +require-b2 5.0.1 ; +import-search /boost/config/checks ; +import config : requires ; -import ../../config/checks/config : requires ; +build-project unique_any ; import testing ; @@ -21,16 +23,16 @@ project test-suite any : [ run any_test.cpp ] [ run any_test.cpp : : : off BOOST_NO_RTTI BOOST_NO_TYPEID : any_test_no_rtti ] - [ run any_test_rv.cpp ] - [ run any_test_rv.cpp : : : off BOOST_NO_RTTI BOOST_NO_TYPEID : any_test_rv_no_rtti ] + [ run any_test_rv.cpp : : : /boost/move//boost_move ] + [ run any_test_rv.cpp : : : /boost/move//boost_move off BOOST_NO_RTTI BOOST_NO_TYPEID : any_test_rv_no_rtti ] [ run any_test_mplif.cpp ] [ compile-fail any_cast_cv_failed.cpp ] [ compile-fail any_test_temporary_to_ref_failed.cpp ] [ compile-fail any_test_cv_to_rv_failed.cpp ] [ run basic_any_test.cpp ] [ run basic_any_test.cpp : : : off BOOST_NO_RTTI BOOST_NO_TYPEID : basic_any_test_no_rtti ] - [ run basic_any_test_rv.cpp ] - [ run basic_any_test_rv.cpp : : : off BOOST_NO_RTTI BOOST_NO_TYPEID : basic_any_test_rv_no_rtti ] + [ run basic_any_test_rv.cpp : : : /boost/move//boost_move ] + [ run basic_any_test_rv.cpp : : : /boost/move//boost_move off BOOST_NO_RTTI BOOST_NO_TYPEID : basic_any_test_rv_no_rtti ] [ run basic_any_test_mplif.cpp ] [ run basic_any_test_large_object.cpp ] [ run basic_any_test_small_object.cpp ] diff --git a/test/unique_any/Jamfile.v2 b/test/unique_any/Jamfile.v2 index a10c161..0d88275 100644 --- a/test/unique_any/Jamfile.v2 +++ b/test/unique_any/Jamfile.v2 @@ -8,7 +8,9 @@ # # For more information, see http://www.boost.org/libs/any -import ../../config/checks/config : requires ; +require-b2 5.0.1 ; +import-search /boost/config/checks ; +import config : requires ; import testing ; From 9209d2254cc49c86d149c4a316081ebd823ae997 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:12:36 -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 5eddc93..33454fe 100644 --- a/build.jam +++ b/build.jam @@ -7,13 +7,13 @@ import project ; project /boost/any : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /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/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_index//boost_type_index + /boost/type_traits//boost_type_traits include ; From e0bdbe63a63722c6c7a76bcfd1ed2674b54f204c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:00 -0500 Subject: [PATCH 03/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 33454fe..b3f774a 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/any From 106daf38c6f5b934ab91ab196174e97f7382ea24 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 13 May 2024 21:44:09 -0500 Subject: [PATCH 04/11] Update dependencies. --- build.jam | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.jam b/build.jam index b3f774a..9201b62 100644 --- a/build.jam +++ b/build.jam @@ -11,11 +11,8 @@ project /boost/any : common-requirements /boost/assert//boost_assert /boost/config//boost_config - /boost/core//boost_core - /boost/static_assert//boost_static_assert /boost/throw_exception//boost_throw_exception /boost/type_index//boost_type_index - /boost/type_traits//boost_type_traits include ; From c4dcd8f1d3e916e18c9d03e81c394649615883cd 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 9201b62..d694016 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/any : common-requirements From 3f452ffec467a1c187cfe0dcafc6c9abde1a5579 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:36:45 -0500 Subject: [PATCH 06/11] Change all references to . --- test/Jamfile.v2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 9fccfe6..db2acf7 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -23,16 +23,16 @@ project test-suite any : [ run any_test.cpp ] [ run any_test.cpp : : : off BOOST_NO_RTTI BOOST_NO_TYPEID : any_test_no_rtti ] - [ run any_test_rv.cpp : : : /boost/move//boost_move ] - [ run any_test_rv.cpp : : : /boost/move//boost_move off BOOST_NO_RTTI BOOST_NO_TYPEID : any_test_rv_no_rtti ] + [ run any_test_rv.cpp : : : /boost/move//boost_move ] + [ run any_test_rv.cpp : : : /boost/move//boost_move off BOOST_NO_RTTI BOOST_NO_TYPEID : any_test_rv_no_rtti ] [ run any_test_mplif.cpp ] [ compile-fail any_cast_cv_failed.cpp ] [ compile-fail any_test_temporary_to_ref_failed.cpp ] [ compile-fail any_test_cv_to_rv_failed.cpp ] [ run basic_any_test.cpp ] [ run basic_any_test.cpp : : : off BOOST_NO_RTTI BOOST_NO_TYPEID : basic_any_test_no_rtti ] - [ run basic_any_test_rv.cpp : : : /boost/move//boost_move ] - [ run basic_any_test_rv.cpp : : : /boost/move//boost_move off BOOST_NO_RTTI BOOST_NO_TYPEID : basic_any_test_rv_no_rtti ] + [ run basic_any_test_rv.cpp : : : /boost/move//boost_move ] + [ run basic_any_test_rv.cpp : : : /boost/move//boost_move off BOOST_NO_RTTI BOOST_NO_TYPEID : basic_any_test_rv_no_rtti ] [ run basic_any_test_mplif.cpp ] [ run basic_any_test_large_object.cpp ] [ run basic_any_test_small_object.cpp ] From 3e3c45c2fff92c69f3d81c3f92bd6b6e5574ec40 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:03 -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 d694016..964b846 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 f52054feb1e8d9de45ae516f3c2582867ec4b237 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 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build.jam b/build.jam index 964b846..9cc71d1 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/throw_exception//boost_throw_exception + /boost/type_index//boost_type_index ; + project /boost/any : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/throw_exception//boost_throw_exception - /boost/type_index//boost_type_index include ; explicit - [ alias boost_any ] + [ alias boost_any : : : : $(boost_dependencies) ] [ alias all : boost_any test ] ; call-if : boost-library any ; + From 9fca91085f2314dafc0852b72c95bd81c90441c1 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 27 Jul 2024 10:34:24 -0500 Subject: [PATCH 09/11] Adjust self dependencies as inter-lib deps no longer apply globally. --- test/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index db2acf7..fad5cb7 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -17,6 +17,7 @@ import testing ; project : source-location . : requirements + /boost/any//boost_any [ requires cxx11_rvalue_references cxx11_static_assert ] ; From 8558436f3db6227cd0c81c915d839835c8f7cd7e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 27 Jul 2024 11:57:51 -0500 Subject: [PATCH 10/11] Adjust documentation refs to lib local. --- doc/Jamfile.v2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 9c86a63..21dfee2 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -35,8 +35,8 @@ local doxygen_params = doxygen autodoc_any : - [ glob ../../../boost/any.hpp ] - [ glob ../../../boost/any/*.hpp ] + [ glob ../include/boost/any.hpp ] + [ glob ../include/boost/any/*.hpp ] : $(doxygen_params) "boost.doxygen.reftitle=Reference Section of Boost.Any" From e217dc2d53cc8a07f5f7eed51bc1022130421bcc Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 14 Aug 2024 22:23:19 -0500 Subject: [PATCH 11/11] Update build deps. --- test/Jamfile.v2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index fad5cb7..26f495d 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -24,16 +24,16 @@ project test-suite any : [ run any_test.cpp ] [ run any_test.cpp : : : off BOOST_NO_RTTI BOOST_NO_TYPEID : any_test_no_rtti ] - [ run any_test_rv.cpp : : : /boost/move//boost_move ] - [ run any_test_rv.cpp : : : /boost/move//boost_move off BOOST_NO_RTTI BOOST_NO_TYPEID : any_test_rv_no_rtti ] + [ run any_test_rv.cpp : : : ] + [ run any_test_rv.cpp : : : off BOOST_NO_RTTI BOOST_NO_TYPEID : any_test_rv_no_rtti ] [ run any_test_mplif.cpp ] [ compile-fail any_cast_cv_failed.cpp ] [ compile-fail any_test_temporary_to_ref_failed.cpp ] [ compile-fail any_test_cv_to_rv_failed.cpp ] [ run basic_any_test.cpp ] [ run basic_any_test.cpp : : : off BOOST_NO_RTTI BOOST_NO_TYPEID : basic_any_test_no_rtti ] - [ run basic_any_test_rv.cpp : : : /boost/move//boost_move ] - [ run basic_any_test_rv.cpp : : : /boost/move//boost_move off BOOST_NO_RTTI BOOST_NO_TYPEID : basic_any_test_rv_no_rtti ] + [ run basic_any_test_rv.cpp : : : ] + [ run basic_any_test_rv.cpp : : : off BOOST_NO_RTTI BOOST_NO_TYPEID : basic_any_test_rv_no_rtti ] [ run basic_any_test_mplif.cpp ] [ run basic_any_test_large_object.cpp ] [ run basic_any_test_small_object.cpp ]