From b386f91713e2ec860181c352253b621cb20d70e7 Mon Sep 17 00:00:00 2001 From: sdarwin Date: Tue, 6 Aug 2024 10:53:26 -0600 Subject: [PATCH 1/2] build_docs: display output directory more clearly. macos updates. --- build_docs/linuxdocs.sh | 4 ++-- build_docs/macosdocs.sh | 18 ++++++++++++++++-- build_docs/windowsdocs.ps1 | 4 ++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/build_docs/linuxdocs.sh b/build_docs/linuxdocs.sh index 1008cf1..b08b33e 100755 --- a/build_docs/linuxdocs.sh +++ b/build_docs/linuxdocs.sh @@ -406,7 +406,7 @@ fi if [ "${BOOSTROOTLIBRARY}" = "yes" ]; then echo "" - echo "Build completed. Check the doc/ directory." + echo "Build completed. View the results in $librarypath/doc/html" echo "" else if [ "$BOOSTROOTRELPATH" = "." ]; then @@ -415,6 +415,6 @@ else pathfiller="/${BOOSTROOTRELPATH}/" fi echo "" - echo "Build completed. Check the results in ${BOOST_SRC_FOLDER}${pathfiller}boost-root/$librarypath/doc" + echo "Build completed. View the results in ${BOOST_SRC_FOLDER}${pathfiller}boost-root/$librarypath/doc/html" echo "" fi diff --git a/build_docs/macosdocs.sh b/build_docs/macosdocs.sh index b53bf66..1f56ac8 100755 --- a/build_docs/macosdocs.sh +++ b/build_docs/macosdocs.sh @@ -184,6 +184,20 @@ echo '==================================> INSTALL' if [ "$skippackagesoption" != "yes" ]; then + brew install ruby + sudo ln -s /opt/homebrew/opt/ruby/bin/ruby /usr/local/bin/ruby || true + sudo ln -s /opt/homebrew/opt/ruby/bin/gem /usr/local/bin/gem || true + gem_bin_path=`gem environment gemdir`/bin + export PATH=${gem_bin_path}:$PATH + + if grep $gem_bin_path ~/.zprofile; then + echo ".zprofile already has gem path set" + true + else + echo "Modifying .zprofile to include gems in PATH" + echo "export PATH=$gem_bin_path:\$PATH" >> ~/.zprofile + fi + brew install doxygen brew install wget # deprecated in 2021 @@ -436,7 +450,7 @@ fi if [ "${BOOSTROOTLIBRARY}" = "yes" ]; then echo "" - echo "Build completed. Check the doc/ directory." + echo "Build completed. View the results in $librarypath/doc/html" echo "" else if [ "$BOOSTROOTRELPATH" = "." ]; then @@ -445,6 +459,6 @@ else pathfiller="/${BOOSTROOTRELPATH}/" fi echo "" - echo "Build completed. Check the results in ${BOOST_SRC_FOLDER}${pathfiller}boost-root/$librarypath/doc" + echo "Build completed. View the results in ${BOOST_SRC_FOLDER}${pathfiller}boost-root/$librarypath/doc/html" echo "" fi diff --git a/build_docs/windowsdocs.ps1 b/build_docs/windowsdocs.ps1 index 8162009..858655c 100755 --- a/build_docs/windowsdocs.ps1 +++ b/build_docs/windowsdocs.ps1 @@ -644,7 +644,7 @@ elseif ($typeoption -eq "cppalv1") { if ($BOOSTROOTLIBRARY -eq "yes") { echo "" - echo "Build completed. Check the doc/ directory." + echo "Build completed. View the results in $librarypath/doc/html" echo "" } else { @@ -655,7 +655,7 @@ else { $pathfiller="/${BOOSTROOTRELPATH}/" } echo "" - echo "Build completed. Check the results in ${BOOST_SRC_FOLDER}${pathfiller}boost-root/$librarypath/doc" + echo "Build completed. View the results in ${BOOST_SRC_FOLDER}${pathfiller}boost-root/$librarypath/doc/html" echo "" } From 170e769fc13b7adabffee41cda284e72e4dd1945 Mon Sep 17 00:00:00 2001 From: sdarwin Date: Tue, 6 Aug 2024 12:34:48 -0600 Subject: [PATCH 2/2] build_docs: switch back to rsync --- build_docs/linuxdocs.sh | 16 +++++++++------- build_docs/macosdocs.sh | 14 ++++++++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/build_docs/linuxdocs.sh b/build_docs/linuxdocs.sh index b08b33e..d35c42d 100755 --- a/build_docs/linuxdocs.sh +++ b/build_docs/linuxdocs.sh @@ -261,9 +261,10 @@ if [ "$skipboostoption" = "yes" ] ; then cd boost-root export BOOST_ROOT=$(pwd) librarypath=$(getlibrarypath $REPONAME) - mkdir -p $librarypath - cp -r ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} - # rsync -av $BOOST_SRC_FOLDER/ $librarypath + mkdir -p $librarypath + # running cp multiple times will fail to overwrite certain .git files + # cp -r ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} || true + rsync -av --exclude 'boost-root' $BOOST_SRC_FOLDER/ $librarypath fi fi else @@ -287,8 +288,9 @@ else export BOOST_ROOT=$(pwd) librarypath=$(getlibrarypath $REPONAME) mkdir -p $librarypath - cp -r ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} - # rsync -av $BOOST_SRC_FOLDER/ $librarypath + # running cp multiple times will fail to overwrite certain .git files + # cp -r ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} || true + rsync -av --exclude 'boost-root' $BOOST_SRC_FOLDER/ $librarypath fi fi @@ -331,8 +333,8 @@ if [ "$skipboostoption" != "yes" ] ; then # recopy the library if it was overwritten. if [ ! "${BOOSTROOTLIBRARY}" = "yes" ]; then - cp -rf ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} - # rsync -av --delete $BOOST_SRC_FOLDER/ $librarypath + # cp -rf ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} + rsync -av --exclude 'boost-root' --delete $BOOST_SRC_FOLDER/ $librarypath fi fi diff --git a/build_docs/macosdocs.sh b/build_docs/macosdocs.sh index 1f56ac8..456b44d 100755 --- a/build_docs/macosdocs.sh +++ b/build_docs/macosdocs.sh @@ -295,8 +295,9 @@ if [ "$skipboostoption" = "yes" ] ; then export BOOST_ROOT=$(pwd) librarypath=$(getlibrarypath $REPONAME) mkdir -p $librarypath - cp -r ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} - # rsync -av $BOOST_SRC_FOLDER/ $librarypath + # running cp multiple times will fail to overwrite certain .git files + # cp -r ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} || true + rsync -av --exclude 'boost-root' $BOOST_SRC_FOLDER/ $librarypath fi fi else @@ -320,8 +321,9 @@ else export BOOST_ROOT=$(pwd) librarypath=$(getlibrarypath $REPONAME) mkdir -p $librarypath - cp -r ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} - # rsync -av $BOOST_SRC_FOLDER/ $librarypath + # running cp multiple times will fail to overwrite certain .git files + # cp -r ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} || true + rsync -av --exclude 'boost-root' $BOOST_SRC_FOLDER/ $librarypath fi fi @@ -366,8 +368,8 @@ if [ "$skipboostoption" != "yes" ] ; then # recopy the library if it was overwritten. if [ ! "${BOOSTROOTLIBRARY}" = "yes" ]; then - cp -rf ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} - # rsync -av --delete $BOOST_SRC_FOLDER/ $librarypath + # cp -rf ${BOOST_SRC_FOLDER}/!(boost-root) ${librarypath} + rsync -av --exclude 'boost-root' --delete $BOOST_SRC_FOLDER/ $librarypath fi fi