From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12128 invoked by alias); 26 Jan 2015 11:43:54 -0000 Mailing-List: contact jit-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Subscribe: Sender: jit-owner@gcc.gnu.org Received: (qmail 12104 invoked by uid 89); 26 Jan 2015 11:43:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=0.4 required=5.0 tests=AWL,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Status: No, score=0.4 required=5.0 tests=AWL,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-Spam-User: qpsmtpd, 2 recipients X-HELO: ainaz.pair.com Date: Thu, 01 Jan 2015 00:00:00 -0000 From: Gerald Pfeifer To: David Malcolm cc: jit@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [PATCH] update_web_docs_svn: support the JIT docs (PR jit/64257) In-Reply-To: <1422053051-11954-1-git-send-email-dmalcolm@redhat.com> Message-ID: References: <1422053051-11954-1-git-send-email-dmalcolm@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-SW-Source: 2015-q1/txt/msg00039.txt.bz2 On Friday 2015-01-23 17:44, David Malcolm wrote: > The following patch builds and installs the JIT documentation for > the website (just HTML for now). > > It's tricky to test (I don't have a copy of /www/gcc/bin/preprocess), > but I was able to use this to generate sane-looking documentation, > both for the .texi files, and for the JIT documentation. You can easily get the preprocess script by checking out wwwdocs, cf. https://gcc.gnu.org/about.html. That still will require MetaHTML which, sadly, became an abandoned FSF project, and will require a hack or two to build, so let's just go with your patch. A few notes, though: > maintainer-scripts/ChangeLog: > PR jit/64257 > * update_web_docs_svn: Don't delete gcc/jit/docs, > since the jit docs are not .tex files (Makefile, .rst and > .png). Special-case the building of the JIT docs (using > sphinx-build). Special-case copying them up (since they > contain .css, .js and .png files in addition to .html, and > have nested subdirectories). The "since" should be part of the code, not the ChangeLog. > diff --git a/maintainer-scripts/update_web_docs_svn b/maintainer-scripts/update_web_docs_svn > index c661220..c7eb890 100755 > --- a/maintainer-scripts/update_web_docs_svn > +++ b/maintainer-scripts/update_web_docs_svn > +# The JIT is a special-case, using sphinx rather than texinfo. special case > +# The jit Makefile uses "sphinx-build", which is packaged in > +# Fedora and EPEL 6 within "python-sphinx". JIT (above) vs jit (here)? How about saying "...packaged in "python-sphinx" in Fedora and EPEL 6 and in "python-Sphinx" in openSUSE"? > +# Again, the jit is a special case, with nested subdirectories > +# below "jit", and with some non-HTML files (.png images from us, > +# plus .js and .css supplied by sphinx). > +for file in $(find jit \ > + -name "*.html" -o -name "*.css" \ > + -o -name "*.js" -o -name "*.png"); do This looks like a Bash-ism. Can you use backticks of something like find ... | while read file; ... ? > + cp $file $DOCSDIR/$file Just "cp $file $DOCSDIR/" ? This one may be a better of style, but is easier to tweak in case we need to quote later on, for example. Gerald