For each step, check for possible errors.
-1. cvs -q update -Pd
+1. `bzr update' (for a bound branch), or `bzr pull'.
+ bzr status # check for locally modified files
2. Bootstrap to make 100% sure all elc files are up-to-date, and to
make sure that the later tagged version will bootstrap, should it be
M-x set-version RET). For a release, add released change log
entries (M-x add-release-logs RET).
-5. rm configure; make bootstrap
+ For a pretest, start at version .90. After .99, use .990 (so that
+ it sorts).
-6. Commit configure, README, doc/emacs/emacs.texi,
- doc/lispref/elisp.texi, etc/AUTHORS, lisp/version.el,
- mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings,
- mac/src/Emacs.r, nt/emacs.rc. Copy lisp/loaddefs.el to
- lisp/ldefs-boot.el and commit lisp/ldefs-boot.el. For a release,
- also commit the ChangeLog files in all directories.
+ If needed, increment the value of the variable
+ `customize-changed-options-previous-release' in cus-edit.el to
+ refer to a newer release of Emacs. (This is probably needed only
+ when preparing a major Emacs release, or branching for it.)
+
+5. Edit configure.in so that maintainer-mode is off by default.
+ (FIXME - need to find a better way of dealing with this).
+
+ autoreconf -i -I m4 --force
+ make bootstrap
+
+6. Commit etc/AUTHORS, all the files changed by M-x set-version, and
+ lisp/cus-edit.el (if modified).
+ Copy lisp/loaddefs.el to lisp/ldefs-boot.el and commit lisp/ldefs-boot.el.
+ For a release, also commit the ChangeLog files in all directories.
7. make-dist --snapshot. Check the contents of the new tar with
- admin/diff-tar-files against an older tar file. Some old pretest
- tarballs are kept under fencepost.gnu.org:~pot/emacs-pretest/, while
- old emacs tarballs are at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
+ admin/diff-tar-files against an older tar file. Some old pretest
+ tarballs may be found at <ftp://alpha.gnu.org/gnu/emacs/pretest>;
+ old release tarballs are at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
+
+ If this is the first pretest of a major release, just comparing
+ with the previous release may overlook many new files. You can try
+ something like `find . | sort' in a clean bzr tree, and compare the
+ results against the new tar contents.
8. xdelta delta emacs-OLD.tar.gz emacs-NEW.tar.gz emacs-OLD-NEW.xdelta
TAG is EMACS_PRETEST_XX_YY_ZZZ for a pretest, EMACS_XX_YY for a
release.
-11. admin/make-announcement OLD NEW
- This creates an announcement for pretests. OLD is the version used
- to make deltas with respect to NEW. Announcements for releases need
- to be crafted by hand. Use an older announcement to start with:
- look in ssh://fencepost.gnu.org/~pot/emacs-tarballs/.
+ Shortly before the release, cut the branch with the following commands:
+
+ cvs rtag EMACS_`NUMBER'_BASE
+ cvs rtag -b EMACS_`NUMBER'_RC -r EMACS_`NUMBER'_BASE
+
+ where `NUMBER' is the major version number of the release. This
+ makes it easier to see what changes have been applied to the
+ branch with:
+
+ cvs diff -r EMACS_`NUMBER'_BASE -r EMACS_`NUMBER'_RC
+
+ or merge changes back to the trunk with "cvs update -j", if
+ necessary.
+
+ After doing this, increase the version number on the trunk as per
+ step 4.
+
+ Also, open a Savannah support request asking for commits to the
+ new branch to be sent to the emacs-diffs mailing list (by default,
+ the list normally only gets commits to the trunk).
-12. Now you should upload the files to the GNU ftp server. In order to
+11. Now you should upload the files to the GNU ftp server. In order to
do that, you must be registered as an Emacs maintainer and have your
GPG key acknowledged by the ftp people. Mail <ftp-upload@gnu.org>
for instructions. Once you are there, for each file FILE to be
For a pretest, place the files in /incoming/alpha instead, so that
they appear on ftp://alpha.gnu.org/.
-13. After five minutes, verify that the files are visible at
+ For a release, upload a bz2 tarfile as well; this can save a lot
+ of bandwidth.
+
+12. After five minutes, verify that the files are visible at
ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at
ftp://ftp.gnu.org/gnu/emacs/ for a release.
-14. For a pretest, let Richard Stallman <rms@gnu.org> know about the new
- pretest and tell him to announce it using the announcement you prepared.
- Remind him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
-
-15. Shortly before the release, cut the branch with the following commands:
-
- cvs rtag EMACS_`NUMBER'_BASE
- cvs rtag -b EMACS_`NUMBER'_RC -r EMACS_`NUMBER'_BASE
-
-where `NUMBER' is the major version number of the release. This makes it
-easier to see what changes have been applied to the branch with:
-
- cvs diff -r EMACS_`NUMBER'_BASE -r EMACS_`NUMBER'_RC
-
-or merge changes back to the trunk with "cvs update -j", if necessary.
-
-After doing this, increase the version number on the trunk as per step 4.
-
-16. For a release, Richard should prepare the announcement himself,
- possibly starting from a previous announcment.
-
-# arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390
+13. For a pretest, announce it on emacs-devel and BCC the pretesters.
+ For a release, announce it on info-gnu@gnu.org,
+ info-gnu-emacs@gnu.org, and emacs-devel.
HCoop / bpt / emacs.git / blobdiff