From 05d00ac9512d2859edb9537be9065b72d8730bcd Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 1/8] Make the library modular usable. --- Jamfile | 11 ----------- build.jam | 20 ++++++++++++++++++++ example/Jamfile.v2 | 5 +++++ test/Jamfile.v2 | 5 +++++ 4 files changed, 30 insertions(+), 11 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index 6d861a9..0000000 --- a/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -# Boost.Move Library Jamfile -# -# Copyright (c) 2018 James E. King III -# -# 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..4fce6ab --- /dev/null +++ b/build.jam @@ -0,0 +1,20 @@ +# 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/move + : common-requirements + /boost/config//boost_config + include + ; + +explicit + [ alias boost_move ] + [ alias all : boost_move example test ] + ; + +call-if : boost-library move + ; diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index bc354e0..55c956c 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -9,6 +9,11 @@ # import testing ; +project : requirements + /boost/container//boost_container + /boost/type_traits//boost_type_traits + ; + rule test_all { local all_rules = ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 2ce67bb..a588f3a 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -9,6 +9,11 @@ import testing ; +project : requirements + /boost/core//boost_core + /boost/container//boost_container + ; + rule test_all { local all_rules = ; From d2e6c80e22fc991e66da55b41715afa0950899a6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 2/8] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 4fce6ab..cb0e815 100644 --- a/build.jam +++ b/build.jam @@ -7,7 +7,7 @@ import project ; project /boost/move : common-requirements - /boost/config//boost_config + /boost/config//boost_config include ; From b4bb259acdd1e7030acdb275abfd4f30b28b09a6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 3/8] 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 cb0e815..b4c9471 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/move From ff0cffb95bb38ac577818ec7d8f6a3901c1b4878 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 4/8] 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 b4c9471..c0340fa 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/move : common-requirements From a208d101f6ee9f6b1b5fcbd56975273c20d36351 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:40:42 -0500 Subject: [PATCH 5/8] Change all references to . --- example/Jamfile.v2 | 8 ++++---- test/Jamfile.v2 | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 55c956c..f2e7fd5 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -10,8 +10,8 @@ import testing ; project : requirements - /boost/container//boost_container - /boost/type_traits//boost_type_traits + /boost/container//boost_container + /boost/type_traits//boost_type_traits ; rule test_all @@ -30,7 +30,7 @@ rule test_all return $(all_rules) ; } -test-suite move_example : [ test_all r ] +test-suite move_example : [ test_all r ] : static ; - + diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index a588f3a..bc043f6 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -10,8 +10,8 @@ import testing ; project : requirements - /boost/core//boost_core - /boost/container//boost_container + /boost/core//boost_core + /boost/container//boost_container ; rule test_all @@ -31,4 +31,4 @@ rule test_all } test-suite move_test : [ test_all r ] ; - + From b36aa58169b0eeb107020f6b64a2bef2c7e5a5e9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -0500 Subject: [PATCH 6/8] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index c0340fa..ccd5c96 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 36c5a8185baaa1c7c635dba39ebe442d69782aea Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 7/8] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.jam b/build.jam index ccd5c96..f785704 100644 --- a/build.jam +++ b/build.jam @@ -5,16 +5,19 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/config//boost_config ; + project /boost/move : common-requirements - /boost/config//boost_config include ; explicit - [ alias boost_move ] + [ alias boost_move : : : : $(boost_dependencies) ] [ alias all : boost_move example test ] ; call-if : boost-library move ; + From 6cd43ef4560e0dde59c590bb8e336f598bef0570 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Jul 2024 11:07:54 -0500 Subject: [PATCH 8/8] Adjust doc build to avoid boost-root references. --- doc/Jamfile.v2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index ba1d013..90df048 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -1,6 +1,6 @@ # Boost.Move library documentation Jamfile # -# Copyright Ion Gaztanaga 2009. +# Copyright Ion Gaztanaga 2009. # 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) @@ -13,8 +13,8 @@ import quickbook ; doxygen autodoc : - [ glob ../../../boost/move/*.hpp ] - [ glob ../../../boost/move/algo/*.hpp ] + [ glob ../include/boost/move/*.hpp ] + [ glob ../include/boost/move/algo/*.hpp ] : HIDE_UNDOC_MEMBERS=YES HIDE_UNDOC_MEMBERS=YES