From 1bc1a8adb2c2f2fb7e34970b7ca3d8005b9d3760 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:30:48 -0500 Subject: [PATCH 1/8] Make the library modular usable. --- Jamfile | 10 ---------- build.jam | 23 +++++++++++++++++++++++ test/Jamfile.v2 | 4 ++++ 3 files changed, 27 insertions(+), 10 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index 04e53d77..00000000 --- a/Jamfile +++ /dev/null @@ -1,10 +0,0 @@ -# Boost.ConceptCheck 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 test ; diff --git a/build.jam b/build.jam new file mode 100644 index 00000000..5f276a36 --- /dev/null +++ b/build.jam @@ -0,0 +1,23 @@ +# 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/concept_check + : common-requirements + /boost/config//boost_config + /boost/preprocessor//boost_preprocessor + /boost/static_assert//boost_static_assert + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_concept_check ] + [ alias all : boost_concept_check test ] + ; + +call-if : boost-library concept_check + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 4510302b..8b6f3d36 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -4,6 +4,10 @@ # http://www.boost.org/LICENSE_1_0.txt) import testing ; +project : requirements + /boost/core//boost_core + ; + test-suite concept_check : [ link stl_concept_covering.cpp ] [ run stl_concept_check.cpp ] From 48b90a3e480997657e0f5e31c3577b6fb71bfde4 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.jam b/build.jam index 5f276a36..55569f93 100644 --- a/build.jam +++ b/build.jam @@ -7,10 +7,10 @@ import project ; project /boost/concept_check : common-requirements - /boost/config//boost_config - /boost/preprocessor//boost_preprocessor - /boost/static_assert//boost_static_assert - /boost/type_traits//boost_type_traits + /boost/config//boost_config + /boost/preprocessor//boost_preprocessor + /boost/static_assert//boost_static_assert + /boost/type_traits//boost_type_traits include ; From 4e59944e5baa22ba6d7bf31be0f4c67bae6eafe4 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 55569f93..9a10cd3b 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/concept_check From af2654c1c63e0d0e2361dd41482c63ebeb348f2c 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 9a10cd3b..9fb50432 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/concept_check : common-requirements From 790ccd9607b7020e329f442524d61f466f8022c1 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:37:19 -0500 Subject: [PATCH 5/8] Change all references to . --- test/Jamfile.v2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 8b6f3d36..f67b3fa7 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -5,7 +5,7 @@ import testing ; project : requirements - /boost/core//boost_core + /boost/core//boost_core ; test-suite concept_check @@ -15,11 +15,11 @@ test-suite concept_check [ run class_concept_check_test.cpp ] [ compile-fail concept_check_fail_expected.cpp ] [ compile-fail class_concept_fail_expected.cpp ] - + [ run where.cpp ] [ compile-fail where_fail.cpp ] [ compile-fail usage_fail.cpp ] - + # Backward compatibility tests [ run old_concept_pass.cpp ] [ compile-fail function_requires_fail.cpp ] From 239c3198f21602722581a0b38b950a5b280ddeb8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:03 -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 9fb50432..6ec90530 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 d2cbde945a2133ee1c9bca772bd0842b2bbc5a3b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 7/8] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build.jam b/build.jam index 6ec90530..77017c9f 100644 --- a/build.jam +++ b/build.jam @@ -5,19 +5,22 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/config//boost_config + /boost/preprocessor//boost_preprocessor + /boost/static_assert//boost_static_assert + /boost/type_traits//boost_type_traits ; + project /boost/concept_check : common-requirements - /boost/config//boost_config - /boost/preprocessor//boost_preprocessor - /boost/static_assert//boost_static_assert - /boost/type_traits//boost_type_traits include ; explicit - [ alias boost_concept_check ] + [ alias boost_concept_check : : : : $(boost_dependencies) ] [ alias all : boost_concept_check test ] ; call-if : boost-library concept_check ; + From c15021e705585be1dd1f5e10ddea62683f291f8a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 31 Jul 2024 23:17:40 -0500 Subject: [PATCH 8/8] Update build dependencies. --- test/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index f67b3fa7..c1412a64 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -6,6 +6,7 @@ import testing ; project : requirements /boost/core//boost_core + /boost/concept_check//boost_concept_check ; test-suite concept_check