diff options
| author | Daiki Ueno <ueno@gnu.org> | 2015-10-15 10:18:03 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2015-10-15 12:37:53 +0900 |
| commit | 767ec35d1f36ccf707fc3fcd29b401b60ef4b7d7 (patch) | |
| tree | 026f4bbece9b59bc324354ab8ee87d4c8e59c92c | |
| parent | 2d98ea809000ab141b85d95c4517f595ed9f6ae1 (diff) | |
| download | gettext-767ec35d1f36ccf707fc3fcd29b401b60ef4b7d7.tar.gz | |
build: Generate ChangeLogs for intl and po
* autogen.sh: Create empty ChangeLog files under intl and po.
* Makefile.am (gen-ChangeLogs): Rename from gen-ChangeLog. Generate
ChangeLog files for */intl and */po as well as top-level.
* gettext-runtime/intl/ChangeLog.0: Rename from ChangeLog.
* gettext-runtime/po/ChangeLog.0: Rename from ChangeLog.
* gettext-tools/po/ChangeLog.1: Rename from ChangeLog.
| -rw-r--r-- | Makefile.am | 21 | ||||
| -rwxr-xr-x | autogen.sh | 7 | ||||
| -rw-r--r-- | gettext-runtime/intl/ChangeLog.0 (renamed from gettext-runtime/intl/ChangeLog) | 0 | ||||
| -rw-r--r-- | gettext-runtime/po/ChangeLog.0 (renamed from gettext-runtime/po/ChangeLog) | 0 | ||||
| -rw-r--r-- | gettext-tools/po/ChangeLog.1 (renamed from gettext-tools/po/ChangeLog) | 0 |
5 files changed, 16 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index fb0598c46..d95383bbb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -154,23 +154,30 @@ EXTRA_DIST += $(top_srcdir)/.version BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ -dist-hook: gen-ChangeLog +dist-hook: gen-ChangeLogs echo $(VERSION) > $(distdir)/.tarball-version # Generate ChangeLog. gen_start_date = 2015-10-13 -.PHONY: gen-ChangeLog -gen-ChangeLog: +.PHONY: gen-ChangeLogs +gen-ChangeLogs: $(AM_V_GEN)if test -d .git; then \ log_fix="$(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 \ - $$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \ - { rm -f $(distdir)/ChangeLog && \ - mv $(distdir)/cl-t $(distdir)/ChangeLog; } \ + for d in . gettext-runtime/intl gettext-runtime/po \ + gettext-tools/po; do \ + test "$$d" = "." \ + && cldir="$(distdir)" \ + || cldir="$(distdir)/$$d"; \ + $(top_srcdir)/build-aux/gitlog-to-changelog \ + $$amend_git_log --since=$(gen_start_date) -- "$$d" \ + > "$$cldir/cl-t" && \ + { rm -f "$$cldir/ChangeLog" && \ + mv "$$cldir/cl-t" "$$cldir/ChangeLog"; }; \ + done; \ fi # PO files update. diff --git a/autogen.sh b/autogen.sh index ca0468af5..3a301e461 100755 --- a/autogen.sh +++ b/autogen.sh @@ -417,7 +417,8 @@ fi # Automake requires that ChangeLog exist. for dir in . gettext-runtime gettext-runtime/libasprintf \ - gettext-tools gettext-tools/examples; do + gettext-tools gettext-tools/examples \ + gettext-runtime/intl gettext-runtime/po gettext-tools/po; do cat > "$dir/ChangeLog" <<\EOF No more ChangeLog files ======================== @@ -426,10 +427,6 @@ October 14th, 2015 we put changelog information only in the git commit log, and generate a top-level ChangeLog file from logs at "make dist" time. -This rule doesn't apply to the ChangeLog files under "intl" and "po" -directories, because those files are distributed as part of gettext -infrastructure files pulled with the autopoint program. - Local Variables: buffer-read-only: t mode: text diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog.0 index 10eed5dee..10eed5dee 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog.0 diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog.0 index f66c1e16a..f66c1e16a 100644 --- a/gettext-runtime/po/ChangeLog +++ b/gettext-runtime/po/ChangeLog.0 diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog.1 index 91ed01c58..91ed01c58 100644 --- a/gettext-tools/po/ChangeLog +++ b/gettext-tools/po/ChangeLog.1 |