mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 19:03:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

More fixes for update_web_docs_svn for jit docs (PR jit/64257)

Browse Source 
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
This commit is contained in:
David Malcolm 2015-02-04 19:11:48 +00:00 committed by David Malcolm
parent 7e36ec2ea2
commit a4be4e91d2
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/jit/ChangeLog
View File

@ -1,3 +1,9 @@
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

2
gcc/jit/docs/conf.py
View File

@ -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

6
maintainer-scripts/ChangeLog
View File

@ -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

18
maintainer-scripts/update_web_docs_svn
View File

@ -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