2013-03-05 17:13:01 +00:00
|
|
|
Instructions to create pretest or release tarballs. -*- coding: utf-8 -*-
|
|
|
|
-- originally written by Gerd Moellmann, amended by Francesco Potortì
|
2004-02-26 09:34:52 +00:00
|
|
|
with the initial help of Eli Zaretskii
|
2002-12-05 12:40:56 +00:00
|
|
|
|
|
|
|
|
2013-01-10 04:12:46 +00:00
|
|
|
Steps to take before starting on the first pretest in any release sequence:
|
|
|
|
|
2016-02-16 05:38:21 +00:00
|
|
|
0. The release branch (e.g. emacs-25) should already have been made
|
2014-05-02 19:45:17 +00:00
|
|
|
and you should use it for all that follows. Diffs from this
|
2014-11-11 18:28:02 +00:00
|
|
|
branch should be going to the emacs-diffs mailing list.
|
2014-05-02 19:45:17 +00:00
|
|
|
|
Switch from Automake to GNU Make
Emacs assumes GNU Make, and GNU Make has much of the functionality of
Automake built-in. The Emacs build process uses Automake primarily
because Emacs uses some Gnulib code and Gnulib formerly required
Automake. Now that Gnulib no longer requires Automake, Emacs can
stop using Automake and this should simplify Emacs maintenance
in the future (Bug#26100). Although this patch may look long, most of
it is generated automatically: the changes to build-aux/config.guess,
build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are
all done by admin/merge-gnulib.
* .gitignore: Remove build-aux/ar-lib, build-aux/compile,
build-aux/config.guess, build-aux/config.sub, build-aux/depcomp,
build-aux/install-sh, build-aux/missing, and lib/Makefile.in,
as they are no longer built by autogen.sh.
Add lib/gnulib.mk, as it is now built by 'configure'.
Remove nt/gnulib.mk, as it is no longer built by 'make'.
* INSTALL.REPO, README, admin/make-tarball.txt:
Remove mention of Automake.
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib)
(AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS)
($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS)
($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh):
Remove.
($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in)
($(srcdir)/src/config.in):
Use autogen.sh instead of doing it by hand.
* admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)):
New vars, to simplify processing of avoided modules.
(GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES.
Add --gnu-make, and change makefile name to gnulib.mk.in.
Copy config.guess, config.sub, and install-sh too, since
Automake no longer does that for us.
* admin/notes/copyright:
* admin/update_autogen (genfiles):
Update list of files.
Remove hack for nt/gnulib.mk, a file that is no longer needed.
* autogen.sh (progs): Remove Automake.
(automake_min): Remove.
Build aclocal.m4 so that autoreconf need not use aclocal.
* build-aux/config.guess, build-aux/config.sub:
* build-aux/install-sh:
New files, copied from Gnulib. These are now updated by
admin/merge-gnulib instead by autogen.sh.
* configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL):
Remove.
(AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call.
(AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O.
(BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed.
(--disable-silent-rules): New option, since Automake no longer
does this for us.
(AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother
with AM_SUBST_NOTMAKE.
(AC_PROG_INSTALL): Add call.
(MAKEINFO): Do not bother with the 'missing' program.
(MAKEINFO, SYSTEM_TYPE): AC_SUBST.
(AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk.
(SUBDIR_MAKEFILES): Remove duplication.
* lib/Makefile.am: Remove, replacing with:
* lib/Makefile.in: New file, with the old Makefile.am contents
and with the following changes:
(AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST)
(MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES)
(AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD)
(EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS):
Remove.
(VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR)
(AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE)
(libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean)
(mostlyclean, distclean, bootstrap-clean, maintainer-clean):
New macros and rules, since Automake no longer does them.
Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt,
instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT.
Include dependency files if AUTO_DEPEND.
(ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS):
New macros.
(bootstrap-clean): Depend on distclean, not maintainer-clean,
and remove gnulib.mk.
(AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile):
New macros and rules, copied from ../Makefile.in.
($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES.
(.c.o, e-%.o): New generic rules.
* lib/gnulib.mk: Remove.
* lib/gnulib.mk.in: New file, which is built by autogen.sh
and contains much of what used to be in lib/gnulib.mk.
* m4/gnulib-common.m4: Copy from gnulib.
* make-dist: Do not distribute build-aux/compile, build-aux/depcomp,
build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk,
nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in,
lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, ${srcdir}/gnulib.mk): Remove.
* nt/gnulib-cfg.mk: New file, which supersedes ...
* nt/gnulib-modules-to-delete.cfg: ... this file, which is removed.
* src/Makefile.in (ACLOCAL_INPUTS): Remove.
(AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it.
($(top_srcdir)/configure, ../config.status, config.in Makefile):
Defer to parent Makefile.
2017-03-17 18:33:47 +00:00
|
|
|
1. Decide on versions of m4 and autoconf, and ensure you will
|
2013-01-03 02:04:31 +00:00
|
|
|
have them available for the duration of the release process.
|
|
|
|
|
2013-01-10 04:12:46 +00:00
|
|
|
2. Consider increasing the value of the variable
|
2015-09-11 18:04:24 +00:00
|
|
|
'customize-changed-options-previous-release' in cus-edit.el to
|
2013-01-10 04:12:46 +00:00
|
|
|
refer to a newer version of Emacs. (This is probably needed only
|
|
|
|
when preparing the first pretest for a major Emacs release.)
|
|
|
|
Commit cus-edit.el if changed.
|
|
|
|
|
2017-09-13 22:52:52 +00:00
|
|
|
3. Remove any old pretests from https://alpha.gnu.org/gnu/emacs/pretest.
|
2015-09-11 18:04:24 +00:00
|
|
|
You can use 'gnupload --delete' (see below for more gnupload details).
|
2013-01-10 04:12:46 +00:00
|
|
|
|
|
|
|
General steps (for each step, check for possible errors):
|
|
|
|
|
2014-11-11 18:28:02 +00:00
|
|
|
1. git pull # fetch from the repository
|
|
|
|
git status # check for locally modified files
|
2002-12-05 12:40:56 +00:00
|
|
|
|
2016-02-16 05:38:21 +00:00
|
|
|
Ensure that you have a clean, unmodified state.
|
|
|
|
If you switched in-place from another branch to the release branch,
|
|
|
|
there could be inappropriate generated ignored files left over.
|
|
|
|
You might want to use "git status --ignored" to check for such files,
|
|
|
|
or some form of "git clean -x". It's probably simpler and safer to
|
|
|
|
make a new working directory exclusively for the release branch.
|
|
|
|
|
2014-05-02 19:45:17 +00:00
|
|
|
2. Regenerate the etc/AUTHORS file:
|
2013-01-10 04:12:46 +00:00
|
|
|
M-: (require 'authors) RET
|
|
|
|
M-x authors RET
|
|
|
|
|
2016-05-25 16:47:13 +00:00
|
|
|
(This first updates the current versioned ChangeLog.N)
|
|
|
|
|
2014-01-17 02:11:36 +00:00
|
|
|
If there is an "*Authors Errors*" buffer, address the issues.
|
2016-05-25 16:47:13 +00:00
|
|
|
If there was a ChangeLog typo, fix the relevant entry.
|
|
|
|
If a file was deleted or renamed, consider adding an appropriate
|
|
|
|
entry to authors-ignored-files, authors-valid-file-names, or
|
2015-04-07 07:00:55 +00:00
|
|
|
authors-renamed-files-alist.
|
2013-01-10 04:12:46 +00:00
|
|
|
|
2016-05-25 16:47:13 +00:00
|
|
|
If necessary, repeat 'C-u M-x authors' after making those changes.
|
2013-01-10 04:12:46 +00:00
|
|
|
Save the "*Authors*" buffer as etc/AUTHORS.
|
|
|
|
Check the diff looks reasonable. Maybe add entries to
|
|
|
|
authors-ambiguous-files or authors-aliases, and repeat.
|
2015-04-07 07:00:55 +00:00
|
|
|
Commit any fixes to authors.el.
|
2003-09-29 10:08:11 +00:00
|
|
|
|
2014-05-02 19:45:17 +00:00
|
|
|
3. Set the version number (M-x load-file RET admin/admin.el RET, then
|
2016-05-24 17:00:57 +00:00
|
|
|
M-x set-version RET). For a pretest, start at version .90. After
|
|
|
|
.99, use .990 (so that it sorts).
|
2009-02-03 04:04:15 +00:00
|
|
|
|
2017-02-08 17:48:34 +00:00
|
|
|
The final pretest should be a release candidate.
|
|
|
|
Before a release candidate is made, the tasks listed in
|
|
|
|
admin/release-process must be completed.
|
|
|
|
|
|
|
|
Set the version number to that of the actual release. Pick a date
|
|
|
|
about a week from now when you intend to make the release. Use M-x
|
2016-05-24 17:00:57 +00:00
|
|
|
add-release-logs to add entries to etc/HISTORY and the ChangeLog
|
|
|
|
file. It's best not to commit these files until the release is
|
|
|
|
actually made. Merge the entries from (unversioned) ChangeLog
|
|
|
|
into the top of the current versioned ChangeLog.N and commit that
|
|
|
|
along with etc/HISTORY. Then you can tag that commit as the
|
|
|
|
release.
|
2015-04-07 07:00:55 +00:00
|
|
|
|
2015-04-03 15:16:23 +00:00
|
|
|
Name the tar file as emacs-XX.Y-rc1.tar. If all goes well in the
|
|
|
|
following week, you can simply rename the file and use it for the
|
|
|
|
actual release. If you need another release candidate, remember
|
2016-05-24 17:00:57 +00:00
|
|
|
to adjust the ChangeLog and etc/HISTORY entries.
|
2013-03-10 02:14:29 +00:00
|
|
|
|
2015-04-18 21:09:12 +00:00
|
|
|
If you need to change only a file(s) that cannot possibly affect
|
|
|
|
the build (README, ChangeLog, NEWS, etc.) then rather than doing
|
|
|
|
an entirely new build, it is better to unpack the existing
|
|
|
|
tarfile, modify the file(s), and tar it back up again.
|
|
|
|
|
|
|
|
Never replace an existing tarfile! If you need to fix something,
|
|
|
|
always upload it with a different name.
|
|
|
|
|
2014-05-02 19:45:17 +00:00
|
|
|
4. autoreconf -i -I m4 --force
|
2009-07-11 10:40:30 +00:00
|
|
|
make bootstrap
|
2002-12-05 12:40:56 +00:00
|
|
|
|
2013-08-15 06:38:44 +00:00
|
|
|
make -C etc/refcards
|
|
|
|
make -C etc/refcards clean
|
|
|
|
|
2017-03-07 13:25:45 +00:00
|
|
|
5. Copy lisp/loaddefs.el to lisp/ldefs-boot.el.
|
|
|
|
|
|
|
|
Commit ChangeLog.N, etc/AUTHORS, lisp/ldefs-boot.el, and the
|
2016-05-25 16:47:13 +00:00
|
|
|
files changed by M-x set-version.
|
2002-12-05 12:40:56 +00:00
|
|
|
|
2014-05-02 19:45:17 +00:00
|
|
|
If someone else made a commit between step 1 and now,
|
|
|
|
you need to repeat from step 4 onwards. (You can commit the files
|
|
|
|
from step 2 and 3 earlier to reduce the chance of this.)
|
|
|
|
|
|
|
|
6. ./make-dist --snapshot --no-compress
|
2013-01-10 04:12:46 +00:00
|
|
|
|
2014-05-02 19:45:17 +00:00
|
|
|
Check the contents of the new tar with admin/diff-tar-files
|
|
|
|
against the previous release (if this is the first pretest) or the
|
|
|
|
previous pretest. If you did not make the previous pretest
|
2017-09-13 22:52:52 +00:00
|
|
|
yourself, find it at <https://alpha.gnu.org/gnu/emacs/pretest>.
|
|
|
|
Releases are of course at <https://ftp.gnu.org/pub/gnu/emacs/>.
|
2002-12-05 12:40:56 +00:00
|
|
|
|
2009-02-04 03:42:04 +00:00
|
|
|
If this is the first pretest of a major release, just comparing
|
|
|
|
with the previous release may overlook many new files. You can try
|
2015-09-11 18:04:24 +00:00
|
|
|
something like 'find . | sort' in a clean repository, and compare the
|
2010-10-22 03:28:21 +00:00
|
|
|
results against the new tar contents.
|
2009-02-04 03:42:04 +00:00
|
|
|
|
2014-05-02 19:45:17 +00:00
|
|
|
7. tar -xf emacs-NEW.tar; cd emacs-NEW
|
2013-01-10 04:12:46 +00:00
|
|
|
./configure --prefix=/tmp/emacs && make && make install
|
2015-09-11 18:04:24 +00:00
|
|
|
Use 'script' or M-x compile to save the compilation log in
|
2002-12-11 10:02:23 +00:00
|
|
|
compile-NEW.log and compare it against an old one. The easiest way
|
|
|
|
to do that is to visit the old log in Emacs, change the version
|
|
|
|
number of the old Emacs to __, do the same with the new log and do
|
2013-03-07 07:03:18 +00:00
|
|
|
M-x ediff. Especially check that Info files aren't built, and that
|
|
|
|
no autotools (autoconf etc) run.
|
2002-12-11 10:02:23 +00:00
|
|
|
|
2014-11-13 16:50:41 +00:00
|
|
|
8. cd EMACS_ROOT_DIR && git tag -a TAG && git push origin tag TAG
|
2012-11-24 15:24:40 +00:00
|
|
|
TAG is emacs-XX.Y.ZZ for a pretest, emacs-XX.Y for a release.
|
2002-12-11 10:02:23 +00:00
|
|
|
|
2014-05-02 19:45:17 +00:00
|
|
|
9. Decide what compression schemes to offer.
|
2013-01-10 04:12:46 +00:00
|
|
|
For a release, at least gz and xz:
|
|
|
|
gzip --best -c emacs-NEW.tar > emacs-NEW.tar.gz
|
|
|
|
xz -c emacs-NEW.tar > emacs-NEW.tar.xz
|
2014-05-02 19:45:17 +00:00
|
|
|
For pretests, just xz is probably fine (saves bandwidth).
|
2013-01-10 04:12:46 +00:00
|
|
|
|
|
|
|
Now you should upload the files to the GNU ftp server. In order to
|
2005-02-06 22:32:31 +00:00
|
|
|
do that, you must be registered as an Emacs maintainer and have your
|
2012-12-23 02:41:17 +00:00
|
|
|
GPG key acknowledged by the ftp people. For instructions, see
|
2017-09-13 22:52:52 +00:00
|
|
|
https://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html
|
2014-05-02 19:45:17 +00:00
|
|
|
The simplest method to upload is to use the gnulib
|
2017-09-13 22:52:52 +00:00
|
|
|
<https://www.gnu.org/s/gnulib/> script "build-aux/gnupload":
|
2013-01-10 04:12:46 +00:00
|
|
|
|
|
|
|
For a pretest:
|
|
|
|
gnupload [--user your@gpg.key.email] --to alpha.gnu.org:emacs/pretest \
|
|
|
|
FILE.gz FILE.xz ...
|
|
|
|
|
|
|
|
For a release:
|
|
|
|
gnupload [--user your@gpg.key.email] --to ftp.gnu.org:emacs \
|
|
|
|
FILE.gz FILE.xz ...
|
|
|
|
|
|
|
|
You only need the --user part if you have multiple GPG keys and do
|
|
|
|
not want to use the default.
|
|
|
|
Obviously, if you do not have a fast uplink, be prepared for the
|
|
|
|
upload to take a while.
|
|
|
|
|
|
|
|
|
|
|
|
If you prefer to do it yourself rather than use gnupload:
|
|
|
|
|
|
|
|
For each FILE, create a detached GPG binary signature and a
|
|
|
|
clearsigned directive file like this:
|
2011-09-26 03:40:18 +00:00
|
|
|
|
2005-02-06 22:32:31 +00:00
|
|
|
gpg -b FILE
|
|
|
|
echo directory: emacs/pretest > FILE.directive (for a pretest)
|
|
|
|
echo directory: emacs > FILE.directive (for a release)
|
|
|
|
gpg --clearsign FILE.directive
|
2006-10-13 20:47:27 +00:00
|
|
|
Upload by anonymous ftp to ftp://ftp-upload.gnu.org/ the files FILE,
|
|
|
|
FILE.sig, FILE.directive.asc.
|
|
|
|
For a release, place the files in the /incoming/ftp directory.
|
|
|
|
For a pretest, place the files in /incoming/alpha instead, so that
|
2017-09-13 22:52:52 +00:00
|
|
|
they appear on https://alpha.gnu.org/.
|
2005-02-06 22:32:31 +00:00
|
|
|
|
2014-05-02 19:45:17 +00:00
|
|
|
10. After five minutes, verify that the files are visible at
|
2017-09-13 22:52:52 +00:00
|
|
|
https://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or
|
|
|
|
https://ftp.gnu.org/gnu/emacs/ for a release.
|
2003-03-19 13:02:12 +00:00
|
|
|
|
2013-01-10 04:12:46 +00:00
|
|
|
Download them and check the signatures. Check they build.
|
|
|
|
|
2014-05-02 19:45:17 +00:00
|
|
|
11. Send an announcement to: emacs-devel, and bcc: info-gnu-emacs@gnu.org.
|
|
|
|
For a pretest, also bcc: platform-testers@gnu.org.
|
2014-10-12 18:41:05 +00:00
|
|
|
For a release, also bcc: info-gnu@gnu.org.
|
2014-05-02 19:45:17 +00:00
|
|
|
(The reason for using bcc: is to make it less likely that people
|
|
|
|
will followup on the wrong list.)
|
|
|
|
See the info-gnu-emacs mailing list archives for the form
|
|
|
|
of past announcements. The first pretest announcement, and the
|
|
|
|
release announcement, should have more detail.
|
2017-11-03 19:55:22 +00:00
|
|
|
Use the emacs-devel topic 'emacs-announce'. The best way to do
|
|
|
|
this is to add a header "Keywords: emacs-announce" to your mail.
|
|
|
|
(You can also put it in the Subject, but this is not as good
|
|
|
|
because replies that invariably are not announcements also get
|
|
|
|
sent out as if they were.)
|
2014-05-02 19:45:17 +00:00
|
|
|
|
2015-04-18 21:09:12 +00:00
|
|
|
12. After a release, update the Emacs pages as below.
|
|
|
|
|
|
|
|
|
|
|
|
UPDATING THE EMACS WEB PAGES AFTER A RELEASE
|
|
|
|
|
|
|
|
As soon as possible after a release, the Emacs web pages should be updated.
|
|
|
|
Anyone with write access to the Emacs code repository can do this.
|
2017-09-13 22:52:52 +00:00
|
|
|
For instructions, see <https://savannah.gnu.org/cvs/?group=emacs>.
|
2015-04-18 21:09:12 +00:00
|
|
|
Changes go live more or less as soon as they are committed.
|
|
|
|
|
|
|
|
The pages to update are:
|
|
|
|
|
|
|
|
emacs.html (for a new major release, a more thorough update is needed)
|
|
|
|
history.html
|
|
|
|
add the new NEWS file as news/NEWS.xx.y
|
|
|
|
|
2017-02-03 14:50:24 +00:00
|
|
|
For every new release, a banner is displayed on top of the emacs.html
|
|
|
|
page. Uncomment and the release banner in emacs.html. Keep it on the
|
|
|
|
page for about a month, then comment it again.
|
|
|
|
|
2015-04-18 21:09:12 +00:00
|
|
|
Use M-x make-manuals from admin/admin.el to regenerate the html
|
|
|
|
manuals in manual/. If there are new manuals, add appropriate index
|
|
|
|
pages in manual/ and add them to manual/index.html. In the
|
|
|
|
manual/html_node directory, delete any old manual pages that are no
|
|
|
|
longer present.
|
|
|
|
|
|
|
|
Tar up the generated html_node/emacs/ and elisp/ directories and update
|
|
|
|
the files manual/elisp.html_node.tar.gz and emacs.html_node.tar.gz.
|
|
|
|
|
2017-10-28 00:45:23 +00:00
|
|
|
Use M-x make-manuals-dist from admin/admin.el to update the
|
2015-04-18 21:09:12 +00:00
|
|
|
manual/texi/ tarfiles.
|
|
|
|
|
|
|
|
Add compressed copies of the main info pages from the tarfile to manual/info/.
|
|
|
|
|
|
|
|
Update the refcards/pdf/ and ps/ directories, and also
|
|
|
|
refcards/emacs-refcards.tar.gz (use make -C etc/refcards pdf ps dist).
|
|
|
|
|
2017-09-13 22:52:52 +00:00
|
|
|
Browsing <https://web.cvs.savannah.gnu.org/viewvc/?root=emacs> is one
|
2015-04-18 21:09:12 +00:00
|
|
|
way to check for any files that still need updating.
|