From 836cf5e8a56274b4eb641ca01a705a57c4cefe1a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:32:15 -0500 Subject: [PATCH 1/7] Make the library modular usable. --- build.jam | 30 ++++++++++++++++++++++++++++++ test/jamfile.v2 | 6 +++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000..b980052 --- /dev/null +++ b/build.jam @@ -0,0 +1,30 @@ +# Copyright René Ferdinand Rivera Morell 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) + +import project ; + +project /boost/convert + : common-requirements + /boost/config//boost_config + /boost/core//boost_core + /boost/function_types//boost_function_types + /boost/lexical_cast//boost_lexical_cast + /boost/math//boost_math + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/parameter//boost_parameter + /boost/range//boost_range + /boost/spirit//boost_spirit + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_convert ] + [ alias all : boost_convert example test ] + ; + +call-if : boost-library convert + ; diff --git a/test/jamfile.v2 b/test/jamfile.v2 index 3058a54..ad02a7d 100644 --- a/test/jamfile.v2 +++ b/test/jamfile.v2 @@ -3,9 +3,13 @@ # Distributed under the Boost Software License, Version 1.0. # See copy at http://www.boost.org/LICENSE_1_0.txt. +require-b2 5.0.1 ; + +import-search /boost/config/checks ; + # bring in the rules for testing import testing ; -import ../../config/checks/config : requires ; +import config : requires ; project convert_test : requirements From df1a5ce5a4960238812d8348074edbdebb0c58b5 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 | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build.jam b/build.jam index b980052..8920004 100644 --- a/build.jam +++ b/build.jam @@ -7,17 +7,17 @@ import project ; project /boost/convert : common-requirements - /boost/config//boost_config - /boost/core//boost_core - /boost/function_types//boost_function_types - /boost/lexical_cast//boost_lexical_cast - /boost/math//boost_math - /boost/mpl//boost_mpl - /boost/optional//boost_optional - /boost/parameter//boost_parameter - /boost/range//boost_range - /boost/spirit//boost_spirit - /boost/type_traits//boost_type_traits + /boost/config//boost_config + /boost/core//boost_core + /boost/function_types//boost_function_types + /boost/lexical_cast//boost_lexical_cast + /boost/math//boost_math + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/parameter//boost_parameter + /boost/range//boost_range + /boost/spirit//boost_spirit + /boost/type_traits//boost_type_traits include ; From e0e12cd0e217be254a3d5b6faebc88ca766b0cae 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 8920004..d3b9db0 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/convert From ffcebea3814a9af4cd388150772965d1984105e9 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 d3b9db0..0e4a038 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/convert : common-requirements From 3aede9c63c28db28bbead7d05fd37e67d66926a9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:24 -0500 Subject: [PATCH 5/7] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/build.jam b/build.jam index 0e4a038..9c1aadf 100644 --- a/build.jam +++ b/build.jam @@ -5,26 +5,29 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/config//boost_config + /boost/core//boost_core + /boost/function_types//boost_function_types + /boost/lexical_cast//boost_lexical_cast + /boost/math//boost_math + /boost/mpl//boost_mpl + /boost/optional//boost_optional + /boost/parameter//boost_parameter + /boost/range//boost_range + /boost/spirit//boost_spirit + /boost/type_traits//boost_type_traits ; + project /boost/convert : common-requirements - /boost/config//boost_config - /boost/core//boost_core - /boost/function_types//boost_function_types - /boost/lexical_cast//boost_lexical_cast - /boost/math//boost_math - /boost/mpl//boost_mpl - /boost/optional//boost_optional - /boost/parameter//boost_parameter - /boost/range//boost_range - /boost/spirit//boost_spirit - /boost/type_traits//boost_type_traits include ; explicit - [ alias boost_convert ] + [ alias boost_convert : : : : $(boost_dependencies) ] [ alias all : boost_convert example test ] ; call-if : boost-library convert ; + From 884faca953f8d59eb32cdb01fcc958aa40354cbb Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 1 Aug 2024 21:27:44 -0500 Subject: [PATCH 6/7] Update build deps. --- example/jamfile.v2 | 1 + test/jamfile.v2 | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/example/jamfile.v2 b/example/jamfile.v2 index 485cb49..a42399b 100644 --- a/example/jamfile.v2 +++ b/example/jamfile.v2 @@ -8,6 +8,7 @@ import testing ; project convert_examples : requirements + /boost/convert//boost_convert on gcc:all msvc:all diff --git a/test/jamfile.v2 b/test/jamfile.v2 index ad02a7d..c62f79c 100644 --- a/test/jamfile.v2 +++ b/test/jamfile.v2 @@ -11,8 +11,9 @@ import-search /boost/config/checks ; import testing ; import config : requires ; -project convert_test +project convert_test : requirements + /boost/convert//boost_convert on icpc:"-std=c++11" clang:"-std=c++11" @@ -26,9 +27,9 @@ project convert_test msvc:_SCL_SECURE_NO_WARNINGS msvc:_CRT_SECURE_NO_WARNINGS ../include - ; + ; -exe convert_test_performance : performance.cpp /boost/timer//boost_timer /boost/chrono//boost_chrono +exe convert_test_performance : performance.cpp /boost/timer//boost_timer /boost/chrono//boost_chrono : [ requires cxx17_hdr_charconv cxx17_structured_bindings cxx17_if_constexpr ] ; exe convert_test_performance_spirit : performance_spirit.cpp ; @@ -42,15 +43,15 @@ run user_type.cpp : : : : convert_test_user_type ; run str_to_int.cpp : : : : convert_test_str_to_int ; run sfinae.cpp : : : : convert_test_sfinae ; run has_member.cpp : : : : convert_test_has_member ; -run printf_converter.cpp : +run printf_converter.cpp : /boost/test/included_unit_test_framework : : : convert_test_printf_converter ; run stream_converter.cpp : /boost/test/included_unit_test_framework : : : convert_test_stream_converter ; # these tests require C++17 -run charconv_converter.cpp +run charconv_converter.cpp : /boost/test//included_unit_test_framework - : + : : [ requires cxx17_hdr_charconv cxx17_structured_bindings cxx17_if_constexpr ] gcc:"-O3 -std=c++17 -Wno-unused-variable -Wno-long-long" : convert_test_charconv_converter ; From 696c24367a4a42635d66119cc06424e558b1efe2 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 11 Aug 2024 09:23:25 -0500 Subject: [PATCH 7/7] Change math dep real target math/tr1. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 9c1aadf..d6ead44 100644 --- a/build.jam +++ b/build.jam @@ -10,7 +10,7 @@ constant boost_dependencies : /boost/core//boost_core /boost/function_types//boost_function_types /boost/lexical_cast//boost_lexical_cast - /boost/math//boost_math + /boost/math//boost_math_tr1 /boost/mpl//boost_mpl /boost/optional//boost_optional /boost/parameter//boost_parameter