diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2015-11-26 20:24:56 +0900 |
|---|---|---|
| committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2015-11-26 20:26:05 +0900 |
| commit | 42db505c97fe9525d3a9aa67f5b79923e3723a28 (patch) | |
| tree | 1d30e31be6e46d44fa299808e8788d56ed8dd247 | |
| parent | 2ea0acb61e3ff686af94194fa5c4f7475d8d1f89 (diff) | |
jjb: fix doc build to support multiple depth of dirs
JIRA: RELENG-16
Change-Id: I86293f9b79c083f286f9036a3137465513e92d17
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
| -rw-r--r-- | docs/etc/conf.py | 10 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/docs/etc/conf.py b/docs/etc/conf.py index 6245cc069..f42b11055 100644 --- a/docs/etc/conf.py +++ b/docs/etc/conf.py @@ -2,7 +2,11 @@ Base configuration file for sphinx-build. You can override this configuration by putting 'conf.py' in the document -directory (e.g. how-to-use-docs/conf.py). +directory (e.g. how-to-use-docs/conf.py). If there is no 'conf.py' in the +document directory, this file will be copied to that directory before the +document builder jobs in 'opnfv-docs-verify' and 'opnfv-docs-merge'. +The logo image (opnfv-logo.png) will be also copied from +docs/etc/opnfv-logo.png during the build jobs. ''' import datetime @@ -13,10 +17,10 @@ pygments_style = 'sphinx' html_use_index = False numfig = True -html_logo = '../etc/opnfv-logo.png' +html_logo = 'opnfv-logo.png' latex_elements = {'printindex': ''} -latex_logo = '../etc/opnfv-logo.png' +latex_logo = 'opnfv-logo.png' copyright = u'%s, OPNFV' % datetime.date.today().year version = u'1.0.0' diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index a36f134b5..5ef8a170e 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -187,6 +187,7 @@ _title=$(cd $dir; python -c "$_get_title_script") echo "latex_documents = [('index', '$_name.tex', '$_title', 'OPNFV', 'manual'),]" >> "$dir/conf.py" fi + cp -f "docs/etc/opnfv-logo.png" "$dir/opnfv-logo.png" mkdir -p "$_output" |