From 7fd9dc179d7a4082d829a3f38e0121085448090b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 1/9] Make the library modular usable. --- Jamfile | 27 --------------------------- benchmark/Jamfile | 7 ++++--- build.jam | 35 +++++++++++++++++++++++++++++++++++ example/Jamfile.v2 | 2 +- test/Jamfile.v2 | 4 ++++ tools/Jamfile.v2 | 1 + 6 files changed, 45 insertions(+), 31 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index 5f53e9bf..00000000 --- a/Jamfile +++ /dev/null @@ -1,27 +0,0 @@ -# Boost.Format Library Jamfile -# -# Copyright (c) 2003 Samuel Krempp -# -# 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) - -project - : requirements - - all - - clang:-Wextra - clang:-ansi - clang:-pedantic - - gcc:-Wextra - gcc:-ansi - gcc:-pedantic - ; - -# please order by name to ease maintenance -build-project benchmark ; -build-project example ; -build-project test ; -build-project tools ; diff --git a/benchmark/Jamfile b/benchmark/Jamfile index 0a420ab3..bac30e9c 100644 --- a/benchmark/Jamfile +++ b/benchmark/Jamfile @@ -6,10 +6,11 @@ # See www.boost.org/LICENSE_1_0.txt # -project libs/format/benchmark +project : requirements - msvc:_CRT_SECURE_NO_WARNINGS - ; + /boost/timer//boost_timer + msvc:_CRT_SECURE_NO_WARNINGS + ; exe bench_format_no_locale : bench_format.cpp diff --git a/build.jam b/build.jam new file mode 100644 index 00000000..f84af62f --- /dev/null +++ b/build.jam @@ -0,0 +1,35 @@ +# 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/format + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/optional//boost_optional + /boost/smart_ptr//boost_smart_ptr + /boost/throw_exception//boost_throw_exception + /boost/utility//boost_utility + include + ; + +explicit + [ alias boost_format ] + [ alias all + : boost_format + benchmark + example + test + tools + : pedantic + clang:-ansi + gcc:-ansi + ] + ; + +call-if : boost-library format + ; diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 6029e897..da3e088a 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -11,6 +11,6 @@ test-suite "format-examples" : [ run sample_advanced.cpp ] [ run sample_formats.cpp ] [ run sample_new_features.cpp ] - [ run sample_userType.cpp ] + [ run sample_userType.cpp : : : /boost/numeric_conversion//boost_numeric_conversion ] ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index f77f97c8..e2e4a562 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -7,6 +7,10 @@ import testing ; +project : requirements + /boost/algorithm//boost_algorithm + ; + test-suite "format" : [ run format_test1.cpp ] [ run format_test1.cpp : : : msvc:"/FIWindows.h" : format_test1_windows_h ] diff --git a/tools/Jamfile.v2 b/tools/Jamfile.v2 index fe148231..d6a7488b 100644 --- a/tools/Jamfile.v2 +++ b/tools/Jamfile.v2 @@ -13,6 +13,7 @@ project exe format_matrix : format_matrix.cpp + /boost/filesystem//boost_filesystem /boost/program_options//boost_program_options /boost/system//boost_system ; From 66398b73ec01dda6402a16cf0316f8999dcaecd2 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:58 -0500 Subject: [PATCH 2/9] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.jam b/build.jam index f84af62f..bf4f9fca 100644 --- a/build.jam +++ b/build.jam @@ -7,13 +7,13 @@ import project ; project /boost/format : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/optional//boost_optional - /boost/smart_ptr//boost_smart_ptr - /boost/throw_exception//boost_throw_exception - /boost/utility//boost_utility + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/optional//boost_optional + /boost/smart_ptr//boost_smart_ptr + /boost/throw_exception//boost_throw_exception + /boost/utility//boost_utility include ; From e3ff8c1d3382a0e37bbadcd6cfa704801815c00d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 25 Apr 2024 22:23:38 -0500 Subject: [PATCH 3/9] Add missing lib reference. --- tools/Jamfile.v2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Jamfile.v2 b/tools/Jamfile.v2 index d6a7488b..2ce03105 100644 --- a/tools/Jamfile.v2 +++ b/tools/Jamfile.v2 @@ -11,8 +11,9 @@ project static ; -exe format_matrix +exe format_matrix : format_matrix.cpp + /boost/array//boost_array /boost/filesystem//boost_filesystem /boost/program_options//boost_program_options /boost/system//boost_system From fa65df705896da42c4943c9e9d3316f1f336795f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 4/9] 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 bf4f9fca..acec6135 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/format From 524538620dca6b1e1bda95bf3866834efca9f7e7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 5/9] 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 ea998c18..c213cc88 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/format : common-requirements From 378e28808805714af2ff7fd25be0c53d90e28cd5 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:38:23 -0500 Subject: [PATCH 6/9] Change all references to . --- benchmark/Jamfile | 8 ++++---- test/Jamfile.v2 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/benchmark/Jamfile b/benchmark/Jamfile index 11d2a31f..cd216965 100644 --- a/benchmark/Jamfile +++ b/benchmark/Jamfile @@ -6,20 +6,20 @@ # See www.boost.org/LICENSE_1_0.txt # -project +project : requirements - /boost/timer//boost_timer + /boost/timer//boost_timer msvc:_CRT_SECURE_NO_WARNINGS ; exe bench_format_no_locale : bench_format.cpp /boost/timer//boost_timer - : BOOST_NO_STD_LOCALE no_locale + : BOOST_NO_STD_LOCALE no_locale ; exe bench_format_normal - : bench_format.cpp + : bench_format.cpp /boost/timer//boost_timer : normal ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index e2e4a562..d277db28 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -8,7 +8,7 @@ import testing ; project : requirements - /boost/algorithm//boost_algorithm + /boost/algorithm//boost_algorithm ; test-suite "format" From 9aa443640a7e348eb28e516a013a9273c466bcc7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:03 -0500 Subject: [PATCH 7/9] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index c213cc88..9d16aceb 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 3d12c6da46d679a7487c126859ec80c5528dde56 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 8/9] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/build.jam b/build.jam index 9d16aceb..4207b499 100644 --- a/build.jam +++ b/build.jam @@ -5,20 +5,22 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core + /boost/optional//boost_optional + /boost/smart_ptr//boost_smart_ptr + /boost/throw_exception//boost_throw_exception + /boost/utility//boost_utility ; + project /boost/format : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core - /boost/optional//boost_optional - /boost/smart_ptr//boost_smart_ptr - /boost/throw_exception//boost_throw_exception - /boost/utility//boost_utility include ; explicit - [ alias boost_format ] + [ alias boost_format : : : : $(boost_dependencies) ] [ alias all : boost_format benchmark @@ -32,3 +34,4 @@ explicit call-if : boost-library format ; + From 21f7edf6fbe7b485289e0bdb1127a94c84e11667 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 2 Aug 2024 22:20:19 -0500 Subject: [PATCH 9/9] Update build deps. --- benchmark/Jamfile | 1 + example/Jamfile.v2 | 2 ++ test/Jamfile.v2 | 1 + tools/Jamfile.v2 | 1 + 4 files changed, 5 insertions(+) diff --git a/benchmark/Jamfile b/benchmark/Jamfile index cd216965..f5b1f32e 100644 --- a/benchmark/Jamfile +++ b/benchmark/Jamfile @@ -8,6 +8,7 @@ project : requirements + /boost/format//boost_format /boost/timer//boost_timer msvc:_CRT_SECURE_NO_WARNINGS ; diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index da3e088a..e20be7d2 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -7,6 +7,8 @@ import testing ; +project : requirements /boost/format//boost_format ; + test-suite "format-examples" : [ run sample_advanced.cpp ] [ run sample_formats.cpp ] diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index d277db28..5e5c3bba 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -8,6 +8,7 @@ import testing ; project : requirements + /boost/format//boost_format /boost/algorithm//boost_algorithm ; diff --git a/tools/Jamfile.v2 b/tools/Jamfile.v2 index 2ce03105..b1d6dcc5 100644 --- a/tools/Jamfile.v2 +++ b/tools/Jamfile.v2 @@ -7,6 +7,7 @@ project : requirements + /boost/format//boost_format _CRT_SECURE_NO_WARNINGS static ;