[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] Quieten build & ensure API build scripts exit with non-zero status



On Tue, Jul 19, 2011 at 07:13:46AM -0600, Eric Blake wrote:
> On 07/19/2011 06:20 AM, Daniel P. Berrange wrote:
> >* docs/Makefile.am: Use $(AM_V_GEN) for API/HTML scripts
> >* docs/apibuild.py, python/generator.py: Exit with non-zero status
> >   if problems are found. Also be silent, not outputting any debug
> >   messages.
> >* src/Makefile.am: Use $(AM_V_GEN) for ESX generator
> >* python/Makefile.am: Tweak rule
> >---
> >  docs/Makefile.am    |   11 ++----
> >  docs/apibuild.py    |   95 ++++++++++++++++++++++++++++++--------------------
> >  python/Makefile.am  |    6 ++--
> >  python/generator.py |   16 +++++---
> >  src/Makefile.am     |    2 +-
> >  5 files changed, 75 insertions(+), 55 deletions(-)
> >
> >diff --git a/docs/Makefile.am b/docs/Makefile.am
> >index 7ff94a0..4ba6b9d 100644
> >--- a/docs/Makefile.am
> >+++ b/docs/Makefile.am
> >@@ -153,21 +153,18 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
> >
> >
> >  html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
> >-	- if [ -x $(XSLTPROC) ] ; then \
> >-	  echo "Rebuilding the HTML pages from the XML API" ; \
> >+	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
> >  	  $(XSLTPROC) --nonet -o $(srcdir)/ \
> >-	  $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi
> >-	- if test -x $(XMLLINT)&&  test -x $(XMLCATALOG) ; then \
> >+	  $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi ; \
> >+	if test -x $(XMLLINT)&&  test -x $(XMLCATALOG) ; then \
> 
> This is a subtle semantic change.
> 
> Previously, if the first $(XSLTPROC) run failed with non-zero
> status, the second run wasn't even attempted (make quits as soon as
> it encounters a complete failing command, and since there was no ;
> after the fi, the first if was complete).  Now, the XMLLINT action
> is attempted no matter whether the XSLTPROC failed.
> 
> Do we need this followup to restore original semantics?
> 
> diff --git i/docs/Makefile.am w/docs/Makefile.am
> index 4ba6b9d..de649fe 100644
> --- i/docs/Makefile.am
> +++ w/docs/Makefile.am
> @@ -155,7 +155,7 @@ internals/%.html.tmp: internals/%.html.in
> subsite.xsl page.xsl sitemap.html.in
>  html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
>  	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
>  	  $(XSLTPROC) --nonet -o $(srcdir)/ \
> -	  $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi ; \
> +	  $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi && \
>  	if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
>  	  if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0
> Strict//EN" \
>  	    > /dev/null ; then \

ACK.

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]