Mercurial > emacs
changeset 108602:ed8614d73caa
Update scripts and text to refer to version number string in emacs.c
instead of version.el.
| author | Ken Raeburn <raeburn@raeburn.org> |
|---|---|
| date | Sat, 15 May 2010 17:12:44 -0400 |
| parents | 786c4a4a3817 |
| children | 135d8ad190d8 |
| files | admin/ChangeLog admin/admin.el admin/make-tarball.txt admin/quick-install-emacs |
| diffstat | 4 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/ChangeLog Sat May 15 17:11:37 2010 -0400 +++ b/admin/ChangeLog Sat May 15 17:12:44 2010 -0400 @@ -1,3 +1,13 @@ +2010-05-15 Ken Raeburn <raeburn@raeburn.org> + + * admin.el (set-version, set-copyright): Update emacs.c instead of + version.el. + + * make-tarball.txt: Update filename list in step 6. + + * quick-install-emacs: Scan emacs.c instead of version.el for + version string. + 2010-05-07 Chong Yidong <cyd@stupidchicken.com> * Version 23.2 released.
--- a/admin/admin.el Sat May 15 17:11:37 2010 -0400 +++ b/admin/admin.el Sat May 15 17:12:44 2010 -0400 @@ -60,8 +60,8 @@ (interactive "DEmacs root directory: \nsVersion number: ") (unless (file-exists-p (expand-file-name "src/emacs.c" root)) (error "%s doesn't seem to be the root of an Emacs source tree" root)) - (set-version-in-file root "lisp/version.el" version - (rx (and "emacs-version" (0+ space) + (set-version-in-file root "src/emacs.c" version + (rx (and "emacs_version" (0+ (not (in ?\"))) ?\" (submatch (1+ (not (in ?\")))) ?\"))) (set-version-in-file root "README" version (rx (and "version" (1+ space) @@ -184,8 +184,8 @@ (format-time-string "%Y"))))) (unless (file-exists-p (expand-file-name "src/emacs.c" root)) (error "%s doesn't seem to be the root of an Emacs source tree" root)) - (set-version-in-file root "lisp/version.el" copyright - (rx (and "emacs-copyright" (0+ space) + (set-version-in-file root "src/emacs.c" copyright + (rx (and "emacs_copyright" (0+ (not (in ?\"))) ?\" (submatch (1+ (not (in ?\")))) ?\"))) (set-version-in-file root "lib-src/ebrowse.c" copyright (rx (and "emacs_copyright" (0+ (not (in ?\")))
--- a/admin/make-tarball.txt Sat May 15 17:11:37 2010 -0400 +++ b/admin/make-tarball.txt Sat May 15 17:12:44 2010 -0400 @@ -31,7 +31,7 @@ make bootstrap 6. Commit configure, README, doc/emacs/emacs.texi, - doc/lispref/elisp.texi, etc/AUTHORS, lisp/version.el, nt/emacs.rc, + 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.
--- a/admin/quick-install-emacs Sat May 15 17:11:37 2010 -0400 +++ b/admin/quick-install-emacs Sat May 15 17:12:44 2010 -0400 @@ -171,7 +171,7 @@ test x"$prefix" = x && { prefix="`get_config_var prefix`" || exit 4 ; } test x"$ARCH" = x && { ARCH="`get_config_var host`" || exit 4 ; } -VERSION=`grep 'defconst[ ]*emacs-version' $SRC/lisp/version.el \ +VERSION=`grep 'char emacs_version' $SRC/src/emacs.c \ | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` DST_SHARE="$prefix/share/emacs/$VERSION"