build_docs updates (#75)

* build_docs: display output directory more clearly. macos updates. * build_docs: switch back to rsync
boostorg · Aug 6, 2024 · b17c0bc · b17c0bc
1 parent 062850d
commit b17c0bc
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 19 deletions.
diff --git 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
 
@@ -406,7 +408,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 +417,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
@@ -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
@@ -281,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
@@ -306,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
 
@@ -352,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
 
@@ -436,7 +452,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 +461,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
@@ -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 ""
 }