From 8bda41d126581000ee790d2fece0c39145523539 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:30:25 -0500 Subject: [PATCH 1/8] Make the library modular usable. --- build.jam | 47 +++++++++++++++++++++++++++++++++++++++++++++++ test/Jamfile.v2 | 1 + 2 files changed, 48 insertions(+) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..96dcd8b24 --- /dev/null +++ b/build.jam @@ -0,0 +1,47 @@ +# 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/compute + : common-requirements + /boost/algorithm//boost_algorithm + /boost/array//boost_array + /boost/assert//boost_assert + /boost/atomic//boost_atomic + /boost/chrono//boost_chrono + /boost/config//boost_config + /boost/core//boost_core + /boost/filesystem//boost_filesystem + /boost/function//boost_function + /boost/function_types//boost_function_types + /boost/fusion//boost_fusion + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/preprocessor//boost_preprocessor + /boost/property_tree//boost_property_tree + /boost/proto//boost_proto + /boost/range//boost_range + /boost/smart_ptr//boost_smart_ptr + /boost/static_assert//boost_static_assert + /boost/thread//boost_thread + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/typeof//boost_typeof + /boost/utility//boost_utility + /boost/uuid//boost_uuid + include + ; + +explicit + [ alias boost_compute ] + [ alias all : boost_compute test ] + ; + +call-if : boost-library compute + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index f1a6bfe5d..1295cd88d 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -22,6 +22,7 @@ project msvc:/wd4800 # Warning C4800: 'uint32_t' : forcing value to bool 'true' or 'false' (performance warning) msvc:/wd4838 # Warning C4838: conversion from 'double' to 'float' requires a narrowing conversion /boost/test//boost_unit_test_framework + /boost/accumulators//boost_accumulators [ check-target-builds has_opencl "OpenCL" : : no ] ; From 1d67abb87f4d3a1b7049bf54aa82f31adf46e5b7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:58 -0500 Subject: [PATCH 2/8] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 56 +++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/build.jam b/build.jam index 96dcd8b24..b08a79e78 100644 --- a/build.jam +++ b/build.jam @@ -7,34 +7,34 @@ import project ; project /boost/compute : common-requirements - /boost/algorithm//boost_algorithm - /boost/array//boost_array - /boost/assert//boost_assert - /boost/atomic//boost_atomic - /boost/chrono//boost_chrono - /boost/config//boost_config - /boost/core//boost_core - /boost/filesystem//boost_filesystem - /boost/function//boost_function - /boost/function_types//boost_function_types - /boost/fusion//boost_fusion - /boost/iterator//boost_iterator - /boost/lexical_cast//boost_lexical_cast - /boost/mpl//boost_mpl - /boost/optional//boost_optional - /boost/preprocessor//boost_preprocessor - /boost/property_tree//boost_property_tree - /boost/proto//boost_proto - /boost/range//boost_range - /boost/smart_ptr//boost_smart_ptr - /boost/static_assert//boost_static_assert - /boost/thread//boost_thread - /boost/throw_exception//boost_throw_exception - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits - /boost/typeof//boost_typeof - /boost/utility//boost_utility - /boost/uuid//boost_uuid + /boost/algorithm//boost_algorithm + /boost/array//boost_array + /boost/assert//boost_assert + /boost/atomic//boost_atomic + /boost/chrono//boost_chrono + /boost/config//boost_config + /boost/core//boost_core + /boost/filesystem//boost_filesystem + /boost/function//boost_function + /boost/function_types//boost_function_types + /boost/fusion//boost_fusion + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/preprocessor//boost_preprocessor + /boost/property_tree//boost_property_tree + /boost/proto//boost_proto + /boost/range//boost_range + /boost/smart_ptr//boost_smart_ptr + /boost/static_assert//boost_static_assert + /boost/thread//boost_thread + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/typeof//boost_typeof + /boost/utility//boost_utility + /boost/uuid//boost_uuid include ; From 1e951928675f4b3fc03bb0ae978d3582b46dcd52 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:00 -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 b08a79e78..fe1ab1653 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/compute From cc6b16255d46b3aebfdb8db1306c6597174118e5 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -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 fe1ab1653..3a4b2379f 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/compute : common-requirements From 370f890280d50d11dec59bf9122405a920d8f976 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:37:05 -0500 Subject: [PATCH 5/8] Change all references to . --- test/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 1295cd88d..48609978e 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -22,7 +22,7 @@ project msvc:/wd4800 # Warning C4800: 'uint32_t' : forcing value to bool 'true' or 'false' (performance warning) msvc:/wd4838 # Warning C4838: conversion from 'double' to 'float' requires a narrowing conversion /boost/test//boost_unit_test_framework - /boost/accumulators//boost_accumulators + /boost/accumulators//boost_accumulators [ check-target-builds has_opencl "OpenCL" : : no ] ; From f061aee945086df40e1c17aa4685e24a64f872b8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:05 -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 3a4b2379f..9ce6c3915 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 a4e185ea72f9221d82900b16bca62f6167d62af6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:24 -0500 Subject: [PATCH 7/8] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 61 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/build.jam b/build.jam index 9ce6c3915..49950e81b 100644 --- a/build.jam +++ b/build.jam @@ -5,43 +5,46 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/algorithm//boost_algorithm + /boost/array//boost_array + /boost/assert//boost_assert + /boost/atomic//boost_atomic + /boost/chrono//boost_chrono + /boost/config//boost_config + /boost/core//boost_core + /boost/filesystem//boost_filesystem + /boost/function//boost_function + /boost/function_types//boost_function_types + /boost/fusion//boost_fusion + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/preprocessor//boost_preprocessor + /boost/property_tree//boost_property_tree + /boost/proto//boost_proto + /boost/range//boost_range + /boost/smart_ptr//boost_smart_ptr + /boost/static_assert//boost_static_assert + /boost/thread//boost_thread + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/typeof//boost_typeof + /boost/utility//boost_utility + /boost/uuid//boost_uuid ; + project /boost/compute : common-requirements - /boost/algorithm//boost_algorithm - /boost/array//boost_array - /boost/assert//boost_assert - /boost/atomic//boost_atomic - /boost/chrono//boost_chrono - /boost/config//boost_config - /boost/core//boost_core - /boost/filesystem//boost_filesystem - /boost/function//boost_function - /boost/function_types//boost_function_types - /boost/fusion//boost_fusion - /boost/iterator//boost_iterator - /boost/lexical_cast//boost_lexical_cast - /boost/mpl//boost_mpl - /boost/optional//boost_optional - /boost/preprocessor//boost_preprocessor - /boost/property_tree//boost_property_tree - /boost/proto//boost_proto - /boost/range//boost_range - /boost/smart_ptr//boost_smart_ptr - /boost/static_assert//boost_static_assert - /boost/thread//boost_thread - /boost/throw_exception//boost_throw_exception - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits - /boost/typeof//boost_typeof - /boost/utility//boost_utility - /boost/uuid//boost_uuid include ; explicit - [ alias boost_compute ] + [ alias boost_compute : : : : $(boost_dependencies) ] [ alias all : boost_compute test ] ; call-if : boost-library compute ; + From 7e1ef8d042fe8fe4a6ade59ccbd5f69c2eb9caf3 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 17 Apr 2025 08:40:02 -0500 Subject: [PATCH 8/8] Move include to target. --- build.jam | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.jam b/build.jam index 49950e81b..59e056f65 100644 --- a/build.jam +++ b/build.jam @@ -36,12 +36,11 @@ constant boost_dependencies : /boost/uuid//boost_uuid ; project /boost/compute - : common-requirements - include ; explicit - [ alias boost_compute : : : : $(boost_dependencies) ] + [ alias boost_compute : : : + : include $(boost_dependencies) ] [ alias all : boost_compute test ] ;