diff options
| author | Glenn Morris | 2016-05-25 14:17:25 -0400 |
|---|---|---|
| committer | Glenn Morris | 2016-05-25 14:17:25 -0400 |
| commit | 3c79e51821720a32782a7601d01b7e97a110dc67 (patch) | |
| tree | 9acc6ba8580b2a44de4fbca7765001848f0eb36b /admin | |
| parent | 42275df3dff4b81c7c6aa15df84deace9cfc9d6f (diff) | |
| download | emacs-3c79e51821720a32782a7601d01b7e97a110dc67.tar.gz emacs-3c79e51821720a32782a7601d01b7e97a110dc67.zip | |
* admin/admin.el (add-release-logs): Generate ChangeLog if needed.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/admin.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/admin/admin.el b/admin/admin.el index a3d56277918..33b0808f4fa 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -47,8 +47,9 @@ Optional argument DATE is the release date, default today." | |||
| 47 | ;; your own personal one. Perhaps we should move any existing file | 47 | ;; your own personal one. Perhaps we should move any existing file |
| 48 | ;; and unconditionally call make ChangeLog? | 48 | ;; and unconditionally call make ChangeLog? |
| 49 | ;; Or make ChangeLog CHANGELOG=temp and compare with the existing? | 49 | ;; Or make ChangeLog CHANGELOG=temp and compare with the existing? |
| 50 | (unless (file-exists-p (expand-file-name "ChangeLog" root)) | 50 | (or (file-exists-p (expand-file-name "ChangeLog" root)) |
| 51 | (user-error "No top-level ChangeLog - run \"make ChangeLog\" first")) | 51 | (zerop (call-process "make" nil nil nil "-C" root "ChangeLog")) |
| 52 | (error "Problem generating ChangeLog")) | ||
| 52 | (require 'add-log) | 53 | (require 'add-log) |
| 53 | (or date (setq date (funcall add-log-time-format nil t))) | 54 | (or date (setq date (funcall add-log-time-format nil t))) |
| 54 | (let* ((logs (process-lines "find" root "-name" "ChangeLog")) | 55 | (let* ((logs (process-lines "find" root "-name" "ChangeLog")) |