On Friday 09 December 2011, Jim Meyering wrote:
>
> [SNIP]
>
> >> > +## times in the past, when we used to keep the generated Makefile.in
> >> > +## committed into the automake's git repository.
> >>
> >> s/the.*repository/version-control Makefile.in/
> >>
> > You mean "version-controlled Makefile.in"?
>
> No. I meant to remove the "keep", too. See below.
>
Ah, this makes sense. I'll do the change.
> > Subject: [PATCH] devel: help in comparing Makefile.in from different commits
> >
> > Now that the generated Makefile.in, configure and aclocal.m4 files
> > are no longer committed in Automake's git repository, a simple
> > "git diff" or "git log" no longer shows if and how a change in
> > Automake results in changes to the Makefile.in files and/or
> > configure script of its own build system. Still, the ability to
> > peek so easily at such differences had proved itself quite useful
>
> s/had/has/
>
OK.
> > diff --git a/Makefile.am b/Makefile.am
> > index 51eeb23..b7fa29a 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -604,6 +604,75 @@ path-check: distdir
> > rm -rf $(distdir); \
> > exit $$estatus
> >
> > +## Visually comparing differences between the Makefile.in files in the
>
> s/ the//
>
Fixed.
> > +## automake's own build system as generated in two different branches might
> > +## help to catch bugs and blunders. This has already happened a few times
> > +## in the past, when we used to keep version-control Makefile.in.
>
> Change the preceding line to this: (s/keep //)
>
Ditto.
> ## in the past, when we used to version-control Makefile.in.
>
> > +autodiffs:
> > + @set -u; \
> > + NEW_COMMIT=$${NEW_COMMIT-"HEAD"}; \
> > + OLD_COMMIT=$${OLD_COMMIT-"HEAD~1"}; \
> > + am_gitdir='$(abs_top_srcdir)/.git'; \
> > + get_autofiles_from_rev () \
> > + { \
> > + rev=$$1 dir=$$2 \
> > + && echo "$@: will get files from revision $$rev" \
> > + && git clone -q --depth 1 "$$am_gitdir" tmp \
> > + && cd tmp \
> > + && git checkout -q "$$rev" \
> > + && echo "$@: bootstrapping $$rev" \
> > + && $(SHELL) ./bootstrap \
> > + && echo "$@: copying files from $$rev" \
> > + && makefile_ins=`find . -name Makefile.in` \
> > + && (tar cf - configure aclocal.m4 $$makefile_ins) | \
> > + (cd .. && cd "$$dir" && tar xf -) \
> > + && cd .. \
> > + && rm -rf tmp; \
> > + }; \
> > + outdir=$@.dir \
> > +## Before proceeding, ensure the specified revisions truly exist.
> > + && git --git-dir="$$am_gitdir" describe $$OLD_COMMIT >/dev/null \
> > + && git --git-dir="$$am_gitdir" describe $$NEW_COMMIT >/dev/null \
> > + && rm -rf $$outdir \
> > + && mkdir $$outdir \
> > + && cd $$outdir \
> > + && mkdir new old \
> > + && get_autofiles_from_rev $$OLD_COMMIT old \
> > + && get_autofiles_from_rev $$NEW_COMMIT new \
> > + && exit 0
> > +## With lots of eye candy; we like out developers pampered and spoiled :-)
>
> s/out/our/
>
Oops, I was sure I had already fixed that. Now it's truly fixed.
I've now queued the patch for after the 1.11.2 release.
Thanks,
Stefano
