diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-11-29 10:36:08 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-11-30 16:54:58 +0100 |
| commit | baea70f27f3634a4ebe90728929181803968805b (patch) | |
| tree | d29a15d5625b2474a7b20baf304c5499c930adec | |
| parent | e632b4015a25e57e53f843ef6322688f9b5e1e31 (diff) | |
| download | grep-baea70f27f3634a4ebe90728929181803968805b.tar.gz | |
maint: generate ChangeLog from git logs
* Makefile.am (dist-hook, gen-ChangeLog): New rules.
* bootstrap.conf (gnulib_modules): Add gitlog-to-changelog.
Ensure that ChangeLog exists.
* ChangeLog-2009: Rename from ChangeLog
* ChangeLog: Remove file.
* .gitignore: Add ChangeLog.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ChangeLog-2009 (renamed from ChangeLog) | 6 | ||||
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | bootstrap.conf | 4 | ||||
| -rw-r--r-- | build-aux/.gitignore | 1 | ||||
| -rw-r--r-- | lib/.gitignore | 1 |
6 files changed, 23 insertions, 7 deletions
@@ -15,5 +15,6 @@ /configure.ac /stamp-h1 ABOUT-NLS +ChangeLog Makefile Makefile.in diff --git a/ChangeLog b/ChangeLog-2009 index 0a5fe976..e92aed2e 100644 --- a/ChangeLog +++ b/ChangeLog-2009 @@ -1,9 +1,3 @@ -2009-11-30 Tony Abou-Assaleh <taa@acm.org> - - * AUTHORS: new maintainers added - * THANKS: same - * README-alpha: change CVS references to Git - 2009-11-26 Paolo Bonzini <bonzini@gnu.org> * bootstrap.conf: Add binary-io, dirname. diff --git a/Makefile.am b/Makefile.am index 6d33a835..769a1106 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # Process this file with automake to create Makefile.in -# +# # Copyright 1997, 1998, 2005, 2006, 2007, 2008, 2009 Free Software # Foundation, Inc. # @@ -53,3 +53,18 @@ cvs-clean: fi ; \ done; \ done + +# Arrange so that .tarball-version appears only in the distribution +# tarball, and never in a checked-out repository. +dist-hook: gen-ChangeLog + $(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version + +gen_start_date = 2009-11-27 +.PHONY: gen-ChangeLog +gen-ChangeLog: + $(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; \ + mv $(distdir)/cl-t $(distdir)/ChangeLog; \ + fi diff --git a/bootstrap.conf b/bootstrap.conf index 46ff2d98..201f23d3 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -29,6 +29,7 @@ fnmatch getopt-gnu getpagesize gettext +gitlog-to-changelog locale malloc mbrlen @@ -100,3 +101,6 @@ if test $gettext_external = 1; then m4/xsize.m4 ' fi + +# Automake requires that ChangeLog exist. +test -f ChangeLog || touch ChangeLog || exit 1 diff --git a/build-aux/.gitignore b/build-aux/.gitignore index cb578591..3a6a5055 100644 --- a/build-aux/.gitignore +++ b/build-aux/.gitignore @@ -2,6 +2,7 @@ config.guess config.rpath config.sub depcomp +gitlog-to-changelog install-sh link-warning.h mdate-sh diff --git a/lib/.gitignore b/lib/.gitignore index 20be868a..1052ad79 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -4,6 +4,7 @@ alloca.in.h atexit.c basename-lgpl.c basename.c +binary-io.h btowc.c config.charset dirent.h |