On 12/06/2012 04:44 PM, Eric Blake wrote: > I noticed that on Fedora 18, xlstproc decides to regenerate > HACKING with additional whitespace. I haven't figured out why > that is happening (although fixing it would probably be a task > for xlstproc), but in the process of investigating, I noticed > that 'make HACKING' was completely silent, for no good reason. > > * Makefile.am (gen-ChangeLog, gen-AUTHORS, NEWS) > ($(top_srcdir)/HACKING): Mention which files we are generating. > --- > > The F18 xsltproc is from libxslt-1.1.27; it is generating additional > newlines in HACKING when compared against libxslt-1.1.26 of RHEL 6.3; > any hints on making HACKING idempotent in spite of different libxslt > versions would be appreciated. > > Makefile.am | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) I've gone ahead and pushed the Makefile.am changes under the trivial rule, but help for the extra whitespace in HACKING would be appreciated. > > diff --git a/Makefile.am b/Makefile.am > index 7b3a335..f8e669a 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -1,6 +1,6 @@ > ## Process this file with automake to produce Makefile.in > > -## Copyright (C) 2005-2011 Red Hat, Inc. > +## Copyright (C) 2005-2012 Red Hat, Inc. > ## See COPYING.LIB for the License of this software > > LCOV = lcov > @@ -35,7 +35,7 @@ pkgconfigdir = $(libdir)/pkgconfig > pkgconfig_DATA = libvirt.pc > > NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in > - -@(if [ -x $(XSLTPROC) ] ; then \ > + $(AM_V_GEN)(if [ -x $(XSLTPROC) ] ; then \ > $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl \ > $(top_srcdir)/docs/news.html.in \ > | perl -0777 -pe 's/\n\n+$$/\n/' \ > @@ -44,7 +44,7 @@ NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in > > $(top_srcdir)/HACKING: $(top_srcdir)/docs/hacking1.xsl $(top_srcdir)/docs/hacking2.xsl \ > $(top_srcdir)/docs/wrapstring.xsl $(top_srcdir)/docs/hacking.html.in > - -@(if [ -x $(XSLTPROC) ] ; then \ > + $(AM_V_GEN)(if [ -x $(XSLTPROC) ] ; then \ > $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking1.xsl $(top_srcdir)/docs/hacking.html.in | \ > $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking2.xsl - \ > | perl -0777 -pe 's/\n\n+$$/\n/' \ Hmm, I noticed that this perl invocation chops all trailing newlines; should we be tweaking it to squash all redundant newlines?? > @@ -86,7 +86,7 @@ dist-hook: gen-ChangeLog gen-AUTHORS > gen_start_date = 2009-07-04 > .PHONY: gen-ChangeLog > gen-ChangeLog: > - if test -d .git; then \ > + $(AM_V_GEN)if test -d .git; then \ > $(top_srcdir)/build-aux/gitlog-to-changelog \ > --since=$(gen_start_date) > $(distdir)/cl-t; \ > rm -f $(distdir)/ChangeLog; \ > @@ -95,7 +95,7 @@ gen-ChangeLog: > > .PHONY: gen-AUTHORS > gen-AUTHORS: > - if test -d .git; then \ > + $(AM_V_GEN)if test -d .git; then \ > out="`git log --pretty=format:'%aN <%aE>' | sort -u`" && \ > cat $(srcdir)/AUTHORS.in | perl -p -e "s/#authorslist#/$$out/" > \ > $(distdir)/AUTHORS-tmp && \ > -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list