1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-14 10:00:25 -08:00

; * admin/make-tarball.txt: Minor clarifications.

This commit is contained in:
Stefan Kangas 2022-09-12 12:15:01 +02:00
parent f771f122d2
commit 2cdb9d03fd

View file

@ -55,7 +55,8 @@ General steps (for each step, check for possible errors):
For a release (as opposed to pretest), delete any left-over "---" For a release (as opposed to pretest), delete any left-over "---"
and "+++" markers from etc/NEWS, as well as the "Temporary note" and "+++" markers from etc/NEWS, as well as the "Temporary note"
section at the beginning of that file, and commit etc/NEWS if it section at the beginning of that file, and commit etc/NEWS if it
was modified. was modified. For a bug fix release (e.g. 28.2), delete any empty
headlines too.
2. Regenerate the versioned ChangeLog.N and etc/AUTHORS files. 2. Regenerate the versioned ChangeLog.N and etc/AUTHORS files.
@ -118,12 +119,13 @@ General steps (for each step, check for possible errors):
Set the version number to that of the actual release (commit in Set the version number to that of the actual release (commit in
one, as described above). Pick a date about a week from now when one, as described above). Pick a date about a week from now when
you intend to make the release. Use M-x add-release-logs to add you intend to make the release. Use M-x add-release-logs from
entries to etc/HISTORY and the ChangeLog file. It's best not to admin/admin.el to add entries to etc/HISTORY and the ChangeLog
commit these files until the release is actually made. Merge the file. It's best not to commit these files until the release is
entries from (unversioned) ChangeLog into the top of the current actually made. Merge the entries from (unversioned) ChangeLog
versioned ChangeLog.N and commit that along with etc/HISTORY. into the top of the current versioned ChangeLog.N and commit that
Then you can tag that commit as the release. along with etc/HISTORY. Then you can tag that commit as the
release.
Alternatively, you can commit and tag with the RC tag right away, Alternatively, you can commit and tag with the RC tag right away,
and delay the final tagging until you actually decide to make a and delay the final tagging until you actually decide to make a
@ -163,7 +165,10 @@ General steps (for each step, check for possible errors):
Commit ChangeLog.N, etc/AUTHORS, lisp/ldefs-boot.el, and the files Commit ChangeLog.N, etc/AUTHORS, lisp/ldefs-boot.el, and the files
changed by M-x set-version. Note that the set-version changes changed by M-x set-version. Note that the set-version changes
should be committed separately, as described in step 3 above. should be committed separately, as described in step 3 above, to
avoid them being merged to master. The lisp/ldefs-boot.el file
should not be merged to master either, so it could be added to the
same commit or committed separately.
The easiest way of doing that is "C-x v d ROOT-DIR RET", then go The easiest way of doing that is "C-x v d ROOT-DIR RET", then go
to the first modified file, press 'M' to mark all modified files, to the first modified file, press 'M' to mark all modified files,