From 5fb238c49edcd2e27221022abd3fe59c23b8a214 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/10] Make the library modular usable. --- Jamfile | 11 ----------- build.jam | 33 +++++++++++++++++++++++++++++++++ build/Jamfile.v2 | 7 ++++--- test/Jamfile.v2 | 2 +- 4 files changed, 38 insertions(+), 15 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index f0de2e0bc8..0000000000 --- a/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -# Boost.ProgramOptions 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 0000000000..d7eb722707 --- /dev/null +++ b/build.jam @@ -0,0 +1,33 @@ +# 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/program_options + : common-requirements + /boost/any//boost_any + /boost/bind//boost_bind + /boost/config//boost_config + /boost/core//boost_core + /boost/detail//boost_detail + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/smart_ptr//boost_smart_ptr + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/tokenizer//boost_tokenizer + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_program_options : build//boost_program_options ] + [ alias all : boost_program_options example test ] + ; + +call-if : boost-library program_options + : install boost_program_options + ; diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 852054d017..a90b51cf1d 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -1,5 +1,5 @@ -project boost/program_options +project : source-location ../src ; @@ -9,8 +9,9 @@ SOURCES = convert winmain split ; -boost-lib program_options +lib boost_program_options : $(SOURCES).cpp : # See https://svn.boost.org/trac/boost/ticket/5049 hpux,gcc:_INCLUDE_STDC__SOURCE_199901 - ; \ No newline at end of file + shared:BOOST_PROGRAM_OPTIONS_DYN_LINK=1 + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 0f1a6e7aa9..968b5a82d1 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -38,7 +38,7 @@ test-suite program_options : [ run options_description_test.cpp : : : off : options_description_no_rtti_test ] ; -exe test_convert : test_convert.cpp ; +exe test_convert : test_convert.cpp /boost/timer//boost_timer ; # `quick` target (for CI) run quick.cpp : --path=initial ; From 944550e78cb604b41146991944602058127b0c9b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 02/10] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/build.jam b/build.jam index d7eb722707..330ef3908f 100644 --- a/build.jam +++ b/build.jam @@ -7,19 +7,19 @@ import project ; project /boost/program_options : common-requirements - /boost/any//boost_any - /boost/bind//boost_bind - /boost/config//boost_config - /boost/core//boost_core - /boost/detail//boost_detail - /boost/function//boost_function - /boost/iterator//boost_iterator - /boost/lexical_cast//boost_lexical_cast - /boost/smart_ptr//boost_smart_ptr - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/tokenizer//boost_tokenizer - /boost/type_traits//boost_type_traits + /boost/any//boost_any + /boost/bind//boost_bind + /boost/config//boost_config + /boost/core//boost_core + /boost/detail//boost_detail + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/smart_ptr//boost_smart_ptr + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/tokenizer//boost_tokenizer + /boost/type_traits//boost_type_traits include ; From 80d3576414dfcac81de3e8f0ecdb760e2806b022 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Apr 2024 20:16:25 -0500 Subject: [PATCH 03/10] Add missing NO_LIB usage requirements. --- build/Jamfile.v2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index a90b51cf1d..c4c41e9cc9 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -1,10 +1,10 @@ -project - : source-location ../src +project + : source-location ../src ; SOURCES = - cmdline config_file options_description parsers variables_map + cmdline config_file options_description parsers variables_map value_semantic positional_options utf8_codecvt_facet convert winmain split ; @@ -14,4 +14,5 @@ lib boost_program_options : # See https://svn.boost.org/trac/boost/ticket/5049 hpux,gcc:_INCLUDE_STDC__SOURCE_199901 shared:BOOST_PROGRAM_OPTIONS_DYN_LINK=1 + BOOST_PROGRAM_OPTIONS_NO_LIB=1 ; From 31b0ede16953f9082c35d784aabc0b5fd9978327 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 04/10] 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 330ef3908f..ccc42a5755 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/program_options From eff0d3702645394ea700824b9861c2ff4e5c26b4 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 05/10] 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 ccc42a5755..9f3d2cda11 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/program_options : common-requirements From 292b605203f690fd0dce4056208bea6ae25dff5f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -0500 Subject: [PATCH 06/10] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 9f3d2cda11..c37e49afbe 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 b77aeaa36bdc5a3c71c744b8494ca48599be1b02 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 07/10] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 29 ++++++++++++++++------------- build/Jamfile.v2 | 1 + 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/build.jam b/build.jam index c37e49afbe..f905e6a6ea 100644 --- a/build.jam +++ b/build.jam @@ -5,21 +5,23 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/any//boost_any + /boost/bind//boost_bind + /boost/config//boost_config + /boost/core//boost_core + /boost/detail//boost_detail + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/smart_ptr//boost_smart_ptr + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/tokenizer//boost_tokenizer + /boost/type_traits//boost_type_traits ; + project /boost/program_options : common-requirements - /boost/any//boost_any - /boost/bind//boost_bind - /boost/config//boost_config - /boost/core//boost_core - /boost/detail//boost_detail - /boost/function//boost_function - /boost/iterator//boost_iterator - /boost/lexical_cast//boost_lexical_cast - /boost/smart_ptr//boost_smart_ptr - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/tokenizer//boost_tokenizer - /boost/type_traits//boost_type_traits include ; @@ -31,3 +33,4 @@ explicit call-if : boost-library program_options : install boost_program_options ; + diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index c4c41e9cc9..d293a533c4 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -1,6 +1,7 @@ project : source-location ../src + : common-requirements $(boost_dependencies) ; SOURCES = From f5fce8a1249fa1ff534d3d958bbdcd3ecf4be2fe Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 26 Jul 2024 17:32:48 -0500 Subject: [PATCH 08/10] Split b2 dependencies into public and private. --- build.jam | 2 -- build/Jamfile.v2 | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.jam b/build.jam index f905e6a6ea..ab577bc320 100644 --- a/build.jam +++ b/build.jam @@ -7,7 +7,6 @@ require-b2 5.2 ; constant boost_dependencies : /boost/any//boost_any - /boost/bind//boost_bind /boost/config//boost_config /boost/core//boost_core /boost/detail//boost_detail @@ -17,7 +16,6 @@ constant boost_dependencies : /boost/smart_ptr//boost_smart_ptr /boost/static_assert//boost_static_assert /boost/throw_exception//boost_throw_exception - /boost/tokenizer//boost_tokenizer /boost/type_traits//boost_type_traits ; project /boost/program_options diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index d293a533c4..2d00cdb984 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -1,4 +1,9 @@ +constant boost_dependencies_private : + /boost/bind//boost_bind + /boost/tokenizer//boost_tokenizer + ; + project : source-location ../src : common-requirements $(boost_dependencies) From 0cbac86ed0bdb5f4eb1dce071eb2e0f5498a20ea Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Jul 2024 11:07:54 -0500 Subject: [PATCH 09/10] Adjust doc build to avoid boost-root references. --- doc/Jamfile.v2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 22a680ef7c..616e55267b 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -2,15 +2,15 @@ import toolset ; toolset.using doxygen ; -boostbook program_option - : program_options.xml - : autodoc +boostbook program_option + : program_options.xml + : autodoc boost.root=../../../.. pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html ; -doxygen autodoc - : [ glob ../../../boost/program_options/*.hpp ] ; +doxygen autodoc + : [ glob ../include/boost/program_options/*.hpp ] ; ############################################################################### alias boostdoc From d35a57a156f9c182c7df9377d009d47fe3f95d07 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 2 Aug 2024 22:17:56 -0500 Subject: [PATCH 10/10] Update build deps. --- build/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 2d00cdb984..f366cfa16a 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -7,6 +7,7 @@ constant boost_dependencies_private : project : source-location ../src : common-requirements $(boost_dependencies) + : requirements $(boost_dependencies_private) ; SOURCES =