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

diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index 0ea101de0caa61e50e7396da7301d7e124d6ef17..fa138a977b941d25f07cbe654e693a9e7d0ca320 100644 (file)
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -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

diff --git a/gcc/jit/docs/conf.py b/gcc/jit/docs/conf.py
index 1bdc081be4b1ef723d0f3127ea1fc9570fc74e01..8f4dd8bb89a71ffe1ff2d83c12d4e1bdf881bbee 100644 (file)
--- 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 6def1ae788b9a037d5983ecb6b0dbe69f0fb3002..f80213902cc4691ad0ebc9dff495695c02495258 100644 (file)
--- 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 ac3bae6451fcc03785ea829ae5cb0761f447a983..2544211e6811b9f356ff7bb656cba83470eba20e 100755 (executable)
--- 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