From 7248975133f086802219f0fa1625c527e94d240f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/10] Make the library modular usable. --- build.jam | 27 +++++++++++++++++++++++++++ example/Jamfile | 4 +++- test/Jamfile.v2 | 4 ++-- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..8321dab --- /dev/null +++ b/build.jam @@ -0,0 +1,27 @@ +# 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/function + : common-requirements + /boost/assert//boost_assert + /boost/bind//boost_bind + /boost/config//boost_config + /boost/core//boost_core + /boost/preprocessor//boost_preprocessor + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/typeof//boost_typeof + include + ; + +explicit + [ alias boost_function ] + [ alias all : boost_function example test ] + ; + +call-if : boost-library function + ; diff --git a/example/Jamfile b/example/Jamfile index 671cc1d..f5b77bb 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -6,7 +6,9 @@ # See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt -import ../../config/checks/config : requires ; +require-b2 5.0.1 ; +import-search /boost/config/checks ; +import config : requires ; import testing ; run bind1st.cpp : : : [ requires cxx98_binders ] ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 717a163..20cee05 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -24,7 +24,7 @@ run function_test.cpp : : : off gcc-4.4,0x:no : fu run function_n_test.cpp ; run allocator_test.cpp ; run stateless_test.cpp ; -run lambda_test.cpp ; +run lambda_test.cpp : : : /boost/lambda//boost_lambda ; compile-fail function_test_fail1.cpp ; compile-fail function_test_fail2.cpp ; compile function_30.cpp ; @@ -42,7 +42,7 @@ run function_ref_portable.cpp ; run contains_test.cpp ; run contains2_test.cpp ; run nothrow_swap.cpp ; -run rvalues_test.cpp ; +run rvalues_test.cpp : : : /boost/move//boost_move ; compile function_typeof_test.cpp : 03:no 98:no 0x:no ; run result_arg_types_test.cpp ; From 13407f5e3e6a44a6f3c39ec4588523d7701500d0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:58 -0500 Subject: [PATCH 02/10] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build.jam b/build.jam index 8321dab..70c60f2 100644 --- a/build.jam +++ b/build.jam @@ -7,14 +7,14 @@ import project ; project /boost/function : common-requirements - /boost/assert//boost_assert - /boost/bind//boost_bind - /boost/config//boost_config - /boost/core//boost_core - /boost/preprocessor//boost_preprocessor - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/typeof//boost_typeof + /boost/assert//boost_assert + /boost/bind//boost_bind + /boost/config//boost_config + /boost/core//boost_core + /boost/preprocessor//boost_preprocessor + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/typeof//boost_typeof include ; From b2fdb206908f83121c86a8e659f7c9bf3958ae93 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 03/10] 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 70c60f2..15c6a53 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/function From d9647610ffeaac0d5a8d86485e160e2e79085515 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 13 May 2024 21:45:46 -0500 Subject: [PATCH 04/10] Update dependencies. --- build.jam | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.jam b/build.jam index 15c6a53..c9ef04f 100644 --- a/build.jam +++ b/build.jam @@ -13,10 +13,8 @@ project /boost/function /boost/bind//boost_bind /boost/config//boost_config /boost/core//boost_core - /boost/preprocessor//boost_preprocessor /boost/throw_exception//boost_throw_exception /boost/type_traits//boost_type_traits - /boost/typeof//boost_typeof include ; From c7ca5cc828d1b42cdc9ef8d8138b442c74783cb8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 14 May 2024 07:33:12 -0500 Subject: [PATCH 05/10] Add missing test deps. --- test/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 20cee05..4f54b36 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -16,6 +16,7 @@ project msvc:on gcc:on clang:on + /boost/typeof//boost_typeof ; run function_test.cpp ; From 92b9a12c67b970cf7760d1709d96db8cf3f90617 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 06/10] 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 c9ef04f..1139bfa 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/function : common-requirements From b397ad461efdc1736f5d1ec9d9c56369bb09a21a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:38:32 -0500 Subject: [PATCH 07/10] 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 a31045d..3ac8620 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -25,7 +25,7 @@ run function_test.cpp : : : off gcc-4.4,0x:no : fu run function_n_test.cpp ; run allocator_test.cpp ; run stateless_test.cpp ; -run lambda_test.cpp : : : /boost/lambda//boost_lambda ; +run lambda_test.cpp : : : /boost/lambda//boost_lambda ; compile-fail function_test_fail1.cpp ; compile-fail function_test_fail2.cpp ; compile function_30.cpp ; @@ -43,7 +43,7 @@ run function_ref_portable.cpp ; run contains_test.cpp ; run contains2_test.cpp ; run nothrow_swap.cpp ; -run rvalues_test.cpp : : : /boost/move//boost_move ; +run rvalues_test.cpp : : : /boost/move//boost_move ; compile function_typeof_test.cpp : 03:no 98:no 0x:no ; run result_arg_types_test.cpp ; From edd5bc27ed3d7c0203798ff9c7545b8e0a49ea98 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -0500 Subject: [PATCH 08/10] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 1139bfa..92f989e 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 0daa9f439e3e68e8a52ee7a5be4d3d7a9e43a024 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 09/10] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/build.jam b/build.jam index 92f989e..55fe90a 100644 --- a/build.jam +++ b/build.jam @@ -5,21 +5,24 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/bind//boost_bind + /boost/config//boost_config + /boost/core//boost_core + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits ; + project /boost/function : common-requirements - /boost/assert//boost_assert - /boost/bind//boost_bind - /boost/config//boost_config - /boost/core//boost_core - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits include ; explicit - [ alias boost_function ] + [ alias boost_function : : : : $(boost_dependencies) ] [ alias all : boost_function example test ] ; call-if : boost-library function ; + From e198ea3bc17f93ee4d77f4a80999b2f6be9cf90a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 12:06:25 -0500 Subject: [PATCH 10/10] Update build deps. --- example/Jamfile | 2 ++ test/Jamfile.v2 | 1 + 2 files changed, 3 insertions(+) diff --git a/example/Jamfile b/example/Jamfile index f5b77bb..15d8f3c 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -11,6 +11,8 @@ import-search /boost/config/checks ; import config : requires ; import testing ; +project : requirements /boost/function//boost_function ; + run bind1st.cpp : : : [ requires cxx98_binders ] ; run int_div.cpp ; run sum_avg.cpp ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 3ac8620..d4f6279 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -17,6 +17,7 @@ project gcc:on clang:on /boost/typeof//boost_typeof + /boost/function//boost_function ; run function_test.cpp ;