Sync from upstream.

CMakeLists.txt

@@ -37,7 +37,14 @@ option(BOOST_URL_BUILD_EXAMPLES "Build boost::url examples" ${BOOST_URL_IS_ROOT}
 option(BOOST_URL_MRDOCS_BUILD "Build the target for MrDocs: see mrdocs.yml" OFF)
 option(BOOST_URL_DISABLE_THREADS "Disable threads" OFF)
 option(BOOST_URL_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
-set(BOOST_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../.." CACHE STRING "Boost source dir to use when running CMake from this directory")
+
+# Check if environment variable BOOST_SRC_DIR is set
+if (NOT DEFINED BOOST_SRC_DIR AND DEFINED ENV{BOOST_SRC_DIR})
+    set(DEFAULT_BOOST_SRC_DIR "$ENV{BOOST_SRC_DIR}")
+else ()
+    set(DEFAULT_BOOST_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
+endif ()
+set(BOOST_SRC_DIR ${DEFAULT_BOOST_SRC_DIR} CACHE STRING "Boost source dir to use when running CMake from this directory")
 
 #-------------------------------------------------
 #

doc/antora.yml

@@ -18,11 +18,8 @@ asciidoc:
 nav:
   - modules/ROOT/nav.adoc
 ext:
-  collector:
-    run:
-      command: node doc/generate-files.mjs
-    scan:
-      dir: doc/build/generated-files
+  cpp-reference:
+    config: doc/mrdocs.yml
   cpp-tagfiles:
     files:
       - file: ./doc/tagfiles/boost-url-doxygen.tag.xml

doc/build_antora.sh

@@ -22,6 +22,6 @@ npm ci
 echo "Building docs in custom dir..."
 PATH="$(pwd)/node_modules/.bin:${PATH}"
 export PATH
-npx antora --clean --fetch "$PLAYBOOK"
+npx antora --clean --fetch "$PLAYBOOK" --stacktrace --log-level all
 echo "Done"
 

doc/local-playbook.yml

@@ -38,6 +38,13 @@ antora:
       cpp-tagfiles:
         using-namespaces:
           - 'boost::'
+    - require: '@alandefreitas/antora-cpp-reference-extension'
+      dependencies:
+        - name: 'boost'
+          repo: 'https://github.com/boostorg/boost.git'
+          tag: 'develop'
+          variable: 'BOOST_SRC_DIR'
+
 asciidoc:
   attributes:
     # Enable pagination