build_antora.sh: fix base-url patch, use mrdocs generated tagfile

Author: jll63

doc/antora.yml

@@ -21,11 +21,6 @@ ext:
   cpp-reference:
     config: doc/mrdocs.yml
   cpp-tagfiles:
-    files:
-      - file: ./doc/tagfiles/boost-openmethod-doxygen.tag.xml
-        base_url: 'xref:reference:'
-      - file: ./doc/tagfiles/boost-openmethod-macros-doxygen.tag.xml
-        base_url: 'xref:reference:'
     using-namespaces:
       - boost::openmethod
       - boost::openmethod::policies

doc/build_antora.sh

@@ -6,12 +6,11 @@
 # 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)
 #
-# Official repository: https://github.com/boostorg/openmethod
+# Official REPOSITORY: https://github.com/boostorg/openmethod
 #
 
 set -e
 
-
 if [ $# -eq 0 ]
   then
     echo "No playbook supplied, using default playbook"
@@ -23,22 +22,50 @@ fi
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 cd "$SCRIPT_DIR"
 
-if [ -n "${CIRCLE_REPOSITORY_URL:-}" ]; then
-  account="${CIRCLE_REPOSITORY_URL#*:}"
-  account="${account%%/*}"
-  lib=$(basename "$(git rev-parse --show-toplevel)")
-  repository="${account}/$lib"
-  sha=${CIRCLE_SHA1}
-elif [ -n "${GITHUB_REPOSITORY:-}" ]; then
-  repository="${GITHUB_REPOSITORY}"
-  sha=${GITHUB_SHA}
+if [ -z "${BOOST_SRC_DIR:-}" ]; then
+  CANDIDATE=$( cd "$SCRIPT_DIR/../../.." 2>/dev/null && pwd )
+  if [ -n "$CANDIDATE" ]; then
+    BOOST_SRC_DIR_IS_VALID=ON
+    for F in "CMakeLists.txt" "Jamroot" "boost-build.jam" "bootstrap.sh" "libs"; do
+      if [ ! -e "$CANDIDATE/$F" ]; then
+        BOOST_SRC_DIR_IS_VALID=OFF
+        break
+      fi
+    done
+    if [ "$BOOST_SRC_DIR_IS_VALID" = "ON" ]; then
+      export BOOST_SRC_DIR="$CANDIDATE"
+      echo "Using BOOST_SRC_DIR=$BOOST_SRC_DIR"
+    fi
+  fi
 fi
 
-if [ -n "${repository}" ] && [ -n "${sha}" ]; then
-  base_url="https://github.com/${repository}/blob/${sha}"
+if [ -n "${BOOST_SRC_DIR:-}" ]; then
+  if [ -n "${CIRCLE_REPOSITORY_URL:-}" ]; then
+    if [[ "$CIRCLE_REPOSITORY_URL" =~ boostorg/boost(\.git)?$ ]]; then
+      LIB="$(basename "$(dirname "$SCRIPT_DIR")")"
+      REPOSITORY="boostorg/${LIB}"
+    else
+      ACCOUNT="${CIRCLE_REPOSITORY_URL#*:}"
+      ACCOUNT="${ACCOUNT%%/*}"
+      LIB=$(basename "$(git rev-parse --show-toplevel)")
+      REPOSITORY="${ACCOUNT}/${LIB}"
+    fi
+    SHA=$(git -C "$BOOST_SRC_DIR/libs" ls-tree HEAD | grep -w openmethod | awk '{print $3}')
+  elif [ -n "${GITHUB_REPOSITORY:-}" ]; then
+    REPOSITORY="${GITHUB_REPOSITORY}"
+    SHA="${GITHUB_SHA}"
+  fi
+fi
+
+cd "$SCRIPT_DIR"
+
+if [ -n "${REPOSITORY}" ] && [ -n "${SHA}" ]; then
+  base_url="https://github.com/${REPOSITORY}/blob/${SHA}"
   echo "Setting base-url to $base_url"
   cp mrdocs.yml mrdocs.yml.bak
   perl -i -pe 's{^\s*base-url:.*$}{base-url: '"$base_url/"'}' mrdocs.yml
+else
+  echo "REPOSITORY or SHA not set; skipping base-url modification"
 fi
 
 echo "Building documentation with Antora..."
@@ -48,7 +75,7 @@ npm ci
 echo "Building docs in custom dir..."
 PATH="$(pwd)/node_modules/.bin:${PATH}"
 export PATH
-npx antora --clean --fetch "$PLAYBOOK" --stacktrace --log-level all
+npx antora --clean --fetch "$PLAYBOOK" --stacktrace # --log-level all
 
 echo "Fixing links to non-mrdocs URIs..."
 

doc/mrdocs.yml

@@ -22,6 +22,7 @@ inaccessible-bases: never
 # implementation-defined:
 #   - 'boost::openmethod::detail::**'
 exclude-symbols:
+  - 'boost::openmethod::registry::compiler'
   - 'boost::openmethod::registry::initialize'
   - 'boost::openmethod::registry::finalize'
   - 'boost::openmethod::boost_openmethod_bases'
@@ -38,7 +39,7 @@ auto-function-metadata: false
 
 # Generator
 generate: adoc
-base-url: https://www.github.com/boostorg/openmethod/blob/develop/
+base-url: https://www.github.com/boostorg/openmethod/blob/master/
 
 # Style
 verbose: true