From 18a55ef6c9b877f62272dee65b44b9d099f3e074 Mon Sep 17 00:00:00 2001 From: sdarwin Date: Mon, 20 Jan 2025 08:11:57 -0700 Subject: [PATCH] build_docs: remove --ignore flag (not working) --- build_docs/linuxdocs.sh | 8 ++++---- build_docs/macosdocs.sh | 6 +++--- build_docs/windowsdocs.ps1 | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build_docs/linuxdocs.sh b/build_docs/linuxdocs.sh index cd7f786..f5a0c4e 100755 --- a/build_docs/linuxdocs.sh +++ b/build_docs/linuxdocs.sh @@ -413,7 +413,7 @@ if [ "$skipboostoption" != "yes" ] && [ "$typeoption" != "antora" ] ; then # if [ "$typeoption" = "main" ]; then # git submodule update --init tools/auto_index - # python3 tools/boostdep/depinst/depinst.py --ignore "${REPONAME}" -vv ../tools/auto_index + # python3 tools/boostdep/depinst/depinst.py -vv ../tools/auto_index # # recopy the library if it was overwritten. # if [ ! "${BOOSTROOTLIBRARY}" = "yes" ]; then @@ -424,11 +424,11 @@ if [ "$skipboostoption" != "yes" ] && [ "$typeoption" != "antora" ] ; then # 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. + # depinst.py --ignore "${REPONAME}" doesn't work as hoped. Perhaps a new --preserve 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 + python3 tools/boostdep/depinst/depinst.py ../tools/auto_index + python3 tools/boostdep/depinst/depinst.py ../tools/quickbook # recopy the library if it was overwritten. if [ ! "${BOOSTROOTLIBRARY}" = "yes" ]; then diff --git a/build_docs/macosdocs.sh b/build_docs/macosdocs.sh index f4c89d8..72a0cab 100755 --- a/build_docs/macosdocs.sh +++ b/build_docs/macosdocs.sh @@ -454,11 +454,11 @@ if [ "$skipboostoption" != "yes" ] && [ "$typeoption" != "antora" ] ; then # 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. + # depinst.py --ignore "${REPONAME}" doesn't work as hoped. Perhaps a new --preserve 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 + python3 tools/boostdep/depinst/depinst.py ../tools/auto_index + python3 tools/boostdep/depinst/depinst.py ../tools/quickbook # recopy the library if it was overwritten. if [ ! "${BOOSTROOTLIBRARY}" = "yes" ]; then diff --git a/build_docs/windowsdocs.ps1 b/build_docs/windowsdocs.ps1 index 8e2dc5a..79ab407 100755 --- a/build_docs/windowsdocs.ps1 +++ b/build_docs/windowsdocs.ps1 @@ -609,9 +609,9 @@ if ( -Not ${skip-boost} ) { git submodule update --init tools/boostlook git submodule update --init tools/auto_index - # However, "--ignore $REPONAME" is not yet working. - python tools/boostdep/depinst/depinst.py --ignore $REPONAME ../tools/quickbook - python tools/boostdep/depinst/depinst.py --ignore $REPONAME ../tools/auto_index + # depinst.py --ignore "${REPONAME}" doesn't work as hoped. Perhaps a new --preserve + 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") ) {