diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2015-02-04 19:11:48 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2015-02-04 19:11:48 +0000 |
| commit | a4be4e91d20c89ff2058d13ec957b588b1c272a4 (patch) | |
| tree | b4fb9d7b5429da6c2b1326d28422c5e129557b56 | |
| parent | 7e36ec2ea2dd522f028438ec0588545dc935b284 (diff) | |
| download | gcc-a4be4e91d20c89ff2058d13ec957b588b1c272a4.zip gcc-a4be4e91d20c89ff2058d13ec957b588b1c272a4.tar.gz gcc-a4be4e91d20c89ff2058d13ec957b588b1c272a4.tar.bz2 | |
More fixes for update_web_docs_svn for jit docs (PR jit/64257)
gcc/jit/ChangeLog:
PR jit/64257
* docs/conf.py (html_theme): Change from 'pyramid'
to 'sphinxdoc'.
maintainer-scripts/ChangeLog:
PR jit/64257
* update_web_docs_svn: Update build of jit docs to use EPEL6
variant install of sphinx 1.0.8, rather than 0.6.6.
From-SVN: r220412
| -rw-r--r-- | gcc/jit/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/jit/docs/conf.py | 2 | ||||
| -rw-r--r-- | maintainer-scripts/ChangeLog | 6 | ||||
| -rwxr-xr-x | maintainer-scripts/update_web_docs_svn | 18 |
4 files changed, 27 insertions, 5 deletions
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog index 0ea101d..fa138a9 100644 --- a/gcc/jit/ChangeLog +++ b/gcc/jit/ChangeLog @@ -1,5 +1,11 @@ 2015-02-04 David Malcolm <dmalcolm@redhat.com> + PR jit/64257 + * docs/conf.py (html_theme): Change from 'pyramid' + to 'sphinxdoc'. + +2015-02-04 David Malcolm <dmalcolm@redhat.com> + * docs/topics/contexts.rst (gcc_jit_context_acquire): Fix typo. * docs/_build/texinfo/libgccjit.texi: Regenerate. diff --git a/gcc/jit/docs/conf.py b/gcc/jit/docs/conf.py index 1bdc081..8f4dd8b 100644 --- a/gcc/jit/docs/conf.py +++ b/gcc/jit/docs/conf.py @@ -107,7 +107,7 @@ pygments_style = 'sphinx' # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'pyramid' +html_theme = 'sphinxdoc' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index 6def1ae..f802139 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,3 +1,9 @@ +2015-02-04 David Malcolm <dmalcolm@redhat.com> + + PR jit/64257 + * update_web_docs_svn: Update build of jit docs to use EPEL6 + variant install of sphinx 1.0.8, rather than 0.6.6. + 2015-01-26 David Malcolm <dmalcolm@redhat.com> PR jit/64257 diff --git a/maintainer-scripts/update_web_docs_svn b/maintainer-scripts/update_web_docs_svn index ac3bae6..2544211 100755 --- a/maintainer-scripts/update_web_docs_svn +++ b/maintainer-scripts/update_web_docs_svn @@ -166,11 +166,21 @@ for file in $MANUALS; do done # The jit is a special-case, using sphinx rather than texinfo. -# The jit Makefile uses "sphinx-build". This is packaged in -# Fedora and EPEL 6 within "python-sphinx", and in openSUSE -# within "python-Sphinx". +# Specifically, the jit docs need sphinx 1.0 or later. +# +# The jit/docs Makefile uses the executable $(SPHINXBUILD), +# defaulting to "sphinx-build". +# +# sphinx is packaged in Fedora and EPEL 6 within "python-sphinx", +# and in openSUSE within "python-Sphinx". +# +# For EPEL6, python-sphinx is sphinx 0.6.6, which is missing various +# directives (e.g. ":c:macro:"), so we need the variant +# python-sphinx10 package. The latter installs its executable as +# /usr/bin/sphinx-1.0-build +# so we need to override SPHINXBUILD with this when invoking "make". pushd gcc/gcc/jit/docs -make html +make SPHINXBUILD=/usr/bin/sphinx-1.0-build html popd cp -a gcc/gcc/jit/docs/_build/html jit mkdir -p $DOCSDIR/jit |