From ecc58e836ba48a4734555bfa6981c7cfb2c6d787 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 | 11 ----------- build.jam | 26 ++++++++++++++++++++++++++ test/Jamfile.v2 | 9 ++++----- 3 files changed, 30 insertions(+), 16 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index 6f4d5286..00000000 --- a/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -# Boost.Pool 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 00000000..c517bd69 --- /dev/null +++ b/build.jam @@ -0,0 +1,26 @@ +# 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/pool + : common-requirements + /boost/assert//boost_assert + /boost/config//boost_config + /boost/integer//boost_integer + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/winapi//boost_winapi + include + ; + +explicit + [ alias boost_pool ] + [ alias all : boost_pool example test ] + ; + +call-if + : boost-library pool + ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 3ec77eaa..95d0121d 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -6,7 +6,6 @@ project : requirements - /boost/serialization//boost_serialization /boost/system//boost_system BOOST_ALL_NO_LIB=1 all @@ -23,9 +22,9 @@ import os ; import testing ; test-suite pool : - [ run test_simple_seg_storage.cpp : : : msvc:-wd4267 ] + [ run test_simple_seg_storage.cpp : : : /boost/random//boost_random msvc:-wd4267 ] [ run test_pool_alloc.cpp ] - [ run pool_msvc_compiler_bug_test.cpp : : : msvc:-wd4512 ] + [ run pool_msvc_compiler_bug_test.cpp : : : /boost/serialization//boost_serialization msvc:-wd4512 ] [ run test_msvc_mem_leak_detect.cpp ] [ run test_bug_3349.cpp ] [ run test_bug_4960.cpp ] @@ -34,9 +33,9 @@ test-suite pool : gcc:-Wno-long-long pathscale:-Wno-long-long ] [ run test_bug_2696.cpp ] - [ run test_bug_5526.cpp ] + [ run test_bug_5526.cpp : : : /boost/smart_ptr//boost_smart_ptr ] [ run test_bug_6701.cpp ] - [ run test_threading.cpp : : : multi /boost/thread//boost_thread ] + [ run test_threading.cpp : : : multi /boost/thread//boost_thread /boost/random//boost_random ] [ compile test_poisoned_macros.cpp ] ; From b5c11655f554c640c6d4ed3a91599f6234dde06e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 2/9] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.jam b/build.jam index c517bd69..cbab4a65 100644 --- a/build.jam +++ b/build.jam @@ -7,12 +7,12 @@ import project ; project /boost/pool : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/integer//boost_integer - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/winapi//boost_winapi + /boost/assert//boost_assert + /boost/config//boost_config + /boost/integer//boost_integer + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/winapi//boost_winapi include ; From 75b8bd15d861985ef14de70edd7d53454c837266 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 3/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 cbab4a65..2f901ed8 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/pool From 61a0a9a15876d05fc2b77220a1572834cd365f52 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 4/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 2f901ed8..2919a2ae 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/pool : common-requirements From 66632798ec1191e257f4ca9d47df94173638119f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:42:02 -0500 Subject: [PATCH 5/9] Change all references to . --- test/Jamfile.v2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 95d0121d..18dc42e1 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -22,7 +22,7 @@ import os ; import testing ; test-suite pool : - [ run test_simple_seg_storage.cpp : : : /boost/random//boost_random msvc:-wd4267 ] + [ run test_simple_seg_storage.cpp : : : /boost/random//boost_random msvc:-wd4267 ] [ run test_pool_alloc.cpp ] [ run pool_msvc_compiler_bug_test.cpp : : : /boost/serialization//boost_serialization msvc:-wd4512 ] [ run test_msvc_mem_leak_detect.cpp ] @@ -33,7 +33,7 @@ test-suite pool : gcc:-Wno-long-long pathscale:-Wno-long-long ] [ run test_bug_2696.cpp ] - [ run test_bug_5526.cpp : : : /boost/smart_ptr//boost_smart_ptr ] + [ run test_bug_5526.cpp : : : /boost/smart_ptr//boost_smart_ptr ] [ run test_bug_6701.cpp ] [ run test_threading.cpp : : : multi /boost/thread//boost_thread /boost/random//boost_random ] [ compile test_poisoned_macros.cpp ] From d2d6ea9fddeb97aa875038d60c24df97ce23bcb0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:04 -0500 Subject: [PATCH 6/9] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 2919a2ae..1f110d37 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 d913bab3d01665dd029b1962d0aebf2ca633cb2b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 7/9] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/build.jam b/build.jam index 1f110d37..4679999c 100644 --- a/build.jam +++ b/build.jam @@ -5,22 +5,25 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/config//boost_config + /boost/integer//boost_integer + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/winapi//boost_winapi ; + project /boost/pool : common-requirements - /boost/assert//boost_assert - /boost/config//boost_config - /boost/integer//boost_integer - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/winapi//boost_winapi include ; explicit - [ alias boost_pool ] + [ alias boost_pool : : : : $(boost_dependencies) ] [ alias all : boost_pool example test ] ; call-if : boost-library pool ; + From 8ef10b9c9d881423cb8565b507da6e2fb47f2e50 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Jul 2024 11:28:51 -0500 Subject: [PATCH 8/9] Adjust doc build to avoid boost-root references. --- doc/jamfile.v2 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/jamfile.v2 b/doc/jamfile.v2 index 6e3cd494..95354a43 100644 --- a/doc/jamfile.v2 +++ b/doc/jamfile.v2 @@ -20,15 +20,15 @@ using quickbook ; doxygen autodoc : - [ glob ../../../boost/pool/*.hpp ] - #[ glob ../../../boost/pool/detail/*.hpp ] - #[ glob ../../../boost/pool/detail/*.ipp ] + [ glob ../include/boost/pool/*.hpp ] + #[ glob ../include/boost/pool/detail/*.hpp ] + #[ glob ../include/boost/pool/detail/*.ipp ] # Renamed as .inc are not recognised correctly by doxywizard leaving error message. # Warning: include file boost/pool/detail/pool_construct.inc not found, perhaps you forgot to add its directory to INCLUDE_PATH? # and problem with 'no type' in jamfile. # error: target { ../../../boost/pool/detail/pool_construct.inc. } has no type - - #[ glob ../../../boost/pool/examples/*.*pp ] # Example source files. + + #[ glob ../include/boost/pool/examples/*.*pp ] # Example source files. : WARNINGS=YES # Default NO, but useful to see warnings, especially in a logfile. # It is also wise to to set a warnings logfile like this: @@ -51,7 +51,7 @@ boostbook standalone : pool : - + # General settings # ================= # Options for html and pdf @@ -66,7 +66,7 @@ boostbook standalone admon.graphics=1 # Path for links to Boost: boost.root=../../../.. - + # HTML options: # ============= # Use graphics icons not text for navigation: @@ -102,38 +102,38 @@ boostbook standalone page.margin.inner=0.5in # Margin size: page.margin.outer=0.5in - + # Yes, we want graphics for admonishments: admon.graphics=1 - + # Set these one for PDF generation *only*: # default png graphics are awful in PDF form, # better use SVG instead: pdf:admon.graphics.extension=".svg" #pdf:admon.graphics.extension=".png" # Only png images are available. - pdf:use.role.for.mediaobject=1 + pdf:use.role.for.mediaobject=1 pdf:preferred.mediaobject.role=print pdf:img.src.path=$(images_location)/ # graphics (diagrams) for pdf. pdf:draft.mode="no" pdf:boost.url.prefix=I:/boost-sandbox/guild/pool/libs/pool/doc/html - + # on turns on index (or off). on on - + # Choose indexing method (separately for html and pdf): html:on # on (or off) to use internally generated indexes. # html:generate.index=0 # Don't let the XSL stylesheets generate indexes. - + pdf:off # on (or off) to use internally generated indexes. # index # Use ... as the XML wrapper. - + pdf:index.on.type=1 # For the native stylesheets to generate the different indexes. # PDF native index support is probably better for PDFs as then you actually get page numbers. - index.idx # Specifies the name of the script to load. + index.idx # Specifies the name of the script to load. # ../../../ # Path to /pool so index.idx !scan-path can use boost/ and libs/doc. - ../../.. + ../../.. autodoc # ; From 7be9d5d52156ceab8a4b3d19dba066ddd8526da5 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 5 Aug 2024 23:18:51 -0500 Subject: [PATCH 9/9] Update build deps. --- example/Jamfile.v2 | 1 + test/Jamfile.v2 | 1 + 2 files changed, 2 insertions(+) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index acb8dcb1..752db5c3 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -10,6 +10,7 @@ import testing ; project : requirements + /boost/pool//boost_pool /boost/system//boost_system BOOST_ALL_NO_LIB=1 msvc:_SCL_SECURE_NO_WARNINGS diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 18dc42e1..91f9ac9d 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -6,6 +6,7 @@ project : requirements + /boost/pool//boost_pool /boost/system//boost_system BOOST_ALL_NO_LIB=1 all