From e97cf36871ad8c33f2124eea02d5693360c48a77 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:27:02 -0500 Subject: [PATCH 1/7] Make the library modular usable. --- build.jam | 22 ++++++++++++++++++++++ build/Jamfile | 9 +++++---- test/Jamfile | 7 +++++-- 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..a70587b15 --- /dev/null +++ b/build.jam @@ -0,0 +1,22 @@ +# 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/charconv + : common-requirements + /boost/config//boost_config + /boost/core//boost_core + include + ; + +explicit + [ alias boost_charconv : build//boost_charconv ] + [ alias all : boost_charconv test ] + ; + +call-if : boost-library charconv + : install boost_charconv + ; diff --git a/build/Jamfile b/build/Jamfile index 09802d57e..e77bb1911 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -3,9 +3,12 @@ # Distributed under the Boost Software License, Version 1.0. # https://www.boost.org/LICENSE_1_0.txt -import ../../config/checks/config : requires ; +require-b2 5.0.1 ; +import-search /boost/config/checks ; -project boost/charconv ; +import config : requires ; + +project ; local SOURCES = from_chars.cpp to_chars.cpp ; @@ -29,5 +32,3 @@ lib boost_charconv # usage-requirements : shared:BOOST_CHARCONV_DYN_LINK=1 ; - -boost-install boost_charconv ; diff --git a/test/Jamfile b/test/Jamfile index c262e7a90..f4382741f 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -3,8 +3,11 @@ # Distributed under the Boost Software License, Version 1.0. # https://www.boost.org/LICENSE_1_0.txt +require-b2 5.0.1 ; +import-search /boost/config/checks ; + import testing ; -import ../../config/checks/config : requires ; +import config : requires ; project : requirements @@ -57,7 +60,7 @@ run P2497.cpp ; run github_issue_110.cpp ; run github_issue_122.cpp ; run from_chars_string_view.cpp ; -run github_issue_152.cpp ; +run github_issue_152.cpp /boost/random//boost_random ; run github_issue_152_float128.cpp : : : [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : "quadmath" ] ; run github_issue_154.cpp ; #run github_issue_156.cpp ; From 92c17245175b56255e81411542d82f552365aea5 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.jam b/build.jam index a70587b15..2ab00fb66 100644 --- a/build.jam +++ b/build.jam @@ -7,8 +7,8 @@ import project ; project /boost/charconv : common-requirements - /boost/config//boost_config - /boost/core//boost_core + /boost/config//boost_config + /boost/core//boost_core include ; From 9c55b41c385250fdd637bf26050d4c472a14167e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Apr 2024 20:14:19 -0500 Subject: [PATCH 3/7] Add missing NO_LIB usage requirements. --- build/Jamfile | 1 + 1 file changed, 1 insertion(+) diff --git a/build/Jamfile b/build/Jamfile index 5dcda6816..8dbbdf5ca 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -31,4 +31,5 @@ lib boost_charconv # usage-requirements : shared:BOOST_CHARCONV_DYN_LINK=1 + BOOST_CHARCONV_NO_LIB=1 ; From 3926be4c7f857b5c636415e7f544df94ae2cdeb4 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:00 -0500 Subject: [PATCH 4/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 2ab00fb66..35a265c0e 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/charconv From 4de1011f6cd58c5945f13b759cf4a8802821cc27 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 13 May 2024 21:44:30 -0500 Subject: [PATCH 5/7] Update dependencies. --- build.jam | 1 + 1 file changed, 1 insertion(+) diff --git a/build.jam b/build.jam index 35a265c0e..ae1ca4a06 100644 --- a/build.jam +++ b/build.jam @@ -9,6 +9,7 @@ import project ; project /boost/charconv : common-requirements + /boost/assert//boost_assert /boost/config//boost_config /boost/core//boost_core include From 08dd1736ac36e0abfc930064785f2bfaa3be87c8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 6/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 ae1ca4a06..b3589fe0b 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/charconv : common-requirements From 966fcafaeb20afff8316ea069cd289ddc91f2e98 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:24 -0500 Subject: [PATCH 7/7] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 9 ++++++--- build/Jamfile | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build.jam b/build.jam index b3589fe0b..3e38a1b21 100644 --- a/build.jam +++ b/build.jam @@ -5,11 +5,13 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/core//boost_core ; + project /boost/charconv : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/core//boost_core include ; @@ -21,3 +23,4 @@ explicit call-if : boost-library charconv : install boost_charconv ; + diff --git a/build/Jamfile b/build/Jamfile index 8dbbdf5ca..707f903b5 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -8,7 +8,7 @@ import-search /boost/config/checks ; import config : requires ; -project ; +project : common-requirements $(boost_dependencies) ; local SOURCES = from_chars.cpp to_chars.cpp ;