summaryrefslogtreecommitdiff
path: root/maintainer-scripts
diff options
context:
space:
mode:
authordmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4>2015-02-04 19:11:48 +0000
committerdmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4>2015-02-04 19:11:48 +0000
commitabc57c6a8e1b32fdf820830a28b2dd3d75aa5603 (patch)
treeb4fb9d7b5429da6c2b1326d28422c5e129557b56 /maintainer-scripts
parent70f81790e504c1ca442f1423128bd2983dce7d62 (diff)
downloadgcc-abc57c6a8e1b32fdf820830a28b2dd3d75aa5603.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220412 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'maintainer-scripts')
-rw-r--r--maintainer-scripts/ChangeLog6
-rwxr-xr-xmaintainer-scripts/update_web_docs_svn18
2 files changed, 20 insertions, 4 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 6def1ae788b..f80213902cc 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 ac3bae6451f..2544211e681 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