procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update scripts and text to refer to version number string in emacs.c

Browse source 
instead of version.el.
This commit is contained in:
Ken Raeburn 2010-05-15 17:12:44 -04:00
parent 8c5ff6dd24
commit e45b9e1939
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
admin/ChangeLog
View file

@ -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.

8
admin/admin.el
View file

@ -60,8 +60,8 @@ Root must be the root of an Emacs source tree."
(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 @@ Root must be the root of an Emacs source tree."
(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 ?\")))

2
admin/make-tarball.txt
View file

@ -31,7 +31,7 @@ For each step, check for possible errors.
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.

2
admin/quick-install-emacs
View file

@ -171,7 +171,7 @@ test x"$SRC" = x && { SRC="`get_config_var srcdir`" || exit 4 ; }
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"