1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup: use 2 space indentation for shell scripts

Browse Source 
Already used by install_deps.sh
This commit is contained in:
Campbell Barton 2019-04-17 06:08:01 +02:00
parent ca245b2b40
commit 53e3fcdce4
2 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build_files/utils/build_tgz.sh
View File

@ -12,11 +12,11 @@ blender_version_cycle=$(grep "BLENDER_VERSION_CYCLE\s" "$blender_srcdir/source/b
blender_subversion=$(grep "BLENDER_SUBVERSION\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}') blender_subversion=$(grep "BLENDER_SUBVERSION\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
if [ "$blender_version_cycle" = "release" ] ; then if [ "$blender_version_cycle" = "release" ] ; then
VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)$blender_version_char VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)$blender_version_char
SUBMODULE_EXCLUDE="^\(release/scripts/addons_contrib\)$" SUBMODULE_EXCLUDE="^\(release/scripts/addons_contrib\)$"
else else
VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)_$blender_subversion VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)_$blender_subversion
SUBMODULE_EXCLUDE="^$" # dummy regex SUBMODULE_EXCLUDE="^$" # dummy regex
fi fi
MANIFEST="blender-$VERSION-manifest.txt" MANIFEST="blender-$VERSION-manifest.txt"
@ -42,10 +42,10 @@ git ls-files | python3 -c "$FILTER_FILES_PY" > $BASE_DIR/$MANIFEST
# Enumerate submodules # Enumerate submodules
for lcv in $(git submodule | awk '{print $2}' | grep -v "$SUBMODULE_EXCLUDE"); do for lcv in $(git submodule | awk '{print $2}' | grep -v "$SUBMODULE_EXCLUDE"); do
cd "$BASE_DIR" cd "$BASE_DIR"
cd "$blender_srcdir/$lcv" cd "$blender_srcdir/$lcv"
git ls-files | python3 -c "$FILTER_FILES_PY" | awk '$0="'"$lcv"/'"$0' >> $BASE_DIR/$MANIFEST git ls-files | python3 -c "$FILTER_FILES_PY" | awk '$0="'"$lcv"/'"$0' >> $BASE_DIR/$MANIFEST
cd "$BASE_DIR" cd "$BASE_DIR"
done done
echo "OK" echo "OK"
@ -54,10 +54,10 @@ echo "OK"
cd "$blender_srcdir" cd "$blender_srcdir"
echo -n "Creating archive: \"$BASE_DIR/$TARBALL\" ..." echo -n "Creating archive: \"$BASE_DIR/$TARBALL\" ..."
tar --transform "s,^,blender-$VERSION/,g" \ tar --transform "s,^,blender-$VERSION/,g" \
--use-compress-program="gzip --best" \ --use-compress-program="gzip --best" \
--create \ --create \
--file="$BASE_DIR/$TARBALL" \ --file="$BASE_DIR/$TARBALL" \
--files-from="$BASE_DIR/$MANIFEST" --files-from="$BASE_DIR/$MANIFEST"
echo "OK" echo "OK"

142
doc/python_api/sphinx_doc_gen.sh
View File

@ -14,16 +14,16 @@ DO_OUT_HTML_ZIP=true
DO_OUT_PDF=false DO_OUT_PDF=false
if [ -z $BLENDER_BIN ] ; then if [ -z $BLENDER_BIN ] ; then
BLENDER_BIN="./blender.bin" BLENDER_BIN="./blender.bin"
fi fi
if [ "$1" == "" ] ; then if [ "$1" == "" ] ; then
echo "Expected a single argument for the username on blender.org, skipping upload step!" echo "Expected a single argument for the username on blender.org, skipping upload step!"
DO_UPLOAD=false DO_UPLOAD=false
else else
SSH_USER=$1 SSH_USER=$1
SSH_HOST=$SSH_USER"@blender.org" SSH_HOST=$SSH_USER"@blender.org"
SSH_UPLOAD="/data/www/vhosts/www.blender.org/api" # blender_python_api_VERSION, added after SSH_UPLOAD="/data/www/vhosts/www.blender.org/api" # blender_python_api_VERSION, added after
fi fi
@ -42,9 +42,9 @@ blender_subversion=$(grep "BLENDER_SUBVERSION\s" "$blender_version_header" | awk
unset blender_version_header unset blender_version_header
if [ "$blender_version_cycle" = "release" ] ; then if [ "$blender_version_cycle" = "release" ] ; then
BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)$blender_version_char"_release" BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)$blender_version_char"_release"
else else
BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)_$blender_subversion BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)_$blender_subversion
fi fi
SSH_UPLOAD_FULL=$SSH_UPLOAD/"blender_python_api_"$BLENDER_VERSION SSH_UPLOAD_FULL=$SSH_UPLOAD/"blender_python_api_"$BLENDER_VERSION
@ -58,54 +58,54 @@ SPHINX_WORKDIR="$(mktemp --directory --suffix=.sphinx)"
# Generate reStructuredText (blender/python only) # Generate reStructuredText (blender/python only)
if $DO_EXE_BLENDER ; then if $DO_EXE_BLENDER ; then
# Don't delete existing docs, now partial updates are used for quick builds. # Don't delete existing docs, now partial updates are used for quick builds.
# #
# Disable ASAN error halt since it results in nonzero exit code on any minor issue. # Disable ASAN error halt since it results in nonzero exit code on any minor issue.
ASAN_OPTIONS=halt_on_error=0 \ ASAN_OPTIONS=halt_on_error=0 \
$BLENDER_BIN \ $BLENDER_BIN \
--background \ --background \
-noaudio \ -noaudio \
--factory-startup \ --factory-startup \
--python-exit-code 1 \ --python-exit-code 1 \
--python $SPHINXBASE/sphinx_doc_gen.py \ --python $SPHINXBASE/sphinx_doc_gen.py \
-- \ -- \
--output=$SPHINX_WORKDIR --output=$SPHINX_WORKDIR
if (($? != 0)) ; then if (($? != 0)) ; then
echo "Generating documentation failed, aborting" echo "Generating documentation failed, aborting"
exit 1 exit 1
fi fi
fi fi
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Generate HTML (sphinx) # Generate HTML (sphinx)
if $DO_OUT_HTML ; then if $DO_OUT_HTML ; then
# sphinx-build -n -b html $SPHINX_WORKDIR/sphinx-in $SPHINX_WORKDIR/sphinx-out # sphinx-build -n -b html $SPHINX_WORKDIR/sphinx-in $SPHINX_WORKDIR/sphinx-out
# annoying bug in sphinx makes it very slow unless we do this. should report. # annoying bug in sphinx makes it very slow unless we do this. should report.
cd $SPHINX_WORKDIR cd $SPHINX_WORKDIR
sphinx-build -b html sphinx-in sphinx-out sphinx-build -b html sphinx-in sphinx-out
# XXX, saves space on upload and zip, should move HTML outside # XXX, saves space on upload and zip, should move HTML outside
# and zip up there, for now this is OK # and zip up there, for now this is OK
rm -rf sphinx-out/.doctrees rm -rf sphinx-out/.doctrees
# in case we have a zip already # in case we have a zip already
rm -f blender_python_reference_$BLENDER_VERSION.zip rm -f blender_python_reference_$BLENDER_VERSION.zip
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------
# ZIP the HTML dir for upload # ZIP the HTML dir for upload
if $DO_OUT_HTML_ZIP ; then if $DO_OUT_HTML_ZIP ; then
# lame, temp rename dir # lame, temp rename dir
mv sphinx-out blender_python_reference_$BLENDER_VERSION mv sphinx-out blender_python_reference_$BLENDER_VERSION
zip -r -9 blender_python_reference_$BLENDER_VERSION.zip blender_python_reference_$BLENDER_VERSION zip -r -9 blender_python_reference_$BLENDER_VERSION.zip blender_python_reference_$BLENDER_VERSION
mv blender_python_reference_$BLENDER_VERSION sphinx-out mv blender_python_reference_$BLENDER_VERSION sphinx-out
fi fi
cd - cd -
fi fi
@ -113,11 +113,11 @@ fi
# Generate PDF (sphinx/laytex) # Generate PDF (sphinx/laytex)
if $DO_OUT_PDF ; then if $DO_OUT_PDF ; then
cd $SPHINX_WORKDIR cd $SPHINX_WORKDIR
sphinx-build -n -b latex $SPHINX_WORKDIR/sphinx-in $SPHINX_WORKDIR/sphinx-out sphinx-build -n -b latex $SPHINX_WORKDIR/sphinx-in $SPHINX_WORKDIR/sphinx-out
make -C $SPHINX_WORKDIR/sphinx-out make -C $SPHINX_WORKDIR/sphinx-out
mv $SPHINX_WORKDIR/sphinx-out/contents.pdf \ mv $SPHINX_WORKDIR/sphinx-out/contents.pdf \
$SPHINX_WORKDIR/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf $SPHINX_WORKDIR/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf
fi fi
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
@ -125,35 +125,35 @@ fi
if $DO_UPLOAD ; then if $DO_UPLOAD ; then
ssh $SSH_USER@blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*' ssh $SSH_USER@blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*'
rsync --progress -ave "ssh -p 22" $SPHINX_WORKDIR/sphinx-out/* $SSH_HOST:$SSH_UPLOAD_FULL/ rsync --progress -ave "ssh -p 22" $SPHINX_WORKDIR/sphinx-out/* $SSH_HOST:$SSH_UPLOAD_FULL/
## symlink the dir to a static URL ## symlink the dir to a static URL
#ssh $SSH_USER@blender.org 'rm '$SSH_UPLOAD'/250PythonDoc && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/250PythonDoc' #ssh $SSH_USER@blender.org 'rm '$SSH_UPLOAD'/250PythonDoc && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/250PythonDoc'
if [ "$blender_version_cycle" = "release" ] ; then if [ "$blender_version_cycle" = "release" ] ; then
ssh $SSH_USER@blender.org 'rm '$SSH_UPLOAD'/blender_python_api_current && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/blender_python_api_current' ssh $SSH_USER@blender.org 'rm '$SSH_UPLOAD'/blender_python_api_current && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/blender_python_api_current'
fi fi
# better redirect # better redirect
ssh $SSH_USER@blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/250PythonDoc/index.html' ssh $SSH_USER@blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/250PythonDoc/index.html'
# redirect for release only so wiki can point here # redirect for release only so wiki can point here
if [ "$blender_version_cycle" = "release" ] ; then if [ "$blender_version_cycle" = "release" ] ; then
ssh $SSH_USER@blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/blender_python_api/index.html' ssh $SSH_USER@blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/blender_python_api/index.html'
fi fi
if $DO_OUT_PDF ; then if $DO_OUT_PDF ; then
# rename so local PDF has matching name. # rename so local PDF has matching name.
rsync --progress -ave "ssh -p 22" \ rsync --progress -ave "ssh -p 22" \
$SPHINX_WORKDIR/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf \ $SPHINX_WORKDIR/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf \
$SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.pdf $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.pdf
fi fi
if $DO_OUT_HTML_ZIP ; then if $DO_OUT_HTML_ZIP ; then
rsync --progress -ave "ssh -p 22" \ rsync --progress -ave "ssh -p 22" \
$SPHINX_WORKDIR/blender_python_reference_$BLENDER_VERSION.zip \ $SPHINX_WORKDIR/blender_python_reference_$BLENDER_VERSION.zip \
$SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.zip $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.zip
fi fi
fi fi