From 937c7bb75c6df371da755a9e791b4b7ad87cb034 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 1/7] Make the library modular usable. --- build.jam | 26 ++++++++++++++++++++++++++ example/Jamfile | 10 ++++++++-- test/Jamfile | 4 +++- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..3619487 --- /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/function_types + : common-requirements + /boost/config//boost_config + /boost/core//boost_core + /boost/detail//boost_detail + /boost/mpl//boost_mpl + /boost/preprocessor//boost_preprocessor + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_function_types ] + [ alias all : boost_function_types example test ] + ; + +call-if : boost-library function_types + : install boost_function_types + ; diff --git a/example/Jamfile b/example/Jamfile index 08ab43d..7af3c18 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -6,14 +6,20 @@ #------------------------------------------------------------------------------- -exe interpreter_example : interpreter_example.cpp ; +exe interpreter_example : interpreter_example.cpp + : /boost/tokenizer//boost_tokenizer + /boost/lexical_cast//boost_lexical_cast + ; exe result_of_example : result_of_example.cpp ; exe interface_example : interface_example.cpp ; exe fast_mem_fn_example : fast_mem_fn_example.cpp - : . ; # needed for Boost.PP file iteration with some compilers + : . # needed for Boost.PP file iteration with some compilers + /boost/timer//boost_timer + /boost/bind//boost_bind + ; exe macro_type_args_example : macro_type_args_example.cpp ; diff --git a/test/Jamfile b/test/Jamfile index e652c46..084dae7 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -75,12 +75,14 @@ import testing ; # Code from the examples - [ compile ../example/interpreter_example.cpp ] + [ compile ../example/interpreter_example.cpp : /boost/tokenizer//boost_tokenizer /boost/lexical_cast//boost_lexical_cast ] [ compile ../example/result_of_example.cpp ] [ compile ../example/interface_example.cpp ] [ compile ../example/fast_mem_fn_example.cpp # needed for Boost.PP file iteration with some compilers : ../example + /boost/timer//boost_timer + /boost/bind//boost_bind ] [ compile ../example/macro_type_args_example.cpp ] ; From d0d3b742c77e1ce462a5b8ed23e2181cc5256829 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:58 -0500 Subject: [PATCH 2/7] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.jam b/build.jam index 3619487..f67ca8c 100644 --- a/build.jam +++ b/build.jam @@ -7,12 +7,12 @@ import project ; project /boost/function_types : common-requirements - /boost/config//boost_config - /boost/core//boost_core - /boost/detail//boost_detail - /boost/mpl//boost_mpl - /boost/preprocessor//boost_preprocessor - /boost/type_traits//boost_type_traits + /boost/config//boost_config + /boost/core//boost_core + /boost/detail//boost_detail + /boost/mpl//boost_mpl + /boost/preprocessor//boost_preprocessor + /boost/type_traits//boost_type_traits include ; From 51a1f7df12144eba1fd53be29f71c5460aea5080 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 3/7] 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 f67ca8c..d690bcd 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_types From a96648bffd17d17de263e880a9fdac132e47fa5f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 4/7] 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 d690bcd..5549c18 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_types : common-requirements From 2d31274929f71093c6a07032ab2a4432226fe651 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -0500 Subject: [PATCH 5/7] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 5549c18..fedbef1 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 60bfa7261884752b3fcb4d8eea21fe21002938bd Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 6/7] 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 fedbef1..1c97076 100644 --- a/build.jam +++ b/build.jam @@ -5,22 +5,25 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/config//boost_config + /boost/core//boost_core + /boost/detail//boost_detail + /boost/mpl//boost_mpl + /boost/preprocessor//boost_preprocessor + /boost/type_traits//boost_type_traits ; + project /boost/function_types : common-requirements - /boost/config//boost_config - /boost/core//boost_core - /boost/detail//boost_detail - /boost/mpl//boost_mpl - /boost/preprocessor//boost_preprocessor - /boost/type_traits//boost_type_traits include ; explicit - [ alias boost_function_types ] + [ alias boost_function_types : : : : $(boost_dependencies) ] [ alias all : boost_function_types example test ] ; call-if : boost-library function_types : install boost_function_types ; + From 57b36d98106d2ea7a7a9b63211feaa2a8364787e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 12:08:46 -0500 Subject: [PATCH 7/7] Update build deps. --- example/Jamfile | 6 ++++-- test/Jamfile | 14 ++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/example/Jamfile b/example/Jamfile index 7af3c18..99d9cf3 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -1,11 +1,13 @@ -# (C) Copyright Tobias Schwinger +# (C) Copyright Tobias Schwinger # # Use, modification and distribution are subject to the Boost Software License, # Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). #------------------------------------------------------------------------------- +project : requirements /boost/function_types//boost_function_types ; + exe interpreter_example : interpreter_example.cpp : /boost/tokenizer//boost_tokenizer /boost/lexical_cast//boost_lexical_cast @@ -15,7 +17,7 @@ exe result_of_example : result_of_example.cpp ; exe interface_example : interface_example.cpp ; -exe fast_mem_fn_example : fast_mem_fn_example.cpp +exe fast_mem_fn_example : fast_mem_fn_example.cpp : . # needed for Boost.PP file iteration with some compilers /boost/timer//boost_timer /boost/bind//boost_bind diff --git a/test/Jamfile b/test/Jamfile index 084dae7..d1feeae 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -1,5 +1,5 @@ -# (C) Copyright Tobias Schwinger +# (C) Copyright Tobias Schwinger # # Use, modification and distribution are subject to the Boost Software License, # Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). @@ -8,8 +8,10 @@ import testing ; +project : requirements /boost/function_types//boost_function_types ; + { - test-suite function_types : + test-suite function_types : # Classification @@ -28,7 +30,7 @@ import testing ; # [ compile classification/is_cv_function.cpp ] # Decomposition - + [ compile decomposition/components.cpp ] [ compile decomposition/result_type.cpp ] [ compile decomposition/function_arity.cpp ] @@ -70,15 +72,15 @@ import testing ; [ compile custom_ccs/member_ccs_exact.cpp : 64:no ] # Property tag - + [ compile custom_ccs/property_tag.cpp ] - + # Code from the examples [ compile ../example/interpreter_example.cpp : /boost/tokenizer//boost_tokenizer /boost/lexical_cast//boost_lexical_cast ] [ compile ../example/result_of_example.cpp ] [ compile ../example/interface_example.cpp ] - [ compile ../example/fast_mem_fn_example.cpp + [ compile ../example/fast_mem_fn_example.cpp # needed for Boost.PP file iteration with some compilers : ../example /boost/timer//boost_timer