diff options
| author | James Youngman <jay@gnu.org> | 2016-01-01 12:37:20 +0000 |
|---|---|---|
| committer | James Youngman <jay@gnu.org> | 2016-01-02 09:27:31 +0000 |
| commit | 6afb7676d89bd21ad1c2c6fb1404cc06e332bd30 (patch) | |
| tree | 65400321244b3ce2d114cc2d4423330d7ae49312 | |
| parent | b8fe74972b47bbdc78e6245ce38f0e25a3509385 (diff) | |
| download | findutils-6afb7676d89bd21ad1c2c6fb1404cc06e332bd30.tar.gz | |
Add a shell script to generate ChangeLog; strip cherrypick comments.
* build-aux/gen-changelog.sh: Shell script for generating the
ChangeLog. The effect is much the same as the previous version of
the gen-ChangeLog rule, but it is easier to run this script to
discover what the ChangeLog resulting from a recent commit is.
The only change is that we now also use --strip-cherry-pick.
* build-aux/Makefile.am (EXTRA_DIST): Distribute gen-changelog.sh.
* Makefile.am (gen-ChangeLog): Simplify the gen-ChangeLog rule by
calling gen-changelog.sh.
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | build-aux/Makefile.am | 2 | ||||
| -rwxr-xr-x | build-aux/gen-changelog.sh | 28 |
3 files changed, 30 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 6d6d83c6..2ff22140 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,16 +33,7 @@ dist-hook: gen-ChangeLog findutils-check-pofiles findutils-check-testfiles .PHONY: gen-ChangeLog gen-ChangeLog: $(AM_V_GEN)if test -d $(top_srcdir)/.git; then \ - gen_start_date='2014-01-01' ; \ - log_fix="$(top_srcdir)/build-aux/git-log-fix" ; \ - test -e "$$log_fix" \ - && amend_git_log="--amend=$$log_fix" \ - || amend_git_log=; \ - { $(top_srcdir)/build-aux/gitlog-to-changelog \ - --srcdir=$(top_srcdir) \ - $$amend_git_log --since=$$gen_start_date \ - && cat $(top_srcdir)/ChangeLog-2013 ; \ - } > $(distdir)/cl-t \ + $(AUXDIR)/gen-changelog.sh $(top_srcdir) > $(distdir)/cl-t \ && { rm -f $(distdir)/ChangeLog \ && mv $(distdir)/cl-t $(distdir)/ChangeLog; } \ else \ diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am index bf20f6a5..d680a6bb 100644 --- a/build-aux/Makefile.am +++ b/build-aux/Makefile.am @@ -13,4 +13,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -EXTRA_DIST = check-testfiles.sh man-lint.sh +EXTRA_DIST = check-testfiles.sh man-lint.sh gen-changelog.sh diff --git a/build-aux/gen-changelog.sh b/build-aux/gen-changelog.sh new file mode 100755 index 00000000..2f3b9857 --- /dev/null +++ b/build-aux/gen-changelog.sh @@ -0,0 +1,28 @@ +#! /bin/sh +# Generate the ChangeLog for findutils. + +# Copyright (C) 2015 Free Software Foundation, Inc. +# Written by James Youngman. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +set -u +top_srcdir="$1" + +"${top_srcdir}/build-aux/gitlog-to-changelog" \ + --srcdir="${top_srcdir}" \ + --amend="${top_srcdir}/build-aux/git-log-fix" \ + --since='2014-01-01' \ + --strip-cherry-pick \ + && cat "${top_srcdir}/ChangeLog-2013" |