From d7603079fcf5009517a31521b7daf7369ae53e31 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. --- Jamfile | 11 ----------- build.jam | 24 ++++++++++++++++++++++++ example/Jamfile.v2 | 1 + test/Jamfile.v2 | 2 ++ 4 files changed, 27 insertions(+), 11 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index e43cebe..0000000 --- a/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -# Boost.Intrusive Library Jamfile -# -# Copyright (c) 2018 Ion Gaztanaga -# -# 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) - -# please order by name to ease maintenance -build-project example ; -build-project test ; diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..be594a6 --- /dev/null +++ b/build.jam @@ -0,0 +1,24 @@ +# 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/intrusive + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/move//boost_move + /boost/static_assert//boost_static_assert + include + ; + +explicit + [ alias boost_intrusive ] + [ alias all : boost_intrusive example test ] + ; + +call-if : boost-library intrusive + ; diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 4e8f44e..79c9693 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -30,6 +30,7 @@ rule test_all gcc,windows:"-lole32 -loleaut32" hpux,gcc:"-Wl,+as,mpas" windows,clang:"-lole32 -loleaut32 -lpsapi -ladvapi32" + /boost/interprocess//boost_interprocess ] ; } diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 8193d27..7ab0809 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -25,6 +25,8 @@ rule test_all : # test-files : # requirements windows,clang:"-lole32 -loleaut32 -lpsapi -ladvapi32" + /boost/core//boost_core + /boost/container//boost_container ] ; } From 943114973dc9563243628afe809815fa9321fe11 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 02/11] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.jam b/build.jam index be594a6..fc4f57e 100644 --- a/build.jam +++ b/build.jam @@ -7,11 +7,11 @@ import project ; project /boost/intrusive : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/container_hash//boost_container_hash - /boost/move//boost_move - /boost/static_assert//boost_static_assert + /boost/assert//boost_assert + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/move//boost_move + /boost/static_assert//boost_static_assert include ; From 21ec0ae3bd68c1a1f420c5b6816bb909ef8610f8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 8 Apr 2024 08:32:49 -0500 Subject: [PATCH 03/11] Update dependencies. --- build.jam | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.jam b/build.jam index fc4f57e..a7671b6 100644 --- a/build.jam +++ b/build.jam @@ -9,9 +9,7 @@ project /boost/intrusive : common-requirements /boost/assert//boost_assert /boost/config//boost_config - /boost/container_hash//boost_container_hash /boost/move//boost_move - /boost/static_assert//boost_static_assert include ; From 58c118b2d1ec865e94461792b958280ccb938c80 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 25 Apr 2024 08:49:08 -0500 Subject: [PATCH 04/11] Add missing b2 testing module import. --- example/Jamfile.v2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 79c9693..6f349b7 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -11,6 +11,8 @@ # 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 testing ; + # this rule enumerates through all the sources and invokes # the run rule for each source, the result is a list of all # the run rules, which we can pass on to the test_suite rule: From 3e8cebd84f045c6c08edaf112e8232411e4b6c4a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 25 Apr 2024 22:38:47 -0500 Subject: [PATCH 05/11] Add missing lib reference. --- test/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 7ab0809..03b64de 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -27,6 +27,7 @@ rule test_all windows,clang:"-lole32 -loleaut32 -lpsapi -ladvapi32" /boost/core//boost_core /boost/container//boost_container + /boost/type_traits//boost_type_traits ] ; } From 924eccdf39e605ca9769a1549b490d96a55181cd Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 29 Apr 2024 12:48:37 -0500 Subject: [PATCH 06/11] Add new ref to container_hash lib. --- test/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 03b64de..a83c23a 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -27,6 +27,7 @@ rule test_all windows,clang:"-lole32 -loleaut32 -lpsapi -ladvapi32" /boost/core//boost_core /boost/container//boost_container + /boost/container_hash//boost_container_hash /boost/type_traits//boost_type_traits ] ; } From 193f60339b456c58f9a5aa36a324ab5d36a3a5c0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 07/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 a7671b6..1499adb 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/intrusive From 5e12277b6610b21180c5a47c735d41d5595188b8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 08/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 1499adb..26ad3ff 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/intrusive : common-requirements From ba545172e2433aafa029b862a14c69682815fc85 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -0500 Subject: [PATCH 09/11] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 26ad3ff..4d2a410 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 fbdf4f129dae6dee8f1d5f8a176802108cecc040 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 10/11] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build.jam b/build.jam index 4d2a410..89d99e1 100644 --- a/build.jam +++ b/build.jam @@ -5,18 +5,21 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/move//boost_move ; + project /boost/intrusive : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/move//boost_move include ; explicit - [ alias boost_intrusive ] + [ alias boost_intrusive : : : : $(boost_dependencies) ] [ alias all : boost_intrusive example test ] ; call-if : boost-library intrusive ; + From 3b3ba3d41e61d70b5f6c0736fc398256eb1b2b87 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Jul 2024 11:07:54 -0500 Subject: [PATCH 11/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 73a729e..cca793f 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -18,7 +18,7 @@ path-constant here : . ; doxygen autodoc : - [ glob ../../../boost/intrusive/*.hpp ] + [ glob ../include/boost/intrusive/*.hpp ] : EXTRACT_ALL=NO HIDE_UNDOC_MEMBERS=YES