From 1c17646cd0f6b4ba70534b6d95803faa14d8edb1 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:31:01 -0500 Subject: [PATCH 01/13] Make the library modular usable. --- Jamfile | 11 ----------- build.jam | 25 +++++++++++++++++++++++++ build/Jamfile.v2 | 4 +--- test/Jamfile.v2 | 5 +++++ 4 files changed, 31 insertions(+), 14 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index c55393e3..00000000 --- a/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -# Boost.Container 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 00000000..888f78a2 --- /dev/null +++ b/build.jam @@ -0,0 +1,25 @@ +# 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/container + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/intrusive//boost_intrusive + /boost/move//boost_move + /boost/static_assert//boost_static_assert + include + ; + +explicit + [ alias boost_container : build//boost_container ] + [ alias all : boost_container example test ] + ; + +call-if : boost-library container + : install boost_container + ; diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 3adb451c..bdfbeb5e 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -6,7 +6,7 @@ import sequence ; -project boost/container +project : source-location ../src : usage-requirements # pass these requirement to dependents (i.e. users) shared:BOOST_CONTAINER_DYN_LINK=1 @@ -18,5 +18,3 @@ lib boost_container : shared:BOOST_CONTAINER_DYN_LINK=1 static:BOOST_CONTAINER_STATIC_LINK=1 ; - -boost-install boost_container ; \ No newline at end of file diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 2b4995be..5acb3c78 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -13,6 +13,11 @@ project : requirements + /boost/algorithm//boost_algorithm + /boost/iterator//boost_iterator + /boost/utility//boost_utility + /boost/tuple//boost_tuple + shared:BOOST_CONTAINER_DYN_LINK=1 gcc-cygwin:static ; From 25d0349ad931278418b2d021b9c90adf7153da1e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:58 -0500 Subject: [PATCH 02/13] 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 888f78a2..ee2c13e5 100644 --- a/build.jam +++ b/build.jam @@ -7,11 +7,11 @@ import project ; project /boost/container : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/intrusive//boost_intrusive - /boost/move//boost_move - /boost/static_assert//boost_static_assert + /boost/assert//boost_assert + /boost/config//boost_config + /boost/intrusive//boost_intrusive + /boost/move//boost_move + /boost/static_assert//boost_static_assert include ; From efdf26e325d17e41adc5b9d66d69fa8cd6388915 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 8 Apr 2024 20:12:13 -0500 Subject: [PATCH 03/13] Update dependencies. --- build.jam | 1 - 1 file changed, 1 deletion(-) diff --git a/build.jam b/build.jam index ee2c13e5..5903cefd 100644 --- a/build.jam +++ b/build.jam @@ -11,7 +11,6 @@ project /boost/container /boost/config//boost_config /boost/intrusive//boost_intrusive /boost/move//boost_move - /boost/static_assert//boost_static_assert include ; From 31752171c64a05aaa479bbb467c8ffd6502630a7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 25 Apr 2024 08:27:47 -0500 Subject: [PATCH 04/13] 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 0ba75ac4..a3766b9e 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 894c5c14cbbd8867dea8c9747408c085ef984f12 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Apr 2024 20:14:34 -0500 Subject: [PATCH 05/13] Add missing NO_LIB usage requirements. --- build/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index bdfbeb5e..85ba10a6 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -11,6 +11,7 @@ project : usage-requirements # pass these requirement to dependents (i.e. users) shared:BOOST_CONTAINER_DYN_LINK=1 static:BOOST_CONTAINER_STATIC_LINK=1 + BOOST_CONTAINER_NO_LIB=1 ; lib boost_container From 1d65663bcb51023e9a6060095962e4dfaf992852 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 06/13] 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 5903cefd..fc8efa62 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/container From 2a2c8bd47492f49c17d65778e86f85570d848d3b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 07/13] 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 fc8efa62..aad92fa0 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/container : common-requirements From fbf07feea8a8d6e4c0687d5e4808e428a31508b0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:37:36 -0500 Subject: [PATCH 08/13] Change all references to . --- test/Jamfile.v2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 5acb3c78..d34011da 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -12,13 +12,13 @@ # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) project - : requirements - /boost/algorithm//boost_algorithm - /boost/iterator//boost_iterator - /boost/utility//boost_utility - /boost/tuple//boost_tuple + : requirements + /boost/algorithm//boost_algorithm + /boost/iterator//boost_iterator + /boost/utility//boost_utility + /boost/tuple//boost_tuple - shared:BOOST_CONTAINER_DYN_LINK=1 + shared:BOOST_CONTAINER_DYN_LINK=1 gcc-cygwin:static ; From 44e5d5740c8b86ac102c97a7b76b676cea03edf0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -0500 Subject: [PATCH 09/13] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index aad92fa0..4c3fe318 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 2ded200bd3fefdb2d0398418ffa5c3bf8c8bf24d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 10/13] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 11 +++++++---- build/Jamfile.v2 | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.jam b/build.jam index 4c3fe318..ebaf273a 100644 --- a/build.jam +++ b/build.jam @@ -5,12 +5,14 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/intrusive//boost_intrusive + /boost/move//boost_move ; + project /boost/container : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/intrusive//boost_intrusive - /boost/move//boost_move include ; @@ -22,3 +24,4 @@ explicit call-if : boost-library container : install boost_container ; + diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 85ba10a6..f8c672b1 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -8,6 +8,7 @@ import sequence ; project : source-location ../src + : common-requirements $(boost_dependencies) : usage-requirements # pass these requirement to dependents (i.e. users) shared:BOOST_CONTAINER_DYN_LINK=1 static:BOOST_CONTAINER_STATIC_LINK=1 From 96ae757e65d11d9345530ba9b5bc317f2fa5e4c8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Jul 2024 10:35:21 -0500 Subject: [PATCH 11/13] Adjust doc build to avoid boost-root references. --- doc/Jamfile.v2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index e4ff8c82..146502e3 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -17,8 +17,8 @@ path-constant here : . ; doxygen autodoc : - [ glob ../../../boost/container/*.hpp ] - [ glob ../../../boost/container/pmr/*.hpp ] + [ glob ../include/container/*.hpp ] + [ glob ../include/container/pmr/*.hpp ] : EXTRACT_ALL=NO HIDE_UNDOC_MEMBERS=YES From 25437bea432536eee791504c294afe82da143b43 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Jul 2024 10:41:16 -0500 Subject: [PATCH 12/13] Fix doc include path refs. --- doc/Jamfile.v2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 146502e3..5aabf3a6 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -17,8 +17,8 @@ path-constant here : . ; doxygen autodoc : - [ glob ../include/container/*.hpp ] - [ glob ../include/container/pmr/*.hpp ] + [ glob ../include/boost/container/*.hpp ] + [ glob ../include/boost/container/pmr/*.hpp ] : EXTRACT_ALL=NO HIDE_UNDOC_MEMBERS=YES From df9132c80f5aa26d668a99f3236d3528a540ca3b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 29 Jul 2024 21:56:22 -0500 Subject: [PATCH 13/13] Update build dependencies. --- test/Jamfile.v2 | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index d34011da..42e07b84 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -13,7 +13,6 @@ project : requirements - /boost/algorithm//boost_algorithm /boost/iterator//boost_iterator /boost/utility//boost_utility /boost/tuple//boost_tuple