Merge branch 'develop'

.github/workflows/cmake.yml

@@ -0,0 +1,104 @@
+##############################################################################
+# GitHub Actions Workflow for Boost.Geometry to build tests with cmake
+#
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+#
+# 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)
+##############################################################################
+name: cmake
+
+on: [push]
+
+jobs:
+  ##############################################################################
+  clang:
+    name: ${{ matrix.b2_toolset }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        b2_toolset: [
+          clang-14
+        ]
+
+        include:
+          - b2_toolset: clang-14
+            b2_cxxstd: 14,17,2a
+            version: "14"
+            os: ubuntu-22.04
+    steps:
+      - name: Set up environment
+        id: setenv
+        run: |
+          if [[ "$GITHUB_REF" == *master ]]; then
+            echo "BOOST_BRANCH=master" >> $GITHUB_ENV
+          else
+            echo "BOOST_BRANCH=develop" >> $GITHUB_ENV
+          fi
+          echo "BOOST_SELF=$(basename $GITHUB_WORKSPACE)" >> $GITHUB_ENV
+          echo "BOOST_ROOT=$GITHUB_WORKSPACE/boost-root" >> $GITHUB_ENV
+          echo "boost_self=$(basename $GITHUB_WORKSPACE)" >> "$GITHUB_OUTPUT"
+          echo "boost_root=$GITHUB_WORKSPACE/boost-root" >> "$GITHUB_OUTPUT"
+
+      - name: Clone boostorg/boost
+        run: |
+          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git $BOOST_ROOT
+          cd $BOOST_ROOT
+          git submodule update -q --init libs/headers
+          git submodule update -q --init tools/boost_install
+          git submodule update -q --init tools/boostdep
+          git submodule update -q --init tools/build
+          mkdir -p libs/$BOOST_SELF
+
+      - uses: actions/checkout@v2
+        with:
+          path: ${{ steps.setenv.outputs.boost_root }}/libs/${{ steps.setenv.outputs.boost_self }}
+
+      - name: Run tools/boostdep/depinst/depinst.py
+        run: |
+          cd $BOOST_ROOT
+          python tools/boostdep/depinst/depinst.py --include benchmark --include example --include examples --include tools $BOOST_SELF
+
+      - name: Bootstrap boostorg/boost
+        run: |
+          gcc --version
+          cd $BOOST_ROOT
+          ./bootstrap.sh --with-toolset=gcc
+          ./b2 headers
+          test -f /usr/local/bin/b2 && rm -rf /usr/local/bin/b2
+          test -f /usr/local/bin/bjam && rm -rf /usr/local/bin/bjam
+          sudo cp $BOOST_ROOT/b2 /usr/local/bin/
+          ls -l /usr/local/bin/b2
+          b2 -v
+
+      - name: Set up clang toolset in ~/user-config.jam
+        run: |
+          export CXX_NAME=clang++-${{ matrix.version }}
+          echo ${CXX_NAME}
+          echo "# $HOME/user-config.jam" > $HOME/user-config.jam
+          echo "using clang : : $(which clang++-${{ matrix.version }}) ;" > ${HOME}/user-config.jam
+          test -f $HOME/user-config.jam && cat $HOME/user-config.jam
+
+      - name: Build tests with cmake (c++17)
+        run: |
+          cd $BOOST_ROOT/libs/geometry
+          mkdir __build
+          cd __build
+          cmake -DCMAKE_CXX_STANDARD=17 -DBUILD_TESTING=ON ..
+          cmake --build . --target tests
+
+      - name: Build tests with cmake
+        run: |
+          cd $BOOST_ROOT/libs/geometry/__build
+          rm -rf *
+          cmake -DBUILD_TESTING=ON ..
+          cmake --build . --target tests
+
+      - name: Run tests
+        run: |
+          cd $BOOST_ROOT/libs/geometry/__build
+          ctest --output-on-failure --no-tests=error

.github/workflows/documentation.yml

@@ -4,6 +4,10 @@
 # Copyright (c) 2020 Mateusz Loskot <mateusz@loskot.net>
 # Copyright (c) 2020 Adam Wulkiewicz, Lodz, Poland
 #
+# This file was modified by Oracle on 2024.
+# Modifications copyright (c) 2024 Oracle and/or its affiliates.
+# Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+#
 # 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)
@@ -84,22 +88,13 @@ jobs:
         echo "using xsltproc ;" >> $HOME/user-config.jam
         test -f $HOME/user-config.jam && cat $HOME/user-config.jam
 
-    - name: Install libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk
-      run: |
-        cd $BOOST_ROOT
-        $BOOST_ROOT/b2 variant=release libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk
-        test -f /usr/local/bin/doxygen_xml2qbk && rm -rf /usr/local/bin/doxygen_xml2qbk
-        sudo cp $BOOST_ROOT/dist/bin/doxygen_xml2qbk /usr/local/bin/
-        ls -l /usr/local/bin/b2
-        doxygen_xml2qbk --version
-
-    - name: Build libs/geometry/doc/src/examples
+    - name: Build examples
       run: |
         cd $BOOST_ROOT
         $BOOST_ROOT/b2 libs/geometry/doc/src/examples
 
-    - name: Run libs/geometry/doc/make_qbk.py
+    - name: Build documentation
       run: |
         cd $BOOST_ROOT
         cd libs/geometry/doc
-        python ./make_qbk.py
+        $BOOST_ROOT/b2

.gitignore

@@ -16,3 +16,5 @@ stdcerr
 
 # JetBrains
 /.idea
+
+!build.jam

CMakeLists.txt

@@ -24,6 +24,7 @@ target_link_libraries(boost_geometry
     Boost::concept_check
     Boost::config
     Boost::core
+    Boost::crc
     Boost::function_types
     Boost::iterator
     Boost::lexical_cast
@@ -32,6 +33,7 @@ target_link_libraries(boost_geometry
     Boost::mpl
     Boost::multiprecision
     Boost::numeric_conversion
+    Boost::program_options
     Boost::qvm
     Boost::range
     Boost::rational
@@ -100,9 +102,11 @@ if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
           config
           algorithm
           any
+          crc
           lexical_cast
           math
           multiprecision
+          program_options
           qvm
           rational
           serialization
@@ -123,7 +127,8 @@ if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
   endif()
 
   enable_testing()
-  add_subdirectory(test)
+  add_subdirectory(test EXCLUDE_FROM_ALL)
+  add_subdirectory(index/test EXCLUDE_FROM_ALL)
 
 endif()
 

build.jam

@@ -0,0 +1,63 @@
+# 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.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_tr1
+    /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
+        <include>include
+    : requirements
+        [ requires
+            cxx14_constexpr
+            cxx14_return_type_deduction
+        ]
+        <toolset>msvc:<asynch-exceptions>on
+    ;
+
+explicit
+    [ alias boost_geometry : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_geometry test example doc/src/examples index extensions ]
+    ;
+
+call-if : boost-library geometry
+    ;
+

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 ;
@@ -23,13 +24,14 @@ testing.make-test run-pyd :
     :
     <pythonpath>$(here)
     <dependency>src/docutils/tools/doxygen_xml2qbk//doxygen_xml2qbk
+    <dependency>doxy/Doxyfile
     <testing.arg>"--release-build --doxygen-xml2qbk"
     <testing.input-file>src/docutils/tools/doxygen_xml2qbk//doxygen_xml2qbk
     :
     make_qbk ;
 explicit make_qbk ;
 
-boostbook geometry 
+boostbook geometry
     : geometry.qbk
     : <dependency>Jamfile
         <dependency>quickref.xml
@@ -47,7 +49,7 @@ boostbook geometry
        <xsl:param>boost.root=../../../..
        <quickbook-define>enable_index
        <include>$(here)
-       <format>pdf:<xsl:param>img.src.path=$(images_location)/    
+       <format>pdf:<xsl:param>img.src.path=$(images_location)/
        <dependency>make_qbk
 ;
 

doc/concept/point.qbk

@@ -68,7 +68,7 @@ struct access<std::array<T, D>, Index> {
 * [link geometry.reference.adapted.boost_fusion Boost.Fusion]
 * [link geometry.reference.adapted.boost_polygon Boost.Polygon]
 * [link geometry.reference.adapted.boost_tuple Boost.Tuple]
-* other point types, adapted e.g. using one of the [link geometry.reference.adapted registration macro's]
+* other point types, adapted e.g. using one of the [link geometry.reference.adapted.register registration macro's]
 
 [endsect]
 

doc/debug_clean_doc.sh

@@ -0,0 +1,22 @@
+# ===========================================================================
+#  Copyright (c) 2024-2024 Barend Gehrels, Amsterdam, the Netherlands.
+#
+#  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)
+# ============================================================================
+
+# Removes all generated output
+
+b2 clean
+
+rm -f index/generated/*.qbk
+rm -f generated/*.qbk
+rm -f generated/*.xml
+rm -Rf html/geometry
+rm -Rf doxy/doxygen_output/xml
+rm -Rf doxy/doxygen_output/html_by_doxygen
+rm -Rf index/xml
+rm -Rf index/html_by_doxygen
+
+git ls-files --others