Fix RST languages

Add handling of user-guide and user-guide-admin, fix wrong path for all
RST files.

Change-Id: Ic71711dc8f2acd3a4f8d127d1ff9de5e6d279acd
This commit is contained in:
Andreas Jaeger 2015-05-12 09:24:54 +02:00
parent fc33f23051
commit 552c693585
2 changed files with 11 additions and 6 deletions

View File

@ -7,6 +7,8 @@ Release notes
* ``openstack-doc-test``: Sort entries in index.html file.
* ``diff_branches.py``: Add options containing DEPRECATED in their help
string to the deprecation list.
* ``doc-tools-check-languages``: Fix bugs in RST handling that broke
handling of user-guide and user-guide-admin.
0.27
----

View File

@ -38,15 +38,18 @@ function build_rst {
language=$1
book=$2
# Generate glossary first
tools/glossary2rst.py doc/${book}/source/glossary.rst
# First build all the single po files
# Note that we need to run inside a venv since the venv we are run in
# uses SitePackages=True and we have to install Sphinx in the venv
# together with openstackdocstheme. With SitePackages, the global Sphinx
# is used and that will not work with a local openstackdocstheme installed.
tox -evenv "sphinx-build -W -b gettext doc/${book}/source/ doc/${book}/source/locale/"
if [ ${book} == "user-guide" ] ; then
TAG="-t user_only"
fi
if [ ${book} == "user-guide-admin" ] ; then
TAG="-t admin_only"
fi
tox -evenv "sphinx-build -W -b gettext $TAG doc/${book}/source/ doc/${book}/source/locale/"
# Now run msgmerge on all files
for f in doc/${book}/source/locale/*.pot ; do
@ -75,10 +78,10 @@ function build_rst {
mkdir -p publish-docs/${language}/user-guide-admin/
rsync -a doc/user-guides/build-admin/html/ publish-docs/${language}/user-guide-admin/
else
tox -evenv "sphinx-build -D language=${language} doc/${book}/source/ \
tox -evenv "sphinx-build $TAG -D language=${language} doc/${book}/source/ \
doc/${book}/build/html"
mkdir -p publish-docs/${language}/${book}/
rsync -a doc/${book}/build-admin/html/ publish-docs/${language}/${book}/
rsync -a doc/${book}/build/html/ publish-docs/${language}/${book}/
fi
}