From b32af7b81105553e637fd77863d3d80eac0696e3 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 | 24 ++++++++++++++++++++++++ test/Jamfile.v2 | 2 +- 3 files changed, 25 insertions(+), 12 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index 2a827cf2..00000000 --- a/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -# Boost.Tokenizer 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 00000000..350147a0 --- /dev/null +++ b/build.jam @@ -0,0 +1,24 @@ +# 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/tokenizer + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/iterator//boost_iterator + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_tokenizer ] + [ alias all : boost_tokenizer example test ] + ; + +call-if : boost-library tokenizer + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 8f9dc8c3..253c8d1f 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -4,7 +4,7 @@ import testing ; -run examples.cpp ; +run examples.cpp : : : /boost/array//boost_array ; run simple_example_1.cpp ; run simple_example_2.cpp ; run simple_example_3.cpp ; From f727f675748bc72fe0e482c9037fbbed766d1e10 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:16:00 -0500 Subject: [PATCH 2/8] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.jam b/build.jam index 350147a0..4895e928 100644 --- a/build.jam +++ b/build.jam @@ -7,11 +7,11 @@ import project ; project /boost/tokenizer : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/iterator//boost_iterator - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits + /boost/assert//boost_assert + /boost/config//boost_config + /boost/iterator//boost_iterator + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits include ; From 7bfa1899ed31931857ad7e7ca4c5ad2477c53b1b 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 4895e928..48d5e5e2 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/tokenizer From 04fc8454370075fdee1b9ef6ad14db0188b91822 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 48d5e5e2..948d1bca 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/tokenizer : common-requirements From 499c79218d1a07bfdcc98a509c01a85eea3f95f4 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 21:27:01 -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 253c8d1f..34da05a1 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -4,7 +4,7 @@ import testing ; -run examples.cpp : : : /boost/array//boost_array ; +run examples.cpp : : : /boost/array//boost_array ; run simple_example_1.cpp ; run simple_example_2.cpp ; run simple_example_3.cpp ; From eb07c807ed947eb0a520ffdc55bcc83acfee4672 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 948d1bca..0392013a 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 77b0f759d1223a0bec8900af155809ff6fd2f0ce 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 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build.jam b/build.jam index 0392013a..7f9deaa2 100644 --- a/build.jam +++ b/build.jam @@ -5,20 +5,23 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/iterator//boost_iterator + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits ; + project /boost/tokenizer : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/iterator//boost_iterator - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits include ; explicit - [ alias boost_tokenizer ] + [ alias boost_tokenizer : : : : $(boost_dependencies) ] [ alias all : boost_tokenizer example test ] ; call-if : boost-library tokenizer ; + From ed691183a4e23f7459fbff0a327b97ed96b37cd0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 9 Aug 2024 22:29:38 -0500 Subject: [PATCH 8/8] Update build deps. --- example/Jamfile.v2 | 2 ++ test/Jamfile.v2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 97314128..8a42a3b3 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -7,6 +7,8 @@ import testing ; +project : requirements /boost/tokenizer//boost_tokenizer ; + test-suite "tokenizer-examples" : [ run char_sep_example_1.cpp ] [ run char_sep_example_2.cpp ] diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 34da05a1..8a4de2aa 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -4,6 +4,8 @@ import testing ; +project : requirements /boost/tokenizer//boost_tokenizer ; + run examples.cpp : : : /boost/array//boost_array ; run simple_example_1.cpp ; run simple_example_2.cpp ;