build_docs: rearrange depinst.py (#92)

* build_docs: depinst.py skip REPONAME * build_docs: rearrange depinst.py
boostorg · Jan 15, 2025 · 6b4c216 · 6b4c216
1 parent e49d397
commit 6b4c216
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 25 deletions.
diff --git a/build_docs/linuxdocs.sh b/build_docs/linuxdocs.sh
@@ -411,18 +411,31 @@ if [ "$skipboostoption" != "yes" ] && [ "$typeoption" != "antora" ] ; then
     git submodule update --init tools/quickbook
     git submodule update --init tools/boostlook
 
-    if [ "$typeoption" = "main" ]; then
-        git submodule update --init tools/auto_index
-        python3 tools/boostdep/depinst/depinst.py ../tools/auto_index
-
-        # recopy the library if it was overwritten.
-        if [ ! "${BOOSTROOTLIBRARY}" = "yes" ]; then
-            # cp -rf ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath}
-            rsync -av --exclude 'boost-root' --delete "$BOOST_SRC_FOLDER/" "$librarypath"
-        fi
+    # if [ "$typeoption" = "main" ]; then
+    #     git submodule update --init tools/auto_index
+    #     python3 tools/boostdep/depinst/depinst.py --ignore "${REPONAME}" -vv ../tools/auto_index
+
+    #     # recopy the library if it was overwritten.
+    #     if [ ! "${BOOSTROOTLIBRARY}" = "yes" ]; then
+    #         # cp -rf ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath}
+    #         rsync -av --exclude 'boost-root' --delete "$BOOST_SRC_FOLDER/" "$librarypath"
+    #     fi
+    # fi
+
+    # Previously the logic had been to only install auto_index for "$typeoption" = "main"
+    # It's simpler to always install that.
+    # Also, --ignore is broken on depinst.py.
+
+    git submodule update --init tools/auto_index
+    python3 tools/boostdep/depinst/depinst.py --ignore "${REPONAME}" ../tools/auto_index
+    python3 tools/boostdep/depinst/depinst.py --ignore "${REPONAME}" ../tools/quickbook
+
+    # recopy the library if it was overwritten.
+    if [ ! "${BOOSTROOTLIBRARY}" = "yes" ]; then
+        # cp -rf ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath}
+        rsync -av --exclude 'boost-root' --delete "$BOOST_SRC_FOLDER/" "$librarypath"
     fi
 
-    python3 tools/boostdep/depinst/depinst.py ../tools/quickbook
     ./bootstrap.sh
     ./b2 headers
 

diff --git a/build_docs/macosdocs.sh b/build_docs/macosdocs.sh
@@ -441,15 +441,29 @@ if [ "$skipboostoption" != "yes" ] && [ "$typeoption" != "antora" ] ; then
     git submodule update --init tools/build
     sed -i 's~GLOB "/usr/share/java/saxon/"~GLOB "/Library/Java/Extensions/" "/usr/share/java/saxon/"~' tools/build/src/tools/saxonhe.jam
 
-    if [ "$typeoption" = "main" ]; then
-        git submodule update --init tools/auto_index
-        python3 tools/boostdep/depinst/depinst.py ../tools/auto_index
-
-        # recopy the library if it was overwritten.
-        if [ ! "${BOOSTROOTLIBRARY}" = "yes" ]; then
-            # cp -rf ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath}
-            rsync -av --exclude 'boost-root' --delete "$BOOST_SRC_FOLDER/" "$librarypath"
-        fi
+    # if [ "$typeoption" = "main" ]; then
+    #     git submodule update --init tools/auto_index
+    #     python3 tools/boostdep/depinst/depinst.py ../tools/auto_index
+
+    #     # recopy the library if it was overwritten.
+    #     if [ ! "${BOOSTROOTLIBRARY}" = "yes" ]; then
+    #         # cp -rf ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath}
+    #         rsync -av --exclude 'boost-root' --delete "$BOOST_SRC_FOLDER/" "$librarypath"
+    #     fi
+    # fi
+
+    # Previously the logic had been to only install auto_index for "$typeoption" = "main"
+    # It's simpler to always install that.
+    # Also, --ignore is broken on depinst.py.
+
+    git submodule update --init tools/auto_index
+    python3 tools/boostdep/depinst/depinst.py --ignore "${REPONAME}" ../tools/auto_index
+    python3 tools/boostdep/depinst/depinst.py --ignore "${REPONAME}" ../tools/quickbook
+
+    # recopy the library if it was overwritten.
+    if [ ! "${BOOSTROOTLIBRARY}" = "yes" ]; then
+        # cp -rf ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath}
+        rsync -av --exclude 'boost-root' --delete "$BOOST_SRC_FOLDER/" "$librarypath"
     fi
 
     python3 tools/boostdep/depinst/depinst.py ../tools/quickbook

diff --git a/build_docs/windowsdocs.ps1 b/build_docs/windowsdocs.ps1
@@ -608,10 +608,9 @@ if ( -Not ${skip-boost} ) {
     git submodule update --init tools/build
     git submodule update --init tools/boostlook
 
-    if ($typeoption -eq "main") {
-        git submodule update --init tools/auto_index
-        python tools/boostdep/depinst/depinst.py ../tools/auto_index
-    }
+    git submodule update --init tools/auto_index
+    python tools/boostdep/depinst/depinst.py ../tools/quickbook
+    python tools/boostdep/depinst/depinst.py ../tools/auto_index
 
     # Recopy the library, if it was overwritten by the submodule updates that just occurred.
     if ( -Not ($BOOSTROOTLIBRARY -eq "yes") ) {
@@ -627,8 +626,6 @@ if ( -Not ${skip-boost} ) {
     $replacer='.saxonhe_jar = $(jar[1]) ;  .saxonhe_jar = \"/usr/share/java/Saxon-HE.jar\" ;'
     sed -i "s~$matcher~$replacer~" tools/build/src/tools/saxonhe.jam
 
-    python tools/boostdep/depinst/depinst.py ../tools/quickbook
-
     Write-Output "Running bootstrap.bat"
     ./bootstrap.bat