From 1a71dc4933266d80b229b9ef43919c6da93a822c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 21 Oct 2010 20:28:21 -0700 Subject: * admin/make-tarball.txt: Misc updates. --- admin/make-tarball.txt | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'admin') diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index f685dd5e50f..6ff7a815cb7 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -4,7 +4,8 @@ Instructions to create pretest or release tarballs. 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 @@ -27,24 +28,23 @@ For each step, check for possible errors. refer to a newer release of Emacs. (This is probably needed only when preparing a major Emacs release, or branching for it.) -5. rm configure; autoconf +5. rm configure src/config.in; autoconf; autoheader make bootstrap -6. Commit configure, README, doc/emacs/emacs.texi, - doc/lispref/elisp.texi, etc/AUTHORS, src/emacs.c, nt/emacs.rc, - 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. +6. Commit configure, src/config.in, 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 . + tarballs may be found at ; + old release tarballs are at . 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 -f | grep -v CVS...etc' in a clean CVS tree, - and compare the results against the new tar contents. + 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 @@ -108,5 +108,3 @@ For each step, check for possible errors. For a release, announce it on info-gnu@gnu.org, info-gnu-emacs@gnu.org, and emacs-devel. - -# arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390 -- cgit v1.2.1 From e63715a07129329288ee63e9a1c2338fc53320de Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 30 Oct 2010 17:38:13 -0700 Subject: * admin/notes/bugtracker: Mention "found". --- admin/notes/bugtracker | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'admin') diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index 5b3af5e242c..9c7631fdfae 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -384,6 +384,14 @@ fixed 123 23.0.60 *** To remove a "fixed" mark: notfixed 123 23.0.60 +*** To make a bug as present in a particular version: +found 123 23.2 +NB if there is no specified "fixed" version, or if there is one and it +is earlier than the found version, this reopens a closed bug. + +The leading "23.1;" that M-x report-emacs-bug adds to bug subjects +automatically sets a found version (if none is explicitly specified). + *** To assign or reassign a bug to a package or list of packages: reassign 1234 emacs -- cgit v1.2.1 From eea682b6d1e8a2c518dc8402160bbccd999d64e7 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 4 Nov 2010 13:00:43 -0400 Subject: Notes about elpa.gnu.org for maintainers. --- admin/notes/elpa | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 admin/notes/elpa (limited to 'admin') diff --git a/admin/notes/elpa b/admin/notes/elpa new file mode 100644 index 00000000000..e28d81e6d6e --- /dev/null +++ b/admin/notes/elpa @@ -0,0 +1,42 @@ +NOTES ON THE EMACS PACKAGE ARCHIVE + +Here are instructions on uploading files to the package archive at +elpa.gnu.org, for Emacs maintainers. (If you are not a maintainer, +contact us if you want to submit a package.) + +1. You will need login access to elpa.gnu.org. You will also need to + get the FSF sysadmins to allow ssh access through the FSF firewall + for your local machine. Ensure that your uid, USER, is in the + `elpa' group on elpa.gnu.org; this gives you write access to the + bzr repository from which the packages are managed. + +2. Go to your bzr repository on your local machine. Of, if you don't + have one (you should, if you're tracking Emacs bzr), make one: + + cd $DEVHOME + bzr init-repo elpa/ + cd elpa + + Create a branch for elpa: + + bzr branch bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo package-repo + + Bind the branch: + + cd package-repo/ + echo "public_branch = bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo" >> .bzr/branch/branch.conf + bzr bind bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo + + Now you should be able to do `bzr up' and `bzr commit'. + +3. Changes in bzr do not immediately propagate to the user-facing tree + (i.e., what users see when they do `M-x list-packages'). That tree + is created by a (daily) cron job that does "bzr export". If for + some reason you need to refresh the user-facing tree immediately, + run /home/elpa/bin/package-update.sh as the "elpa" user. + + The Org mode dailies are not part of the repository. After the + package-update.sh script creates the user-facing tree, it copies + the daily tarfile hosted on orgmode.org directly into that tree. + +4. FIXME: How to actually upload a package file. -- cgit v1.2.1 From de4708cbd8ec2185efcad0b20f3e2766f4b95e23 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 9 Nov 2010 20:50:31 -0800 Subject: Comments related to `bzr commit --fixes'. --- admin/notes/bugtracker | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'admin') diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index 5936eead85a..e22a8e5947e 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -449,10 +449,12 @@ http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html ** Bazaar stuff -*** You can use `bzr commit --fixes emacs:123' to mark that a commit fixes +*** You can use `bzr commit --fixes debbugs:123' to mark that a commit fixes Emacs bug 123. You will first need to add a line to your bazaar.conf: -bugtracker_emacs_url = http://debbugs.gnu.org/{id} +bugtracker_debbugs_url = http://debbugs.gnu.org/{id} + +See also log-edit-rewrite-fixes in .dir-locals.el. Note that all this does is add some metadata to the commit, it doesn't actually mark the bug as closed in the tracker. There seems to be no -- cgit v1.2.1 From 6173c5b551055d0903cd8682456cd598a0661c2b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 12 Nov 2010 10:37:27 +0200 Subject: Expand and clarify the description of bugtracker setting for bzr. --- admin/notes/bugtracker | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'admin') diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index e22a8e5947e..a44481ebedf 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -450,10 +450,33 @@ http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html ** Bazaar stuff *** You can use `bzr commit --fixes debbugs:123' to mark that a commit fixes -Emacs bug 123. You will first need to add a line to your bazaar.conf: +Emacs bug 123. You will first need to add a line to your ~/bazaar.conf +or ~/locations.conf: bugtracker_debbugs_url = http://debbugs.gnu.org/{id} +Here "{id}" is a literal string, a placeholder that will be replaced +by the bug number you specify after `--fixes debbugs:' in the bzr +command line (123 in the example above). + +In the bazaar.conf file, this setting should go into the [DEFAULTS] +section. + +In the locations.conf file, it should go into the branch-specific +configuration section for the branch where you want this to be in +effect. For example, if you want this to be in effect for the branch +located at `/home/projects/emacs/trunk', you need to have this in your +~/locations.conf file: + +[/home/projects/emacs/trunk] +bugtracker_debbugs_url = http://debbugs.gnu.org/{id} + +If you want to use this in all Emacs branches whose common parent is +`/home/projects/emacs', put the setting in the [/home/projects/emacs] +section. See "bzr help configuration" for more information about +the *.conf files, their location and formats. See "bzr help bugs" for +more information about the bugtracker_debbugs_url setting. + See also log-edit-rewrite-fixes in .dir-locals.el. Note that all this does is add some metadata to the commit, it doesn't -- cgit v1.2.1 From 43335389f1471541793e2e3e80608822bee59add Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 12 Nov 2010 18:42:12 +0200 Subject: The `fixes' attribute does show in `bzr log'. --- admin/notes/bugtracker | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'admin') diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index a44481ebedf..859d99b03bd 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -480,10 +480,10 @@ more information about the bugtracker_debbugs_url setting. See also log-edit-rewrite-fixes in .dir-locals.el. Note that all this does is add some metadata to the commit, it doesn't -actually mark the bug as closed in the tracker. There seems to be no -way to see this "metadata" with `bzr log', which is rather poor, but -it will show up as a link in a recent loggerhead installation, or with -some of the graphical frontends to bzr log. +actually mark the bug as closed in the tracker. You can see this +information with `bzr log', and it will show up as a link in a recent +loggerhead installation, or with some of the graphical frontends to +`bzr log'. ** Gnus-specific voodoo -- cgit v1.2.1 From 5b9b7ef4489a78fea8f37bcc79385ff234594166 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 21 Nov 2010 19:59:08 +0200 Subject: bugtracker: Correct locations of bzr *.conf files. --- admin/notes/bugtracker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'admin') diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index 859d99b03bd..0ef89739b19 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -450,8 +450,8 @@ http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html ** Bazaar stuff *** You can use `bzr commit --fixes debbugs:123' to mark that a commit fixes -Emacs bug 123. You will first need to add a line to your ~/bazaar.conf -or ~/locations.conf: +Emacs bug 123. You will first need to add a line to one of your +configuration files, ~/.bazaar/bazaar.conf or ~/.bazaar/locations.conf: bugtracker_debbugs_url = http://debbugs.gnu.org/{id} -- cgit v1.2.1 From 0c3b672775df3ba6f1f165e5565765a29ce5616d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 22 Nov 2010 05:52:49 +0200 Subject: bugtracker: REALLY correct locations of bzr *.conf files. --- admin/notes/bugtracker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'admin') diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index 0ef89739b19..ca71214cdcc 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -466,7 +466,7 @@ In the locations.conf file, it should go into the branch-specific configuration section for the branch where you want this to be in effect. For example, if you want this to be in effect for the branch located at `/home/projects/emacs/trunk', you need to have this in your -~/locations.conf file: +~/.bazaar/locations.conf file: [/home/projects/emacs/trunk] bugtracker_debbugs_url = http://debbugs.gnu.org/{id} -- cgit v1.2.1 From e5bd16703f901d9c8e7bc29da98e761f768161fc Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 3 Dec 2010 21:55:23 +0100 Subject: Remove EXPLICIT_SIGN_EXTEND. * lisp.h (union Lisp_Object): Explicitly declare signedness of bit-field. (XINT): Remove variant for EXPLICIT_SIGN_EXTEND. * m/alpha.h (EXPLICIT_SIGN_EXTEND): Don't define. * m/amdx86-64.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/ia64.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/ibms390.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/ibms390x.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/iris4d.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/m68k.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/sparc.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/template.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/hp800.h: Remove file. * m/mips.h: Remove file. * CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove. --- admin/CPP-DEFINES | 1 - admin/ChangeLog | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'admin') diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index b5f4d555ad4..0346bb2e620 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -62,7 +62,6 @@ SIGTYPE SYSTEM_TYPE ** Machine specific macros, decribed in detail in src/m/template.h -EXPLICIT_SIGN_EXTEND LOAD_AVE_CVT LOAD_AVE_TYPE VIRT_ADDR_VARIES diff --git a/admin/ChangeLog b/admin/ChangeLog index 6d114eae003..f5c52f09375 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2010-12-03 Andreas Schwab + + * CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove. + 2010-10-12 Glenn Morris * notes/nextstep: Move here from ../nextstep/DEV-NOTES. -- cgit v1.2.1 From 903653532fd8935d4f07627890b9502618d5a432 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 3 Dec 2010 17:01:43 -0500 Subject: Revert to 2010-12-03T11:48:24Z!jan.h.d@swipnet.se. --- admin/CPP-DEFINES | 1 + admin/ChangeLog | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'admin') diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 0346bb2e620..b5f4d555ad4 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -62,6 +62,7 @@ SIGTYPE SYSTEM_TYPE ** Machine specific macros, decribed in detail in src/m/template.h +EXPLICIT_SIGN_EXTEND LOAD_AVE_CVT LOAD_AVE_TYPE VIRT_ADDR_VARIES diff --git a/admin/ChangeLog b/admin/ChangeLog index f5c52f09375..6d114eae003 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,7 +1,3 @@ -2010-12-03 Andreas Schwab - - * CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove. - 2010-10-12 Glenn Morris * notes/nextstep: Move here from ../nextstep/DEV-NOTES. -- cgit v1.2.1 From 201ef780e052dc7c37ea5829d9a9cea9c4fd568b Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 3 Dec 2010 17:08:05 -0500 Subject: Remove EXPLICIT_SIGN_EXTEND. * lisp.h (union Lisp_Object): Explicitly declare signedness of bit-field. (XINT): Remove variant for EXPLICIT_SIGN_EXTEND. * m/alpha.h (EXPLICIT_SIGN_EXTEND): Don't define. * m/amdx86-64.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/ia64.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/ibms390.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/ibms390x.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/iris4d.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/m68k.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/sparc.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/template.h (EXPLICIT_SIGN_EXTEND): Likewise. * m/hp800.h: Remove file. * m/mips.h: Remove file. --- admin/CPP-DEFINES | 1 - admin/ChangeLog | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'admin') diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index b5f4d555ad4..0346bb2e620 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -62,7 +62,6 @@ SIGTYPE SYSTEM_TYPE ** Machine specific macros, decribed in detail in src/m/template.h -EXPLICIT_SIGN_EXTEND LOAD_AVE_CVT LOAD_AVE_TYPE VIRT_ADDR_VARIES diff --git a/admin/ChangeLog b/admin/ChangeLog index 6d114eae003..f5c52f09375 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2010-12-03 Andreas Schwab + + * CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove. + 2010-10-12 Glenn Morris * notes/nextstep: Move here from ../nextstep/DEV-NOTES. -- cgit v1.2.1