From 5a28932adddefd19adda593a7dbf05991215fb15 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 27 Jan 2015 00:17:56 +0000 Subject: [PATCH] update_web_docs_svn: support the JIT documentation maintainer-scripts/ChangeLog: * update_web_docs_svn: Don't delete gcc/jit/docs or gcc/jit/jit-common.h, gcc/jit/notes.txt. Special case the building of the JIT docs (using sphinx-build). Special case copying them up. From-SVN: r220149 --- maintainer-scripts/ChangeLog | 7 ++++++ maintainer-scripts/update_web_docs_svn | 30 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index 4e551beddae..dab5bafdfd2 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,3 +1,10 @@ +2015-01-26 David Malcolm + + * update_web_docs_svn: Don't delete gcc/jit/docs or + gcc/jit/jit-common.h, gcc/jit/notes.txt. Special case the + building of the JIT docs (using sphinx-build). Special case + copying them up. + 2014-08-14 Richard Biener * crontab: Change trunk snapshots from 4.10 to 5. diff --git a/maintainer-scripts/update_web_docs_svn b/maintainer-scripts/update_web_docs_svn index c66122068bf..ac3bae6451f 100755 --- a/maintainer-scripts/update_web_docs_svn +++ b/maintainer-scripts/update_web_docs_svn @@ -111,11 +111,18 @@ fi # generator programs with the installed library, not the new one and # (b) to avoid packaging all the sources instead of only documentation # sources. +# Note that we have to preserve gcc/jit/docs since the jit docs are +# not .texi files (Makefile, .rst and .png), and the jit docs use +# include directives to pull in content from jit/jit-common.h and +# jit/notes.txt, so we have to preserve those also. find gcc -type f \( -name '*.texi' \ -o -path gcc/gcc/doc/install.texi2html \ -o -path gcc/gcc/doc/include/texinfo.tex \ -o -path gcc/gcc/BASE-VER \ -o -path gcc/gcc/DEV-PHASE \ + -o -path "gcc/gcc/jit/docs/*" \ + -o -path "gcc/gcc/jit/jit-common.h" \ + -o -path "gcc/gcc/jit/notes.txt" \ -o -print0 \) | xargs -0 rm -f # Build a tarball of the sources. @@ -158,6 +165,16 @@ for file in $MANUALS; do fi 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". +pushd gcc/gcc/jit/docs +make html +popd +cp -a gcc/gcc/jit/docs/_build/html jit +mkdir -p $DOCSDIR/jit + # Work around makeinfo generated file names and references with # "_002d" instead of "-". find . -name '*.html' | while read f; do @@ -204,6 +221,19 @@ for file in */*.html *.ps *.pdf *.tar; do fi done +# Again, the jit is a special case, with nested subdirectories +# below "jit", and with some non-HTML files (.png images from us, +# plus .css and .js supplied by sphinx). +find jit \ + -name "*.html" -o -name "*.png" \ + -o -name "*.css" -o -name "*.js" | + while read file ; do + # Note that $file here will contain path fragments beginning + # with "jit/", e.g. "jit/cp/topics/functions.html" + mkdir -p $(dirname $DOCSDIR/$file) + cp $file $DOCSDIR/$file + done + cd $DOCSDIR # Finally, generate the installation documentation -- 2.30.2