diff options
-rw-r--r-- | docs/etc/conf.py | 13 | ||||
-rwxr-xr-x | utils/docu-build-new.sh | 19 |
2 files changed, 15 insertions, 17 deletions
diff --git a/docs/etc/conf.py b/docs/etc/conf.py index 486983f19..671965378 100644 --- a/docs/etc/conf.py +++ b/docs/etc/conf.py @@ -2,16 +2,9 @@ import datetime import sys import os -try: - __import__('imp').find_module('sphinx.ext.numfig') - extensions = ['sphinx.ext.numfig'] -except ImportError: - # 'pip install sphinx_numfig' - extensions = ['sphinx_numfig'] +needs_sphinx = '1.3' -# numfig: -number_figures = True -figure_caption_prefix = "Fig." +numfig = True source_suffix = '.rst' master_doc = 'index' @@ -31,4 +24,4 @@ latex_elements = { project = u'Copper: Virtual Infrastructure Deployment Policies' copyright = u'%s, OPNFV' % datetime.date.today().year version = u'1.0.0' -release = u'1.0.0'
\ No newline at end of file +release = u'1.0.0' diff --git a/utils/docu-build-new.sh b/utils/docu-build-new.sh index 00d046479..67a62e381 100755 --- a/utils/docu-build-new.sh +++ b/utils/docu-build-new.sh @@ -29,17 +29,22 @@ while read -d $'\n'; do done < <(find docs/ -name 'index.rst' -printf '%h\n' | sort -u ) for dir in "${{directories[@]}}"; do + _name="${{dir##*/}}" + _build="${{dir}}/build" + _output="docs/output/${{_name}}" echo - echo "#############################" - echo "Building DOCS in ${{dir##*/}}" - echo "#############################" + echo "#################${{_name//?/#}}" + echo "Building DOCS in ${{_name}}" + echo "#################${{_name//?/#}}" echo - if [[ ! -d docs/output/"${{dir##*/}}/" ]]; then - mkdir -p docs/output/"${{dir##*/}}/" - fi + mkdir -p "${{_output}}" + + sphinx-build -b html -E -c docs/etc "${{dir}}" "${{_output}}" - sphinx-build -b html -E -c docs/etc/ ""$dir"/" docs/output/"${{dir##*/}}/" + sphinx-build -b latex -E -c docs/etc "${{dir}}" "${{_build}}" + make -C "${{_build}}" LATEXOPTS='--interaction=nonstopmode' all-pdf + mv "${{_build}}"/*.pdf "${{_output}}" done |