From f0ce9fb0d3049710f444d6ede44a8a9851b86703 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 22 Jul 2019 11:49:57 +0200 Subject: [PATCH] Remove firstapp guide The firstapp document has been removed: * Remove links to firstapp document * Remove tooling for building it, remove also tooling for separate distribution install-guide, this is not done anymore. This includes removing tooling for building with tags. Change-Id: I5de578590237aefe31546dd7c1dce56f30e98774 --- tools/build-rst.sh | 29 ++++++----------------------- tools/generatepot-rst.sh | 10 +--------- www/de/index.html | 9 --------- 3 files changed, 7 insertions(+), 41 deletions(-) diff --git a/tools/build-rst.sh b/tools/build-rst.sh index c6a7a59dc3..06eadada55 100755 --- a/tools/build-rst.sh +++ b/tools/build-rst.sh @@ -17,7 +17,6 @@ DIRECTORY=$1 if [ -z "$DIRECTORY" ] ; then echo "usage $0 DIRECTORY options" echo "Options are:" - echo "--tag TAG: Use given tag for building" echo "--target TARGET: Copy files to publish-docs/$TARGET" echo "--build BUILD: Name of build directory" echo "--linkcheck: Check validity of links instead of building" @@ -26,8 +25,6 @@ if [ -z "$DIRECTORY" ] ; then fi TARGET="" -TAG="" -TAG_OPT="" BUILD="" LINKCHECK="" PDF="" @@ -42,11 +39,6 @@ while [[ $# > 0 ]] ; do --linkcheck) LINKCHECK=1 ;; - --tag) - TAG="$2" - TAG_OPT="-t $2" - shift - ;; --target) TARGET="$2" shift @@ -60,13 +52,8 @@ done if [ -z "$BUILD" ] ; then - if [ -z "$TAG" ] ; then - BUILD_DIR="$DIRECTORY/build/html" - BUILD_DIR_PDF="$DIRECTORY/build/pdf" - else - BUILD_DIR="$DIRECTORY/build-${TAG}/html" - BUILD_DIR_PDF="$DIRECTORY/build-${TAG}/pdf" - fi + BUILD_DIR="$DIRECTORY/build/html" + BUILD_DIR_PDF="$DIRECTORY/build/pdf" else BUILD_DIR="$DIRECTORY/$BUILD/html" BUILD_DIR_PDF="$DIRECTORY/$BUILD/pdf" @@ -74,30 +61,26 @@ fi DOCTREES="${BUILD_DIR}.doctrees" -if [ -z "$TAG" ] ; then - echo "Checking $DIRECTORY..." -else - echo "Checking $DIRECTORY with tag $TAG..." -fi +echo "Checking $DIRECTORY..." if [ "$LINKCHECK" = "1" ] ; then # Show sphinx-build invocation for easy reproduction set -x sphinx-build -E -W -d $DOCTREES -b linkcheck \ - $TAG_OPT $DIRECTORY/source $BUILD_DIR + $DIRECTORY/source $BUILD_DIR set +x else # Show sphinx-build invocation for easy reproduction set -x sphinx-build -E -W -d $DOCTREES -b html \ - $TAG_OPT $DIRECTORY/source $BUILD_DIR + $DIRECTORY/source $BUILD_DIR set +x # PDF generation if [ "$PDF" = "1" ] ; then set -x sphinx-build -E -W -d $DOCTREES -b latex \ - $TAG_OPT $DIRECTORY/source $BUILD_DIR_PDF + $DIRECTORY/source $BUILD_DIR_PDF make -C $BUILD_DIR_PDF cp $BUILD_DIR_PDF/*.pdf $BUILD_DIR/ set +x diff --git a/tools/generatepot-rst.sh b/tools/generatepot-rst.sh index 49834f62dd..efbf5fe47f 100755 --- a/tools/generatepot-rst.sh +++ b/tools/generatepot-rst.sh @@ -59,15 +59,7 @@ fi rm -f ${DIRECTORY}/source/locale/$DOCNAME.pot -# We need to extract all strings, so add all supported tags -TAG="" -if [ ${DOCNAME} = "install-guide" ] ; then - TAG="-t obs -t rdo -t ubuntu -t debian" -fi -if [ ${DOCNAME} = "firstapp" ] ; then - TAG="-t libcloud -t dotnet -t fog -t pkgcloud -t shade" -fi -sphinx-build -j $NUMBER_OF_CORES -b gettext $TAG ${DIRECTORY}/source/ \ +sphinx-build -j $NUMBER_OF_CORES -b gettext ${DIRECTORY}/source/ \ ${DIRECTORY}/source/locale/ if [[ "$REPOSITORY" = "openstack-manuals" && "$DOCNAME" = "common" ]] ; then diff --git a/www/de/index.html b/www/de/index.html index b581d0d361..14cf152132 100644 --- a/www/de/index.html +++ b/www/de/index.html @@ -71,15 +71,6 @@ API Guides

OpenStack API Dokumentation

API Guide -

Schreiben Sie Ihre erste OpenStack Anwendung (FirstApp)

- - mit Libcloud| - mit Shade