Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build_docs updates #75

Merged
merged 2 commits into from
Aug 6, 2024
Merged

build_docs updates #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b386f91
build_docs: display output directory more clearly. macos updates.
sdarwin Aug 6, 2024
170e769
build_docs: switch back to rsync
sdarwin Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions build_docs/linuxdocs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
32 changes: 24 additions & 8 deletions build_docs/macosdocs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions build_docs/windowsdocs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 ""
}

Expand Down
Loading