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

Re: [libvirt] [PATCH 03/12] docs: make xmllint & xsltproc compulsory



On 07/26/2017 07:51 PM, Daniel P. Berrange wrote:
> We already require libxml to be installed, so it is not unreasonable
> to require xmllint and xsltproc to be installed too - any platform
> with the former will have the latter too.
> 
> Signed-off-by: Daniel P. Berrange <berrange redhat com>
> ---
>  docs/Makefile.am             | 44 +++++++++++++++-----------------------------
>  m4/virt-external-programs.m4 | 12 ++++++++++--
>  2 files changed, 25 insertions(+), 31 deletions(-)
> 
> diff --git a/docs/Makefile.am b/docs/Makefile.am
> index f478d9505..d6c9d0091 100644
> --- a/docs/Makefile.am
> +++ b/docs/Makefile.am
> @@ -221,17 +221,14 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \
>  news.html.in: \
>  	  $(srcdir)/news.xml \
>  	  $(srcdir)/news-html.xsl
> -	$(AM_V_GEN) \
> -	if [ -x $(XSLTPROC) ]; then \
> -	  $(XSLTPROC) --nonet \
> +	$(AM_V_GEN)$(XSLTPROC) --nonet \
>  	    $(srcdir)/news-html.xsl \
>  	    $(srcdir)/news.xml \
>  	  >$ -tmp \
>  	    || { rm -f $ -tmp; exit 1; }; \
>  	  sed 's/ xmlns=""//g' $ -tmp >$@ \
>  	    || { rm -f $ -tmp; exit 1; }; \
> -	  rm -f $ -tmp; \
> -	fi
> +	  rm -f $ -tmp
>  EXTRA_DIST += \
>  	$(srcdir)/news.xml \
>  	$(srcdir)/news.rng \
> @@ -244,9 +241,7 @@ MAINTAINERCLEANFILES += \
>  
>  %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
>  		$(acl_generated)
> -	@if [ -x $(XSLTPROC) ] ; then \
> -	  echo "Generating $@"; \
> -	  name=`echo $@ | sed -e 's/.tmp//'`; \
> +	$(AM_V_GEN)name=`echo $@ | sed -e 's/.tmp//'`; \
>  	  dir=`dirname $ ` ; \
>  	  if test "$$dir" = "."; \
>  	  then \
> @@ -257,42 +252,33 @@ MAINTAINERCLEANFILES += \
>  	  fi; \
>  	  $(XSLTPROC) --stringparam pagename $$name --nonet \
>  	    $(top_srcdir)/docs/$$style $< > $@ \
> -	    || { rm $@ && exit 1; }; fi
> +	    || { rm $@ && exit 1; }
>  
>  %.html: %.html.tmp
> -	@if test -x $(XMLLINT) ; then \
> -	  echo "Validating $@" ; \
> -	  $(XMLLINT) --nonet --format $< > $(srcdir)/$@ \
> -	  || { rm $(srcdir)/$@ && exit 1; }; fi
> +	$(AM_V_GEN)$(XMLLINT) --nonet --format $< > $(srcdir)/$@ \
> +	  || { rm $(srcdir)/$@ && exit 1; }
>  
>  %.php.tmp: %.php.in site.xsl page.xsl
> -	@if [ -x $(XSLTPROC) ] ; then \
> -	  echo "Generating $@"; \
> -	  $(XSLTPROC) --stringparam pagename $(@:.tmp=) --nonet \
> +	$(AM_V_GEN)$(XSLTPROC) --stringparam pagename $(@:.tmp=) --nonet \
>  	    $(top_srcdir)/docs/site.xsl $< > $@ \
> -	    || { rm $@ && exit 1; }; fi
> +	    || { rm $@ && exit 1; }
>  
>  %.php: %.php.tmp %.php.code.in
> -	@if [ -x $(XSLTPROC) ] ; then \
> -	  echo "Scripting $@"; \
> -	    sed -e '/<span id="php_placeholder"><\/span>/r '"$(srcdir)/$  code in" \
> +	$(AM_V_GEN)sed -e '/<span id="php_placeholder"><\/span>/r '"$(srcdir)/$  code in" \

Long line. syntax-check is sad :(

>  	    -e /php_placeholder/d < $  tmp > $(srcdir)/$@ \
> -	    || { rm $(srcdir)/$@ && exit 1; }; fi
> +	    || { rm $(srcdir)/$@ && exit 1; }

Michal


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