From acb327ce7917db158f8ed574adc08576c9d61b11 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. --- build.jam | 39 +++++++++++++++++++ build/Jamfile.v2 | 12 +++--- samples/Jamfile.v2 | 2 + .../check_macro_naming/check_macro_naming.cpp | 2 +- samples/list_includes/build/Jamfile.v2 | 14 ++++--- samples/token_statistics/build/Jamfile.v2 | 15 ++++--- samples/waveidl/build/Jamfile.v2 | 18 +++++---- test/build/Jamfile.v2 | 32 +++++++++++++-- test/testlexers/test_lexertl_lexer.cpp | 2 +- test/testlexers/test_slex_lexer.cpp | 4 +- test/testlexers/test_xlex_lexer.cpp | 4 +- tool/build/Jamfile.v2 | 17 ++++---- 12 files changed, 121 insertions(+), 40 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..541cc97a4 --- /dev/null +++ b/build.jam @@ -0,0 +1,39 @@ +# 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/wave + : common-requirements + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/core//boost_core + /boost/filesystem//boost_filesystem + /boost/format//boost_format + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/mpl//boost_mpl + /boost/multi_index//boost_multi_index + /boost/optional//boost_optional + /boost/pool//boost_pool + /boost/preprocessor//boost_preprocessor + /boost/serialization//boost_serialization + /boost/smart_ptr//boost_smart_ptr + /boost/spirit//boost_spirit + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + include + ; + +explicit + [ alias boost_wave : build//boost_wave ] + [ alias all : boost_wave samples test ] + ; + +call-if : boost-library wave + : install boost_wave + ; diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 59c909328..d64d0cb51 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -8,9 +8,11 @@ # Software License, Version 1.0. (See accompanying file # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -import ../../config/checks/config : requires ; +require-b2 5.0.1 ; +import-search /boost/config/checks ; +import config : requires ; -project boost/wave +project : requirements [ requires cxx11_constexpr @@ -45,8 +47,8 @@ SOURCES = lib boost_wave : $(SOURCES) - ../../filesystem/build//boost_filesystem - ../../thread/build//boost_thread + /boost/filesystem//boost_filesystem + /boost/thread//boost_thread ; for local source in $(SOURCES) @@ -69,5 +71,3 @@ for local source in $(SOURCES) obj $(source) : $(source).cpp : $(requirements) ; } - -boost-install boost_wave ; diff --git a/samples/Jamfile.v2 b/samples/Jamfile.v2 index e754cfdd8..aa98d4aeb 100644 --- a/samples/Jamfile.v2 +++ b/samples/Jamfile.v2 @@ -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.0.1 ; +import-search /boost/config/checks ; import config : requires ; project diff --git a/samples/check_macro_naming/check_macro_naming.cpp b/samples/check_macro_naming/check_macro_naming.cpp index 02e475cf8..c8a37f941 100644 --- a/samples/check_macro_naming/check_macro_naming.cpp +++ b/samples/check_macro_naming/check_macro_naming.cpp @@ -11,7 +11,7 @@ =============================================================================*/ #include "check_macro_naming.hpp" -#include "libs/filesystem/include/boost/filesystem/file_status.hpp" +#include "boost/filesystem/file_status.hpp" /////////////////////////////////////////////////////////////////////////////// // Utilities from the rest of Boost diff --git a/samples/list_includes/build/Jamfile.v2 b/samples/list_includes/build/Jamfile.v2 index ed72b8d47..15d5b801f 100644 --- a/samples/list_includes/build/Jamfile.v2 +++ b/samples/list_includes/build/Jamfile.v2 @@ -18,14 +18,18 @@ SOURCES = ../instantiate_lexertl_lexer ; +project + : requirements + /boost/wave//boost_wave + /boost/program_options//boost_program_options/static + /boost/filesystem//boost_filesystem + /boost/system//boost_system + /boost/thread//boost_thread + ; + exe list_includes : $(SOURCES) - /boost/wave//boost_wave - /boost/program_options//boost_program_options/static - /boost/filesystem//boost_filesystem - /boost/system//boost_system - /boost/thread//boost_thread ; for local source in $(SOURCES) diff --git a/samples/token_statistics/build/Jamfile.v2 b/samples/token_statistics/build/Jamfile.v2 index 14361a349..c7d61fc22 100644 --- a/samples/token_statistics/build/Jamfile.v2 +++ b/samples/token_statistics/build/Jamfile.v2 @@ -16,14 +16,19 @@ SOURCES = ../instantiate_has_include_grammar ; +project + : requirements + /boost/wave//boost_wave + /boost/program_options//boost_program_options/static + /boost/filesystem//boost_filesystem + /boost/system//boost_system + /boost/thread//boost_thread + /boost/xpressive//boost_xpressive + ; + exe token_statistics : $(SOURCES) - /boost/wave//boost_wave - /boost/program_options//boost_program_options/static - /boost/filesystem//boost_filesystem - /boost/system//boost_system - /boost/thread//boost_thread ; for local source in $(SOURCES) diff --git a/samples/waveidl/build/Jamfile.v2 b/samples/waveidl/build/Jamfile.v2 index 6a17bbaa7..3a1d2cfb4 100644 --- a/samples/waveidl/build/Jamfile.v2 +++ b/samples/waveidl/build/Jamfile.v2 @@ -17,16 +17,20 @@ SOURCES = ../instantiate_re2c_lexer ../instantiate_re2c_lexer_str ../idllexer/idl_re - ; - + ; + +project + : requirements + /boost/wave//boost_wave + /boost/program_options//boost_program_options/static + /boost/system//boost_system + /boost/thread//boost_thread + /boost/filesystem//boost_filesystem + ; + exe waveidl : $(SOURCES) - /boost/wave//boost_wave - /boost/program_options//boost_program_options/static - /boost/system//boost_system - /boost/thread//boost_thread - /boost/filesystem//boost_filesystem ; for local source in $(SOURCES) diff --git a/test/build/Jamfile.v2 b/test/build/Jamfile.v2 index 683ab1184..1e860f098 100644 --- a/test/build/Jamfile.v2 +++ b/test/build/Jamfile.v2 @@ -8,7 +8,11 @@ # Software License, Version 1.0. (See accompanying file # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +require-b2 5.0.1 ; +import-search /boost/config/checks ; import config : requires ; +import project ; +import path ; # # These are the sources to compile for the testwave application @@ -22,9 +26,23 @@ SOURCES_DYNAMIC = testwave_dll testwave_app_dll SOURCES = $(SOURCE_STATIC) $(SOURCES_DYNAMIC) ; -path-constant TESTWAVE_DIR : $(BOOST_ROOT)/libs/wave/test/testwave/testfiles +path-constant TESTWAVE_DIR : ../testwave/testfiles ; +path-constant WAVE_INCLUDE_DIR : ../../include + ; + +path-constant SAMPLES_DIR : ../../samples + ; + +# +# We need the Boost Config project for the boost/version.hpp header file. +# +local boost-config-attributes + = [ project.attributes [ project.is-registered-id /boost/config ] ] ; +local BOOST_CONFIG_INCLUDE_DIR + = [ path.join [ $(boost-config-attributes).get location ] include ] ; + # # This are the arguments for the testwave executable # @@ -32,7 +50,8 @@ TESTWAVE_ARGUMENTS = -d4 # use -d4 for verbose results --hooks=1 # test hooks as well -S$(TESTWAVE_DIR) - -S$(BOOST_ROOT) -I$(BOOST_ROOT) + -S$(WAVE_INCLUDE_DIR) -I$(WAVE_INCLUDE_DIR) + -S$(BOOST_CONFIG_INCLUDE_DIR) -I$(BOOST_CONFIG_INCLUDE_DIR) ; # @@ -41,7 +60,7 @@ TESTWAVE_ARGUMENTS = TESTWAVE_FILES = test.cfg ; -project wave/test +project : requirements [ requires cxx11_constexpr @@ -51,6 +70,7 @@ project wave/test cxx11_hdr_mutex cxx11_hdr_regex ] + $(SAMPLES_DIR) ; for local source in $(SOURCES) @@ -58,6 +78,10 @@ for local source in $(SOURCES) local requirements ; requirements += 7.1:off ; # workaround for compiler bug requirements += 7.1_stlport4:off ; + requirements += + /boost/any//boost_any + /boost/program_options//boost_program_options + ; obj $(source) : ../testwave/$(source).cpp : $(requirements) ; } @@ -133,6 +157,7 @@ test-suite wave /boost/filesystem//boost_filesystem /boost/thread//boost_thread /boost/system//boost_system + /boost/xpressive//boost_xpressive : # arguments : @@ -211,6 +236,7 @@ test-suite wave /boost/filesystem//boost_filesystem /boost/thread//boost_thread /boost/system//boost_system + /boost/xpressive//boost_xpressive : # arguments : diff --git a/test/testlexers/test_lexertl_lexer.cpp b/test/testlexers/test_lexertl_lexer.cpp index da8ccf8b9..fb9b9b1d7 100644 --- a/test/testlexers/test_lexertl_lexer.cpp +++ b/test/testlexers/test_lexertl_lexer.cpp @@ -24,7 +24,7 @@ // include the lexertl lexer related stuff #include // token type -#include // lexer type +#include // lexer type typedef boost::wave::cpplexer::lex_token<> token_type; typedef boost::wave::cpplexer::lexertl::lex_iterator lexer_type; diff --git a/test/testlexers/test_slex_lexer.cpp b/test/testlexers/test_slex_lexer.cpp index 46331ba11..7cfe124a9 100644 --- a/test/testlexers/test_slex_lexer.cpp +++ b/test/testlexers/test_slex_lexer.cpp @@ -27,8 +27,8 @@ /////////////////////////////////////////////////////////////////////////////// // include the Slex lexer related stuff -#include // token type -#include // lexer type +#include // token type +#include // lexer type typedef boost::wave::cpplexer::slex_token<> token_type; typedef boost::wave::cpplexer::slex::slex_iterator lexer_type; diff --git a/test/testlexers/test_xlex_lexer.cpp b/test/testlexers/test_xlex_lexer.cpp index 99f29a1dc..13fb9b5be 100644 --- a/test/testlexers/test_xlex_lexer.cpp +++ b/test/testlexers/test_xlex_lexer.cpp @@ -26,8 +26,8 @@ /////////////////////////////////////////////////////////////////////////////// // include the Xpressive lexer related stuff #include // token type -#include // lexer type -#include // iterator +#include // lexer type +#include // iterator typedef boost::wave::cpplexer::lex_token<> token_type; typedef boost::wave::cpplexer::xlex::xlex_iterator lexer_type; diff --git a/tool/build/Jamfile.v2 b/tool/build/Jamfile.v2 index dff6030b0..a5b11ea74 100644 --- a/tool/build/Jamfile.v2 +++ b/tool/build/Jamfile.v2 @@ -34,13 +34,14 @@ project exe wave : ../cpp.cpp - /boost//wave - /boost//program_options - /boost//filesystem - /boost//serialization - /boost//system - /boost//thread + /boost/wave//boost_wave + /boost/program_options//boost_program_options + /boost/filesystem//boost_filesystem + /boost/serialization//boost_serialization + /boost/system//boost_system + /boost/thread//boost_thread /boost/timer//boost_timer/static + /boost/foreach//boost_foreach : multi # on @@ -49,8 +50,8 @@ exe wave release ; -local bindir = [ option.get bindir : ../../../dist/bin ] ; -local libdir = [ option.get libdir : ../../../dist/lib ] ; +local bindir = [ option.get bindir : ../dist/bin ] ; +local libdir = [ option.get libdir : ../dist/lib ] ; install dist-bin : From 64d8df84f59a85de4592fe5f6ab8680db48fdb68 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:16:00 -0500 Subject: [PATCH 2/9] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/build.jam b/build.jam index 541cc97a4..28c258353 100644 --- a/build.jam +++ b/build.jam @@ -7,25 +7,25 @@ import project ; project /boost/wave : common-requirements - /boost/assert//boost_assert - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/core//boost_core - /boost/filesystem//boost_filesystem - /boost/format//boost_format - /boost/iterator//boost_iterator - /boost/lexical_cast//boost_lexical_cast - /boost/mpl//boost_mpl - /boost/multi_index//boost_multi_index - /boost/optional//boost_optional - /boost/pool//boost_pool - /boost/preprocessor//boost_preprocessor - /boost/serialization//boost_serialization - /boost/smart_ptr//boost_smart_ptr - /boost/spirit//boost_spirit - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/core//boost_core + /boost/filesystem//boost_filesystem + /boost/format//boost_format + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/mpl//boost_mpl + /boost/multi_index//boost_multi_index + /boost/optional//boost_optional + /boost/pool//boost_pool + /boost/preprocessor//boost_preprocessor + /boost/serialization//boost_serialization + /boost/smart_ptr//boost_smart_ptr + /boost/spirit//boost_spirit + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits include ; From cf543b49f97537de24b2abfa6be48b440b3712df Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 9 Apr 2024 17:39:21 -0500 Subject: [PATCH 3/9] Add wave tool build to all target. --- build.jam | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 28c258353..8e2ef8ac4 100644 --- a/build.jam +++ b/build.jam @@ -31,7 +31,8 @@ project /boost/wave explicit [ alias boost_wave : build//boost_wave ] - [ alias all : boost_wave samples test ] + [ alias wave : tool/build//wave ] + [ alias all : boost_wave wave samples test ] ; call-if : boost-library wave From c1772d62538fb020e3a58fa66135a2e5f152c09d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Apr 2024 20:17:31 -0500 Subject: [PATCH 4/9] Add missing NO_LIB usage requirements. --- build/Jamfile.v2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index d64d0cb51..27bcbe3cb 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -4,8 +4,8 @@ # # http://www.boost.org/ # -# Copyright (c) 2001-2011 Hartmut Kaiser. Distributed under the Boost -# Software License, Version 1.0. (See accompanying file +# Copyright (c) 2001-2011 Hartmut Kaiser. 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) require-b2 5.0.1 ; @@ -27,6 +27,8 @@ project msvc:_SCL_SECURE_NO_DEPRECATE msvc:_CRT_SECURE_NO_DEPRECATE : source-location ../src + : usage-requirements + BOOST_ALL_NO_LIB=1 ; SOURCES = From d3cec1df4cc8f3bcc3a4789881307035525215c9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 5/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 8e2ef8ac4..4f7ac0f79 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/wave From 9b2b7c964d596ceaaefe9ad0cd9af7877c6f26cd Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 6/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 4f7ac0f79..cc206764c 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/wave : common-requirements From 2255346ddaaea2989c884c70de474b13b641f993 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 21:28:11 -0500 Subject: [PATCH 7/9] Change all references to . --- samples/list_includes/build/Jamfile.v2 | 24 +++++++++++------------ samples/token_statistics/build/Jamfile.v2 | 20 +++++++++---------- samples/waveidl/build/Jamfile.v2 | 16 +++++++-------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/samples/list_includes/build/Jamfile.v2 b/samples/list_includes/build/Jamfile.v2 index 15d5b801f..3e6b4d62d 100644 --- a/samples/list_includes/build/Jamfile.v2 +++ b/samples/list_includes/build/Jamfile.v2 @@ -4,27 +4,27 @@ # # http://www.boost.org/ # -# Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost -# Software License, Version 1.0. (See accompanying file +# Copyright (c) 2001-2010 Hartmut Kaiser. 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) SOURCES = ../list_includes - ../instantiate_cpp_exprgrammar - ../instantiate_cpp_grammar + ../instantiate_cpp_exprgrammar + ../instantiate_cpp_grammar ../instantiate_cpp_literalgrs ../instantiate_defined_grammar ../instantiate_has_include_grammar - ../instantiate_lexertl_lexer + ../instantiate_lexertl_lexer ; project : requirements - /boost/wave//boost_wave - /boost/program_options//boost_program_options/static - /boost/filesystem//boost_filesystem - /boost/system//boost_system - /boost/thread//boost_thread + /boost/wave//boost_wave + /boost/program_options//boost_program_options/static + /boost/filesystem//boost_filesystem + /boost/system//boost_system + /boost/thread//boost_thread ; exe list_includes @@ -36,7 +36,7 @@ for local source in $(SOURCES) { local requirements ; # workaround for compiler bug - requirements += 7.1:off ; - requirements += 7.1_stlport4:off ; + requirements += 7.1:off ; + requirements += 7.1_stlport4:off ; obj $(source) : $(source).cpp : $(requirements) ; } diff --git a/samples/token_statistics/build/Jamfile.v2 b/samples/token_statistics/build/Jamfile.v2 index c7d61fc22..b41553834 100644 --- a/samples/token_statistics/build/Jamfile.v2 +++ b/samples/token_statistics/build/Jamfile.v2 @@ -4,12 +4,12 @@ # # http://www.boost.org/ # -# Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost -# Software License, Version 1.0. (See accompanying file +# Copyright (c) 2001-2010 Hartmut Kaiser. 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) -SOURCES = - ../token_statistics +SOURCES = + ../token_statistics ../instantiate_xlex_lexer ../instantiate_cpp_grammar ../instantiate_defined_grammar @@ -18,12 +18,12 @@ SOURCES = project : requirements - /boost/wave//boost_wave - /boost/program_options//boost_program_options/static - /boost/filesystem//boost_filesystem - /boost/system//boost_system - /boost/thread//boost_thread - /boost/xpressive//boost_xpressive + /boost/wave//boost_wave + /boost/program_options//boost_program_options/static + /boost/filesystem//boost_filesystem + /boost/system//boost_system + /boost/thread//boost_thread + /boost/xpressive//boost_xpressive ; exe token_statistics diff --git a/samples/waveidl/build/Jamfile.v2 b/samples/waveidl/build/Jamfile.v2 index 3a1d2cfb4..8efcb6709 100644 --- a/samples/waveidl/build/Jamfile.v2 +++ b/samples/waveidl/build/Jamfile.v2 @@ -4,11 +4,11 @@ # # http://www.boost.org/ # -# Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost -# Software License, Version 1.0. (See accompanying file +# Copyright (c) 2001-2010 Hartmut Kaiser. 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) -SOURCES = +SOURCES = ../idl ../instantiate_cpp_grammar ../instantiate_defined_grammar @@ -21,11 +21,11 @@ SOURCES = project : requirements - /boost/wave//boost_wave - /boost/program_options//boost_program_options/static - /boost/system//boost_system - /boost/thread//boost_thread - /boost/filesystem//boost_filesystem + /boost/wave//boost_wave + /boost/program_options//boost_program_options/static + /boost/system//boost_system + /boost/thread//boost_thread + /boost/filesystem//boost_filesystem ; exe waveidl From d1fbffc07d4ca5d7129a383f246dcd465afcf7f5 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 8/9] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 41 ++++++++++++++++++++++------------------- build/Jamfile.v2 | 1 + 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/build.jam b/build.jam index cc206764c..d2e81b1f7 100644 --- a/build.jam +++ b/build.jam @@ -5,27 +5,29 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/core//boost_core + /boost/filesystem//boost_filesystem + /boost/format//boost_format + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/mpl//boost_mpl + /boost/multi_index//boost_multi_index + /boost/optional//boost_optional + /boost/pool//boost_pool + /boost/preprocessor//boost_preprocessor + /boost/serialization//boost_serialization + /boost/smart_ptr//boost_smart_ptr + /boost/spirit//boost_spirit + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits ; + project /boost/wave : common-requirements - /boost/assert//boost_assert - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/core//boost_core - /boost/filesystem//boost_filesystem - /boost/format//boost_format - /boost/iterator//boost_iterator - /boost/lexical_cast//boost_lexical_cast - /boost/mpl//boost_mpl - /boost/multi_index//boost_multi_index - /boost/optional//boost_optional - /boost/pool//boost_pool - /boost/preprocessor//boost_preprocessor - /boost/serialization//boost_serialization - /boost/smart_ptr//boost_smart_ptr - /boost/spirit//boost_spirit - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits include ; @@ -38,3 +40,4 @@ explicit call-if : boost-library wave : install boost_wave ; + diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 27bcbe3cb..a2deaaaf1 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -13,6 +13,7 @@ import-search /boost/config/checks ; import config : requires ; project + : common-requirements $(boost_dependencies) : requirements [ requires cxx11_constexpr From 1380e4c74f2975ccd170f8dfda1461cf4e402de3 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 10 Aug 2024 23:24:10 -0500 Subject: [PATCH 9/9] Update build deps. --- samples/cpp_tokens/build/Jamfile.v2 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/samples/cpp_tokens/build/Jamfile.v2 b/samples/cpp_tokens/build/Jamfile.v2 index 27b6e3973..6a562edd1 100644 --- a/samples/cpp_tokens/build/Jamfile.v2 +++ b/samples/cpp_tokens/build/Jamfile.v2 @@ -4,27 +4,28 @@ # # http://www.boost.org/ # -# Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost -# Software License, Version 1.0. (See accompanying file +# Copyright (c) 2001-2010 Hartmut Kaiser. 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) +project : requirements /boost/wave//boost_wave ; + SOURCES = - ../cpp_tokens - ../instantiate_cpp_exprgrammar - ../instantiate_cpp_grammar + ../cpp_tokens + ../instantiate_cpp_exprgrammar + ../instantiate_cpp_grammar ../instantiate_cpp_literalgrs ../instantiate_defined_grammar ../instantiate_has_include_grammar - ../instantiate_slex_lexer + ../instantiate_slex_lexer ; exe cpp_tokens : $(SOURCES) - /boost/wave//boost_wave /boost/program_options//boost_program_options - /boost/filesystem//boost_filesystem - /boost/system//boost_system + /boost/filesystem//boost_filesystem + /boost/system//boost_system /boost/thread//boost_thread ;