diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-06-07 15:40:10 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-06-07 15:41:02 -0700 |
| commit | 90a19baa2023145d805e93875e4a158540e15990 (patch) | |
| tree | dbe83f79b45da67a33a8089592fbfaf2e0f18c57 /Makefile.in | |
| parent | 866cda36cc2844573c24b94401157c860ed3fe6f (diff) | |
| download | emacs-90a19baa2023145d805e93875e4a158540e15990.tar.gz | |
Move gen_origin from program to data
That way, 'make change-history' needs to change only ChangeLog.2,
instead of having to change two files.
* ChangeLog.2: Add commit info for range that this file covers.
* Makefile.in (new_commit_regexp): New macro.
(change-history-nocommit): Simplify, by putting what used to be
the gen_origin value into the data (ChangeLog.2) rather than
into the program (gitlog-to-emacslog).
* build-aux/gitlog-to-emacslog (gen_origin): Calculate from
the input file (e.g., ChangeLog.2) rather than by having a
constant in the program. Substitute it into the output.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index a2258f2c56e..d2948f84139 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1116,19 +1116,21 @@ unchanged-history-files: x=$$(git diff-files --name-only $(CHANGELOG_N) $(emacslog)) && \ test -z "$$x" +# Regular expression that matches the newest commit covered by a ChangeLog. +new_commit_regexp = ^commit [0123456789abcdef]* (inclusive) + # Copy newer commit messages to the start of the ChangeLog history file, # and consider them to be older. change-history-nocommit: master-branch-is-current unchanged-history-files -rm -f ChangeLog.tmp $(MAKE) ChangeLog CHANGELOG=ChangeLog.tmp - (sed '/^See ChangeLog.[0-9]* for earlier/,$$d' <ChangeLog.tmp && cat $(CHANGELOG_N)) \ - >$(CHANGELOG_N).tmp + sed '/^This file records repository revisions/,$$d' \ + ChangeLog.tmp >$(CHANGELOG_N).tmp + new_commit_line=`grep '$(new_commit_regexp)' ChangeLog.tmp` && \ + sed 's/$(new_commit_regexp).*/'"$$new_commit_line/" \ + $(CHANGELOG_N) >>$(CHANGELOG_N).tmp rm ChangeLog.tmp - new_origin=$$(git log --pretty=format:%H HEAD^!) && \ - sed 's/^\(gen_origin=\).*/\1'"$$new_origin/" \ - < $(emacslog) > $(emacslog).tmp && chmod +x $(emacslog).tmp mv $(CHANGELOG_N).tmp $(CHANGELOG_N) - mv $(emacslog).tmp $(emacslog) change-history: change-history-nocommit $(MAKE) $@-commit |