procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor fixes in authors.el and in tarball-making instructions

Browse source 
* admin/authors.el (authors): Make the error message more helpful.
(authors-ignored-files, authors-renamed-files-alist): Update.
This commit is contained in:
Eli Zaretskii 2020-12-18 09:38:29 -05:00
parent d7a4ceaa1e
commit 48b9c47805
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
admin/authors.el
View file

@ -467,7 +467,12 @@ Changes to files matching one of the regexps in this list are not listed.")
"notes/font-backend" "notes/font-backend"
;; ada-mode has been deleted, now in GNU ELPA ;; ada-mode has been deleted, now in GNU ELPA
"ada-mode.texi" "ada-mode.texi"
"doc/misc/ada-mode.texi"
"lisp/progmodes/ada-mode.el"
"lisp/progmodes/ada-prj.el"
"lisp/progmodes/ada-xref.el"
"GNUS-NEWS" "GNUS-NEWS"
"etc/GNUS-NEWS"
"doc/misc/gnus-news.el" "doc/misc/gnus-news.el"
"src/fingerprint-dummy.c" "src/fingerprint-dummy.c"
"src/fingerprint.h" "src/fingerprint.h"
@ -875,6 +880,7 @@ Changes to files in this list are not listed.")
"lisp/obsolete/spell.el" "lisp/obsolete/spell.el"
"lisp/obsolete/swedish.el" "lisp/obsolete/swedish.el"
"lisp/obsolete/sym-comp.el" "lisp/obsolete/sym-comp.el"
"obsolete/sym-comp.el"
"library-of-babel.org" "library-of-babel.org"
"flymake-elisp.el" "flymake-elisp.el"
"flymake-ui.el" "flymake-ui.el"
@ -994,7 +1000,8 @@ in the repository.")
("nxml/test.invalid.xml" . "test-invalid.xml") ("nxml/test.invalid.xml" . "test-invalid.xml")
("nxml/test.valid.xml" . "test-valid.xml") ("nxml/test.valid.xml" . "test-valid.xml")
("automated/Makefile.in" . "test/Makefile.in") ("automated/Makefile.in" . "test/Makefile.in")
("test/rmailmm.el" . "rmailmm.el") ("test/rmailmm.el" . "test/manual/rmailmm.el")
("rmailmm.el" . "test/manual/rmailmm.el")
;; The one in lisp is eshell/eshell.el. ;; The one in lisp is eshell/eshell.el.
("eshell.el" . "eshell-tests.el") ("eshell.el" . "eshell-tests.el")
("automated/eshell.el" . "eshell-tests.el") ("automated/eshell.el" . "eshell-tests.el")
@ -1118,8 +1125,11 @@ in the repository.")
("lisp/net/starttls.el" . "lisp/obsolete/starttls.el") ("lisp/net/starttls.el" . "lisp/obsolete/starttls.el")
("url-ns.el" . "lisp/obsolete/url-ns.el") ("url-ns.el" . "lisp/obsolete/url-ns.el")
("gnus-news.texi" . "doc/misc/gnus.texi") ("gnus-news.texi" . "doc/misc/gnus.texi")
("lisp/multifile.el". "lisp/fileloop.el") ("lisp/multifile.el" . "lisp/fileloop.el")
("lisp/emacs-lisp/thread.el". "lisp/thread.el") ("lisp/emacs-lisp/thread.el" . "lisp/thread.el")
("lisp/emacs-lisp/cl.el" . "lisp/emacs-lisp/cl-lib.el")
("lisp/progmodes/mantemp.el" . "lisp/obsolete/mantemp.el")
("sysdep.c" . "src/sysdep.c")
) )
"Alist of files which have been renamed during their lifetime. "Alist of files which have been renamed during their lifetime.
Elements are (OLDNAME . NEWNAME).") Elements are (OLDNAME . NEWNAME).")
@ -1593,7 +1603,7 @@ and a buffer *Authors Errors* containing references to unknown files."
;; the versioned ChangeLog.N rather than the unversioned ChangeLog. ;; the versioned ChangeLog.N rather than the unversioned ChangeLog.
(zerop (call-process "make" nil nil nil (zerop (call-process "make" nil nil nil
"-C" root "change-history-nocommit")) "-C" root "change-history-nocommit"))
(error "Problem updating ChangeLog")) (error "Problem updating ChangeLog, try \"C-u M-x authors RET\""))
(let ((logs (process-lines find-program root "-name" "ChangeLog*")) (let ((logs (process-lines find-program root "-name" "ChangeLog*"))
(table (make-hash-table :test 'equal)) (table (make-hash-table :test 'equal))
(buffer-name "*Authors*") (buffer-name "*Authors*")

25
admin/make-tarball.txt
View file

@ -33,17 +33,32 @@ General steps (for each step, check for possible errors):
or some form of "git clean -x". It's probably simpler and safer to or some form of "git clean -x". It's probably simpler and safer to
make a new working directory exclusively for the release branch. make a new working directory exclusively for the release branch.
Make sure the tree is built, or at least configured. That's
because some of the commands below run Make, so they need
Makefiles to be present.
2. Regenerate the etc/AUTHORS file: 2. Regenerate the etc/AUTHORS file:
M-: (require 'authors) RET M-: (require 'authors) RET
M-x authors RET M-x authors RET
(This first updates the current versioned ChangeLog.N) (This first updates the current versioned ChangeLog.N)
If there is an "*Authors Errors*" buffer, address the issues. If this says "Problem updating ChangeLog", find the reason for the
If there was a ChangeLog typo, fix the relevant entry. failure of the command it runs, viz.:
If a file was deleted or renamed, consider adding an appropriate
entry to authors-ignored-files, authors-valid-file-names, or make -C ROOT change-history-nocommit
authors-renamed-files-alist.
(where ROOT is the top-level directory where you run this). It
could be because there are uncommitted changes in ChangeLog.N, for
example. One possible way forward is to invoke "C-u M-x authors",
which will skip updating the versioned ChangeLog.N file.
After "M-x authors" finishes, if there is an "*Authors Errors*"
buffer, address the issues. If there was a ChangeLog typo, fix
the relevant entry. If a file was deleted or renamed, consider
adding an appropriate entry to variables authors-ignored-files,
authors-valid-file-names, or authors-renamed-files-alist in
authors.el.
If necessary, repeat 'C-u M-x authors' after making those changes. If necessary, repeat 'C-u M-x authors' after making those changes.
Save the "*Authors*" buffer as etc/AUTHORS. Save the "*Authors*" buffer as etc/AUTHORS.