From d66704c0fa775dd1e3d410168b057e2689f99219 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/15] Make the library modular usable. --- Jamfile | 26 ------------------- doc/src/examples/algorithms/Jamfile | 4 ++- doc/src/examples/core/Jamfile | 2 +- .../geometries/adapted/boost_range/Jamfile | 3 ++- example/Jamfile | 7 ++--- index/example/Jamfile | 12 ++++----- index/test/Jamfile | 1 + index/test/rtree/interprocess/Jamfile | 1 + test/Jamfile | 3 +++ test/headers/Jamfile | 6 +++-- test/robustness/convex_hull/Jamfile | 2 +- test/robustness/overlay/buffer/Jamfile | 2 +- test/robustness/overlay/linear_areal/Jamfile | 2 +- 13 files changed, 28 insertions(+), 43 deletions(-) delete mode 100644 Jamfile diff --git a/Jamfile b/Jamfile deleted file mode 100644 index 45c27ab1d0..0000000000 --- a/Jamfile +++ /dev/null @@ -1,26 +0,0 @@ -# Boost.Geometry (aka GGL, Generic Geometry Library) -# -# Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands. -# Copyright (c) 2008-2013 Bruno Lalande, Paris, France. -# Copyright (c) 2009-2022 Mateusz Loskot, London, UK. -# -# Use, modification and distribution is 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) - -import ../../config/checks/config : requires ; - -project boost-geometry - : - requirements - [ requires - cxx14_constexpr - cxx14_return_type_deduction - ] - msvc:on - ; - -build-project test ; -build-project example ; -build-project doc/src/examples ; -build-project index ; diff --git a/doc/src/examples/algorithms/Jamfile b/doc/src/examples/algorithms/Jamfile index 4d0f056a3c..81621a0ff5 100644 --- a/doc/src/examples/algorithms/Jamfile +++ b/doc/src/examples/algorithms/Jamfile @@ -17,7 +17,9 @@ project boost-geometry-doc-example-algorithms - : # requirements + : requirements + /boost/assign//boost_assign + /boost/foreach//boost_foreach ; exe append : append.cpp ; diff --git a/doc/src/examples/core/Jamfile b/doc/src/examples/core/Jamfile index 4f46ca1dee..72c1c97cb5 100644 --- a/doc/src/examples/core/Jamfile +++ b/doc/src/examples/core/Jamfile @@ -29,5 +29,5 @@ exe interior_type : interior_type.cpp ; exe point_type : point_type.cpp ; exe ring_type : ring_type.cpp ; exe rings : rings.cpp ; -exe tag : tag.cpp ; +exe tag : tag.cpp : /boost/assign//boost_assign ; exe tag_cast : tag_cast.cpp ; diff --git a/doc/src/examples/geometries/adapted/boost_range/Jamfile b/doc/src/examples/geometries/adapted/boost_range/Jamfile index 364d301810..37705b3337 100644 --- a/doc/src/examples/geometries/adapted/boost_range/Jamfile +++ b/doc/src/examples/geometries/adapted/boost_range/Jamfile @@ -10,7 +10,8 @@ project boost-geometry-doc-src-example-geometries-adapted-boost_range - : # requirements + : requirements + /boost/assign//boost_assign ; exe filtered : filtered.cpp ; diff --git a/example/Jamfile b/example/Jamfile index 17fae5000c..2c5b233a1d 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -11,7 +11,8 @@ project boost-geometry-example - : # requirements + : requirements + /boost/foreach//boost_foreach ; exe 01_point_example : 01_point_example.cpp ; @@ -21,8 +22,8 @@ exe 05_a_overlay_polygon_example : 05_a_overlay_polygon_example.cpp ; exe 05_b_overlay_linestring_polygon_example : 05_b_overlay_linestring_polygon_example.cpp ; exe 06_a_transformation_example : 06_a_transformation_example.cpp ; exe 06_b_transformation_example : 06_b_transformation_example.cpp ; -exe 07_a_graph_route_example : 07_a_graph_route_example.cpp ; -exe 07_b_graph_route_example : 07_b_graph_route_example.cpp ; +# exe 07_a_graph_route_example : 07_a_graph_route_example.cpp : /boost/graph//boost_graph ; +# exe 07_b_graph_route_example : 07_b_graph_route_example.cpp : /boost/graph//boost_graph ; exe c01_custom_point_example : c01_custom_point_example.cpp ; exe c02_custom_box_example : c02_custom_box_example.cpp ; diff --git a/index/example/Jamfile b/index/example/Jamfile index 3c7b5b2cd6..a4e92f4950 100644 --- a/index/example/Jamfile +++ b/index/example/Jamfile @@ -18,7 +18,7 @@ import os ; project boost-geometry-index-example : requirements - /boost//headers + /boost/foreach//boost_foreach ; local GLUT_ROOT = [ os.environ GLUT_ROOT ] ; @@ -44,11 +44,11 @@ if $(GLUT_ROOT) } exe random_test : random_test.cpp ; -link serialize.cpp /boost//serialization : ; -link benchmark.cpp /boost//chrono : multi ; -link benchmark2.cpp /boost//chrono : multi ; -link benchmark3.cpp /boost//chrono : multi ; -link benchmark_experimental.cpp /boost//chrono : multi ; +link serialize.cpp /boost/serialization//boost_serialization /boost/timer//boost_timer : ; +link benchmark.cpp /boost/chrono//boost_chrono : multi ; +link benchmark2.cpp /boost/chrono//boost_chrono : multi ; +link benchmark3.cpp /boost/chrono//boost_chrono : multi ; +link benchmark_experimental.cpp /boost/chrono//boost_chrono : multi ; if $(GLUT_ROOT) { link glut_vis.cpp glut ; diff --git a/index/test/Jamfile b/index/test/Jamfile index 62d9618f89..a65c9a373f 100644 --- a/index/test/Jamfile +++ b/index/test/Jamfile @@ -21,6 +21,7 @@ project boost-geometry-index-test msvc:/bigobj windows,intel:/bigobj /boost/timer//boost_timer + /boost/test//boost_test ; test-suite boost-geometry-index-detail diff --git a/index/test/rtree/interprocess/Jamfile b/index/test/rtree/interprocess/Jamfile index 23008aa615..b80c0ca06b 100644 --- a/index/test/rtree/interprocess/Jamfile +++ b/index/test/rtree/interprocess/Jamfile @@ -25,6 +25,7 @@ rule test_all msvc:/bigobj windows,intel:/bigobj linux:"-lrt" + /boost/interprocess//boost_interprocess ] ; } diff --git a/test/Jamfile b/test/Jamfile index 492e41aa3d..a9cbc622bb 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -24,6 +24,9 @@ project boost-geometry-test clang:-Wno-unneeded-internal-declaration # supress warning by Boost.None intel:BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE windows,intel:/bigobj + /boost/test//boost_test + /boost/foreach//boost_foreach + /boost/assign//boost_assign ; # Run minimal testset diff --git a/test/headers/Jamfile b/test/headers/Jamfile index d9f07e2a5b..e9905d110e 100644 --- a/test/headers/Jamfile +++ b/test/headers/Jamfile @@ -14,6 +14,8 @@ import os ; import path ; import regex ; +path-constant HEADERS : ../../include/boost/geometry ; + rule generate_self_contained_headers ( headers_subpath ) { # This rule is based on script copied from similar rule in Boost.GIL @@ -29,7 +31,7 @@ rule generate_self_contained_headers ( headers_subpath ) # NOTE: All '/' in test names are replaced with '-' because apparently # test scripts have a problem with test names containing slashes. - local top_headers_path = [ path.make $(BOOST_ROOT)/libs/geometry/include/boost/geometry ] ; + local top_headers_path = [ path.make $(HEADERS) ] ; # Skip the OpenGL visualization related header for local file in [ path.glob-tree $(top_headers_path)/$(headers_subpath) : *.hpp : gl_draw.hpp ] @@ -38,7 +40,7 @@ rule generate_self_contained_headers ( headers_subpath ) local target_name = [ regex.replace h/$(rel_file) "/" "-" ] ; local target_name = [ regex.replace $(target_name) "\.hpp" "" ] ; targets += [ - compile $(BOOST_ROOT)/libs/geometry/test/headers/main.cpp + compile main.cpp : "BOOST_GEOMETRY_TEST_HEADER=$(rel_file)" $(file) : $(target_name) ] ; diff --git a/test/robustness/convex_hull/Jamfile b/test/robustness/convex_hull/Jamfile index 20521d5487..8689219e2e 100644 --- a/test/robustness/convex_hull/Jamfile +++ b/test/robustness/convex_hull/Jamfile @@ -11,7 +11,7 @@ project random_multi_points : requirements . - ../../../../program_options/build//boost_program_options + /boost/program_options//boost_program_options static ; diff --git a/test/robustness/overlay/buffer/Jamfile b/test/robustness/overlay/buffer/Jamfile index f724fcf8c6..88cc95ff86 100644 --- a/test/robustness/overlay/buffer/Jamfile +++ b/test/robustness/overlay/buffer/Jamfile @@ -12,7 +12,7 @@ project recursive_polygons_buffer : requirements . ../.. - ../../../../../program_options/build//boost_program_options + /boost/program_options//boost_program_options static ; diff --git a/test/robustness/overlay/linear_areal/Jamfile b/test/robustness/overlay/linear_areal/Jamfile index a31dadf159..fca297be9e 100644 --- a/test/robustness/overlay/linear_areal/Jamfile +++ b/test/robustness/overlay/linear_areal/Jamfile @@ -12,7 +12,7 @@ project recursive_polygons_linear_areal : requirements . ../.. - ../../../../../program_options/build//boost_program_options + /boost/program_options//boost_program_options static ; From 3c42d5fdb8d00b20fea35e3f4ce3fc1b173b0c13 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 17 Mar 2024 14:33:12 -0500 Subject: [PATCH 02/15] Add missing modular build.jam. And fix gitignore that caused it to be originally deleted! --- .gitignore | 2 ++ build.jam | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 build.jam diff --git a/.gitignore b/.gitignore index 2f86751553..82e4d9b538 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ stdcerr # JetBrains /.idea + +!build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 0000000000..fbf125ef0a --- /dev/null +++ b/build.jam @@ -0,0 +1,62 @@ +# 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) + +require-b2 5.1.0 ; + +import-search /boost/config/checks ; + +import project ; +import config : requires ; + +project /boost/geometry + : common-requirements + /boost/algorithm//boost_algorithm + /boost/any//boost_any + /boost/array//boost_array + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/container//boost_container + /boost/core//boost_core + /boost/endian//boost_endian + /boost/function_types//boost_function_types + /boost/fusion//boost_fusion + /boost/integer//boost_integer + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/math//boost_math + /boost/mpl//boost_mpl + /boost/multiprecision//boost_multiprecision + /boost/numeric_conversion//boost_numeric_conversion + /boost/polygon//boost_polygon + /boost/predef//boost_predef + /boost/qvm//boost_qvm + /boost/range//boost_range + /boost/rational//boost_rational + /boost/serialization//boost_serialization + /boost/static_assert//boost_static_assert + /boost/thread//boost_thread + /boost/throw_exception//boost_throw_exception + /boost/tokenizer//boost_tokenizer + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/variant//boost_variant + /boost/variant2//boost_variant2 + include + : requirements + [ requires + cxx14_constexpr + cxx14_return_type_deduction + ] + msvc:on + ; + +explicit + [ alias boost_geometry ] + [ alias all : boost_geometry test example doc/src/examples index ] + ; + +call-if : boost-library geometry + ; From 21da1f19f8e30ac44bcd16191f83b088586f45c8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 03/15] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 64 +++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/build.jam b/build.jam index fbf125ef0a..4c36f21b44 100644 --- a/build.jam +++ b/build.jam @@ -12,38 +12,38 @@ import config : requires ; project /boost/geometry : common-requirements - /boost/algorithm//boost_algorithm - /boost/any//boost_any - /boost/array//boost_array - /boost/assert//boost_assert - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/container//boost_container - /boost/core//boost_core - /boost/endian//boost_endian - /boost/function_types//boost_function_types - /boost/fusion//boost_fusion - /boost/integer//boost_integer - /boost/iterator//boost_iterator - /boost/lexical_cast//boost_lexical_cast - /boost/math//boost_math - /boost/mpl//boost_mpl - /boost/multiprecision//boost_multiprecision - /boost/numeric_conversion//boost_numeric_conversion - /boost/polygon//boost_polygon - /boost/predef//boost_predef - /boost/qvm//boost_qvm - /boost/range//boost_range - /boost/rational//boost_rational - /boost/serialization//boost_serialization - /boost/static_assert//boost_static_assert - /boost/thread//boost_thread - /boost/throw_exception//boost_throw_exception - /boost/tokenizer//boost_tokenizer - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits - /boost/variant//boost_variant - /boost/variant2//boost_variant2 + /boost/algorithm//boost_algorithm + /boost/any//boost_any + /boost/array//boost_array + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/container//boost_container + /boost/core//boost_core + /boost/endian//boost_endian + /boost/function_types//boost_function_types + /boost/fusion//boost_fusion + /boost/integer//boost_integer + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/math//boost_math + /boost/mpl//boost_mpl + /boost/multiprecision//boost_multiprecision + /boost/numeric_conversion//boost_numeric_conversion + /boost/polygon//boost_polygon + /boost/predef//boost_predef + /boost/qvm//boost_qvm + /boost/range//boost_range + /boost/rational//boost_rational + /boost/serialization//boost_serialization + /boost/static_assert//boost_static_assert + /boost/thread//boost_thread + /boost/throw_exception//boost_throw_exception + /boost/tokenizer//boost_tokenizer + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/variant//boost_variant + /boost/variant2//boost_variant2 include : requirements [ requires From b6c0d60939ce513b3dec9fb7bc2cec9c42797a92 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 13 Apr 2024 16:19:27 -0500 Subject: [PATCH 04/15] Remove relative references to boost-root in Jamfiles. --- extensions/example/gis/Jamfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/extensions/example/gis/Jamfile b/extensions/example/gis/Jamfile index d3ddc37706..29f18278b6 100644 --- a/extensions/example/gis/Jamfile +++ b/extensions/example/gis/Jamfile @@ -11,8 +11,6 @@ project boost-geometry-extensions-gis-examples : requirements - . - ../../../../../boost gcc:-pedantic ; From 4ff95c649c210e9bd301319e21db2c0449d9fe95 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Apr 2024 20:29:21 -0500 Subject: [PATCH 05/15] Building docs requires Python. --- doc/Jamfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/Jamfile b/doc/Jamfile index 91b1139a3b..69f0cb26f3 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -11,8 +11,9 @@ project geometry/doc ; # Auto-index, experimental. Commented otherwise does not build without. -#using auto-index ; +#using auto-index ; using quickbook ; +using python ; path-constant here : . ; path-constant images_location : html ; @@ -29,7 +30,7 @@ testing.make-test run-pyd : make_qbk ; explicit make_qbk ; -boostbook geometry +boostbook geometry : geometry.qbk : Jamfile quickref.xml @@ -47,7 +48,7 @@ boostbook geometry boost.root=../../../.. enable_index $(here) - pdf:img.src.path=$(images_location)/ + pdf:img.src.path=$(images_location)/ make_qbk ; From 2a68f3554f0bc55a70b5cbd691c7b422d44d8835 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 06/15] Add requires-b2 check to top-level build file. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 4c36f21b44..67ebf4d36d 100644 --- a/build.jam +++ b/build.jam @@ -3,7 +3,7 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -require-b2 5.1.0 ; +require-b2 5.1 ; import-search /boost/config/checks ; From 8a79387ad1dbf6472e4121e776767648f682d4d9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 07/15] 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 67ebf4d36d..482f523ece 100644 --- a/build.jam +++ b/build.jam @@ -3,11 +3,9 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -require-b2 5.1 ; +require-b2 5.2 ; import-search /boost/config/checks ; - -import project ; import config : requires ; project /boost/geometry From 14725ce56e3fb4d8e95361c59467823e90d759e8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:39:36 -0500 Subject: [PATCH 08/15] Change all references to . --- doc/src/examples/algorithms/Jamfile | 4 ++-- doc/src/examples/core/Jamfile | 2 +- doc/src/examples/geometries/adapted/boost_range/Jamfile | 2 +- example/Jamfile | 4 ++-- index/example/Jamfile | 2 +- index/test/Jamfile | 2 +- index/test/rtree/interprocess/Jamfile | 2 +- test/Jamfile | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/src/examples/algorithms/Jamfile b/doc/src/examples/algorithms/Jamfile index 81621a0ff5..84e160c1a5 100644 --- a/doc/src/examples/algorithms/Jamfile +++ b/doc/src/examples/algorithms/Jamfile @@ -18,8 +18,8 @@ project boost-geometry-doc-example-algorithms : requirements - /boost/assign//boost_assign - /boost/foreach//boost_foreach + /boost/assign//boost_assign + /boost/foreach//boost_foreach ; exe append : append.cpp ; diff --git a/doc/src/examples/core/Jamfile b/doc/src/examples/core/Jamfile index 72c1c97cb5..2331497e43 100644 --- a/doc/src/examples/core/Jamfile +++ b/doc/src/examples/core/Jamfile @@ -29,5 +29,5 @@ exe interior_type : interior_type.cpp ; exe point_type : point_type.cpp ; exe ring_type : ring_type.cpp ; exe rings : rings.cpp ; -exe tag : tag.cpp : /boost/assign//boost_assign ; +exe tag : tag.cpp : /boost/assign//boost_assign ; exe tag_cast : tag_cast.cpp ; diff --git a/doc/src/examples/geometries/adapted/boost_range/Jamfile b/doc/src/examples/geometries/adapted/boost_range/Jamfile index 37705b3337..50e78e5a8f 100644 --- a/doc/src/examples/geometries/adapted/boost_range/Jamfile +++ b/doc/src/examples/geometries/adapted/boost_range/Jamfile @@ -11,7 +11,7 @@ project boost-geometry-doc-src-example-geometries-adapted-boost_range : requirements - /boost/assign//boost_assign + /boost/assign//boost_assign ; exe filtered : filtered.cpp ; diff --git a/example/Jamfile b/example/Jamfile index 2c5b233a1d..3e48563425 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -10,9 +10,9 @@ # http://www.boost.org/LICENSE_1_0.txt) -project boost-geometry-example +project boost-geometry-example : requirements - /boost/foreach//boost_foreach + /boost/foreach//boost_foreach ; exe 01_point_example : 01_point_example.cpp ; diff --git a/index/example/Jamfile b/index/example/Jamfile index a4e92f4950..4704d716c5 100644 --- a/index/example/Jamfile +++ b/index/example/Jamfile @@ -18,7 +18,7 @@ import os ; project boost-geometry-index-example : requirements - /boost/foreach//boost_foreach + /boost/foreach//boost_foreach ; local GLUT_ROOT = [ os.environ GLUT_ROOT ] ; diff --git a/index/test/Jamfile b/index/test/Jamfile index a65c9a373f..4c5eb4490a 100644 --- a/index/test/Jamfile +++ b/index/test/Jamfile @@ -21,7 +21,7 @@ project boost-geometry-index-test msvc:/bigobj windows,intel:/bigobj /boost/timer//boost_timer - /boost/test//boost_test + /boost/test//boost_test ; test-suite boost-geometry-index-detail diff --git a/index/test/rtree/interprocess/Jamfile b/index/test/rtree/interprocess/Jamfile index b80c0ca06b..5d281c5a95 100644 --- a/index/test/rtree/interprocess/Jamfile +++ b/index/test/rtree/interprocess/Jamfile @@ -25,7 +25,7 @@ rule test_all msvc:/bigobj windows,intel:/bigobj linux:"-lrt" - /boost/interprocess//boost_interprocess + /boost/interprocess//boost_interprocess ] ; } diff --git a/test/Jamfile b/test/Jamfile index a9cbc622bb..64cd1de54d 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -24,9 +24,9 @@ project boost-geometry-test clang:-Wno-unneeded-internal-declaration # supress warning by Boost.None intel:BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE windows,intel:/bigobj - /boost/test//boost_test - /boost/foreach//boost_foreach - /boost/assign//boost_assign + /boost/test//boost_test + /boost/foreach//boost_foreach + /boost/assign//boost_assign ; # Run minimal testset @@ -40,7 +40,7 @@ if ! [ os.environ TRAVIS ] { build-project core ; -build-project concepts ; +build-project concepts ; build-project geometries ; build-project arithmetic ; build-project algorithms ; From 6803f270b5d96fd121a3f8d2bea61479c2542a54 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 21 Jul 2024 09:55:46 -0500 Subject: [PATCH 09/15] Fix library global (relative) references. --- doc/src/docutils/tools/doxygen_xml2qbk/Jamfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile b/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile index 438df2cb16..87360453f5 100644 --- a/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile +++ b/doc/src/docutils/tools/doxygen_xml2qbk/Jamfile @@ -26,7 +26,7 @@ project doxygen_xml2qbk : requirements . $(RAPIDXML) - ../../../../../../program_options/build//boost_program_options + /boost/program_options//boost_program_options static ; From f1b9beb98c74631d10fe8d1a3608df6b2811aee4 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 10/15] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 69 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/build.jam b/build.jam index 482f523ece..2b03cd929d 100644 --- a/build.jam +++ b/build.jam @@ -8,40 +8,42 @@ require-b2 5.2 ; import-search /boost/config/checks ; import config : requires ; +constant boost_dependencies : + /boost/algorithm//boost_algorithm + /boost/any//boost_any + /boost/array//boost_array + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/container//boost_container + /boost/core//boost_core + /boost/endian//boost_endian + /boost/function_types//boost_function_types + /boost/fusion//boost_fusion + /boost/integer//boost_integer + /boost/iterator//boost_iterator + /boost/lexical_cast//boost_lexical_cast + /boost/math//boost_math + /boost/mpl//boost_mpl + /boost/multiprecision//boost_multiprecision + /boost/numeric_conversion//boost_numeric_conversion + /boost/polygon//boost_polygon + /boost/predef//boost_predef + /boost/qvm//boost_qvm + /boost/range//boost_range + /boost/rational//boost_rational + /boost/serialization//boost_serialization + /boost/static_assert//boost_static_assert + /boost/thread//boost_thread + /boost/throw_exception//boost_throw_exception + /boost/tokenizer//boost_tokenizer + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/variant//boost_variant + /boost/variant2//boost_variant2 ; + project /boost/geometry : common-requirements - /boost/algorithm//boost_algorithm - /boost/any//boost_any - /boost/array//boost_array - /boost/assert//boost_assert - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/container//boost_container - /boost/core//boost_core - /boost/endian//boost_endian - /boost/function_types//boost_function_types - /boost/fusion//boost_fusion - /boost/integer//boost_integer - /boost/iterator//boost_iterator - /boost/lexical_cast//boost_lexical_cast - /boost/math//boost_math - /boost/mpl//boost_mpl - /boost/multiprecision//boost_multiprecision - /boost/numeric_conversion//boost_numeric_conversion - /boost/polygon//boost_polygon - /boost/predef//boost_predef - /boost/qvm//boost_qvm - /boost/range//boost_range - /boost/rational//boost_rational - /boost/serialization//boost_serialization - /boost/static_assert//boost_static_assert - /boost/thread//boost_thread - /boost/throw_exception//boost_throw_exception - /boost/tokenizer//boost_tokenizer - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits - /boost/variant//boost_variant - /boost/variant2//boost_variant2 include : requirements [ requires @@ -52,9 +54,10 @@ project /boost/geometry ; explicit - [ alias boost_geometry ] + [ alias boost_geometry : : : : $(boost_dependencies) ] [ alias all : boost_geometry test example doc/src/examples index ] ; call-if : boost-library geometry ; + From ae3198fa74bae5ceb8b3dd35894788c84a2ce029 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 23:05:04 -0500 Subject: [PATCH 11/15] Re-enable some examples that got accidentally disabled. --- example/Jamfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/Jamfile b/example/Jamfile index 3e48563425..b318d16ab5 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -22,8 +22,8 @@ exe 05_a_overlay_polygon_example : 05_a_overlay_polygon_example.cpp ; exe 05_b_overlay_linestring_polygon_example : 05_b_overlay_linestring_polygon_example.cpp ; exe 06_a_transformation_example : 06_a_transformation_example.cpp ; exe 06_b_transformation_example : 06_b_transformation_example.cpp ; -# exe 07_a_graph_route_example : 07_a_graph_route_example.cpp : /boost/graph//boost_graph ; -# exe 07_b_graph_route_example : 07_b_graph_route_example.cpp : /boost/graph//boost_graph ; +exe 07_a_graph_route_example : 07_a_graph_route_example.cpp : /boost/graph//boost_graph ; +exe 07_b_graph_route_example : 07_b_graph_route_example.cpp : /boost/graph//boost_graph ; exe c01_custom_point_example : c01_custom_point_example.cpp ; exe c02_custom_box_example : c02_custom_box_example.cpp ; From 9e82721cc8e3c2ef8a23d2be8f9984d5382d24b8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 25 Jul 2024 23:30:00 -0500 Subject: [PATCH 12/15] Switch to /boost/test//included target for header only mode of Boost.Test. --- index/test/Jamfile | 2 +- test/Jamfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index/test/Jamfile b/index/test/Jamfile index 4c5eb4490a..f403633dc0 100644 --- a/index/test/Jamfile +++ b/index/test/Jamfile @@ -21,7 +21,7 @@ project boost-geometry-index-test msvc:/bigobj windows,intel:/bigobj /boost/timer//boost_timer - /boost/test//boost_test + /boost/test//included ; test-suite boost-geometry-index-detail diff --git a/test/Jamfile b/test/Jamfile index 64cd1de54d..91615f7917 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -24,7 +24,7 @@ project boost-geometry-test clang:-Wno-unneeded-internal-declaration # supress warning by Boost.None intel:BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE windows,intel:/bigobj - /boost/test//boost_test + /boost/test//included /boost/foreach//boost_foreach /boost/assign//boost_assign ; From 2ad067adcc45f5597e2f5ca859e3667cdc86c2be Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 3 Aug 2024 12:33:39 -0500 Subject: [PATCH 13/15] Update build deps. --- build.jam | 2 +- doc/src/examples/Jamfile | 5 +++-- example/Jamfile | 1 + extensions/Jamfile | 2 ++ index/Jamfile | 1 + test/Jamfile | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.jam b/build.jam index 2b03cd929d..d0650d61e4 100644 --- a/build.jam +++ b/build.jam @@ -55,7 +55,7 @@ project /boost/geometry explicit [ alias boost_geometry : : : : $(boost_dependencies) ] - [ alias all : boost_geometry test example doc/src/examples index ] + [ alias all : boost_geometry test example doc/src/examples index extensions ] ; call-if : boost-library geometry diff --git a/doc/src/examples/Jamfile b/doc/src/examples/Jamfile index fbc49fe39b..8fbe26c603 100644 --- a/doc/src/examples/Jamfile +++ b/doc/src/examples/Jamfile @@ -10,11 +10,12 @@ project boost-geometry-doc-src-example - : # requirements + : requirements + /boost/geometry//boost_geometry ; exe quick_start : quick_start.cpp ; - + build-project algorithms ; build-project core ; build-project geometries ; diff --git a/example/Jamfile b/example/Jamfile index b318d16ab5..c2d7f11512 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -12,6 +12,7 @@ project boost-geometry-example : requirements + /boost/geometry//boost_geometry /boost/foreach//boost_foreach ; diff --git a/extensions/Jamfile b/extensions/Jamfile index 3da1ea96cf..97a8f6ac35 100644 --- a/extensions/Jamfile +++ b/extensions/Jamfile @@ -12,6 +12,8 @@ project boost-geometry-extensions : requirements msvc:on + /boost/geometry//boost_geometry + /boost/test//included ; build-project test ; diff --git a/index/Jamfile b/index/Jamfile index 3675b7f06a..c01a4263b9 100644 --- a/index/Jamfile +++ b/index/Jamfile @@ -11,6 +11,7 @@ project boost-geometry-index : requirements + /boost/geometry//boost_geometry msvc:on ; diff --git a/test/Jamfile b/test/Jamfile index 91615f7917..2d58dc2cc3 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -18,6 +18,7 @@ import testing ; project boost-geometry-test : requirements + /boost/geometry//boost_geometry . msvc:on msvc:/bigobj From f44ff62c9b45fd2d2229817d6b44dc2202509461 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 11 Aug 2024 09:23:25 -0500 Subject: [PATCH 14/15] 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 d0650d61e4..fd6e0f66a4 100644 --- a/build.jam +++ b/build.jam @@ -23,7 +23,7 @@ constant boost_dependencies : /boost/integer//boost_integer /boost/iterator//boost_iterator /boost/lexical_cast//boost_lexical_cast - /boost/math//boost_math + /boost/math//boost_math_tr1 /boost/mpl//boost_mpl /boost/multiprecision//boost_multiprecision /boost/numeric_conversion//boost_numeric_conversion From 80f60c6d47098ba573a9521b76f883f1c0f0b11a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 13 Aug 2024 23:15:44 -0500 Subject: [PATCH 15/15] Update build deps. --- extensions/example/gis/projections/Jamfile | 3 ++- extensions/test/gis/io/wkb/Jamfile | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/extensions/example/gis/projections/Jamfile b/extensions/example/gis/projections/Jamfile index 36e8da2671..1b494ebe34 100644 --- a/extensions/example/gis/projections/Jamfile +++ b/extensions/example/gis/projections/Jamfile @@ -10,7 +10,8 @@ project boost-geometry-example-extensions-gis-latlong - : # requirements + : requirements + /boost/foreach//boost_foreach ; exe p01_projection_example : p01_projection_example.cpp ; diff --git a/extensions/test/gis/io/wkb/Jamfile b/extensions/test/gis/io/wkb/Jamfile index 1d9c6870ed..6a7769ccca 100644 --- a/extensions/test/gis/io/wkb/Jamfile +++ b/extensions/test/gis/io/wkb/Jamfile @@ -9,6 +9,10 @@ # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +project : requirements + /boost/assign//boost_assign + /boost/algorithm//boost_algorithm ; + test-suite boost-geometry-extensions-gis-io-wkb : [ run read_wkb.cpp ]