diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-27 18:24:48 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-27 18:24:48 +0000 |
| commit | 9e2a2647758db83b490e2993aa31cd4607305a82 (patch) | |
| tree | 9c3d41b47bcd316c60d56bef8d7fd32789e59411 /admin/admin.el | |
| parent | 7f19297073b2dd6c28987bf5663933591f59e91e (diff) | |
| download | emacs-9e2a2647758db83b490e2993aa31cd4607305a82.tar.gz | |
Remove support for Mac Carbon.
* mactoolbox.c:
* macterm.h:
* macterm.c:
* macselect.c:
* macmenu.c:
* macgui.h:
* macfns.c:
* mac.c: Remove file.
* s/darwin.h:
* m/intel386.h:
* xfaces.c:
* xdisp.c:
* window.c:
* tparam.c:
* termhooks.h:
* termcap.c:
* term.c:
* syssignal.h:
* sysselect.h:
* sysdep.c:
* process.c:
* lread.c:
* lisp.h:
* keyboard.c:
* image.c:
* fringe.c:
* frame.h:
* frame.c:
* fontset.c:
* font.h:
* font.c:
* fns.c:
* fileio.c:
* emacs.c:
* dispnew.c:
* dispextern.h:
* config.in:
* atimer.c:
* Makefile.in: Remove code for Carbon
* erc.el: Remove code for Carbon.
Remove support for Mac Carbon.
* term/mac-win.el: Remove file
* international/mule-cmds.el:
* version.el:
* startup.el:
* simple.el:
* mwheel.el:
* mouse.el:
* loadup.el:
* isearch.el:
* info.el:
* frame.el:
* faces.el:
* disp-table.el:
* cus-start.el:
* cus-face.el:
* cus-edit.el:
* Makefile.in: Remove code for Carbon.
Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.
* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.
* ns-emacs.texi:
* faq.texi: Remove mentions of Mac Carbon.
* os.texi:
* frames.texi:
* display.texi: Remove mentions of Mac Carbon.
* xresources.texi: Remove mentions of Mac Carbon.
* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.
Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL: Remove code for Carbon.
* configure: Regenerate.
Diffstat (limited to 'admin/admin.el')
| -rw-r--r-- | admin/admin.el | 59 |
1 files changed, 1 insertions, 58 deletions
diff --git a/admin/admin.el b/admin/admin.el index f1d1b308f88..26072ead86f 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -123,43 +123,7 @@ Root must be the root of an Emacs source tree." (set-version-in-file root "nt/emacs.rc" comma-space-version (rx (and "\"ProductVersion\"" (0+ space) ?, (0+ space) ?\" (submatch (1+ (in "0-9, "))) - "\\0\""))) - ;; Some files in the "mac" subdirectory also contain the version - ;; number. - (set-version-in-file - root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings" - version (rx (and "CFBundleShortVersionString" (0+ space) ?= (0+ space) ?\" - (submatch (1+ (in "0-9.")))))) - (set-version-in-file - root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings" - version (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) ?\" - (submatch (1+ (in "0-9.")))))) - (set-version-in-file root "mac/src/Emacs.r" (car version-components) - (rx (and "GNU Emacs " (submatch (1+ (in "0-9"))) - " for Mac OS"))) - (set-version-in-file root "mac/src/Emacs.r" (car version-components) - (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\, - (0+ space) "/* Major revision in BCD */"))) - (set-version-in-file root "mac/src/Emacs.r" (cadr version-components) - (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\, - (0+ space) "/* Minor revision in BCD */"))) - (set-version-in-file root "mac/src/Emacs.r" (cadr (cdr version-components)) - (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\, - (0+ space) "/* Non-final release # */"))) - (set-version-in-file root "mac/src/Emacs.r" version - (rx (and (submatch (1+ (in "0-9."))) (0+ space) ?\" ?\, - (0+ space) "/* Short version number */"))) - (set-version-in-file root "mac/src/Emacs.r" version - (rx (and "/* Short version number */" (0+ space) ?\" - (submatch (1+ (in "0-9.")))))) - (let* ((third-component (string-to-number (cadr (cdr version-components)))) - (release (cond ((>= third-component 90) "alpha") - ((>= third-component 50) "development") - (t "final")))) - (set-version-in-file - root "mac/src/Emacs.r" release - (rx (and (submatch (1+ (in "a-z"))) (0+ space) ?\, (0+ space) - "/* development, alpha, beta, or final (release) */"))))) + "\\0\"")))) ;; nextstep. (set-version-in-file root "nextstep/Cocoa/Emacs.base/Contents/Info.plist" @@ -211,29 +175,8 @@ Root must be the root of an Emacs source tree." (set-version-in-file root "lib-src/rcs2log" copyright (rx (and "Copyright" (0+ space) ?= (0+ space) ?\' (submatch (1+ nonl))))) - (set-version-in-file - root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings" - copyright (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) ?\" - (1+ anything) - (submatch "Copyright" (1+ (not (in ?\"))))))) ;; This one is a nuisance, as it needs to be split over two lines. (string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright) - (let ((csign "\\0xa9") - (cyear (match-string 1 copyright)) ; "Copyright (C) 2007 " - (owner (match-string 2 copyright))) ; "Free Software Foundation, Inc." - (set-version-in-file root "mac/src/Emacs.r" - (regexp-quote - (replace-regexp-in-string "(C)" - (regexp-quote csign) cyear)) - (rx (and - (submatch "Copyright" (0+ space) (eval csign) - (0+ space) (= 4 num) - (0+ (not (in ?\")))) ?\"))) - (set-version-in-file root "mac/src/Emacs.r" owner - (rx (and ?\" - (submatch (1+ (not (in ?\")))) - ?\" (0+ space) - "/* Long version number */")))) ;; nextstep. (set-version-in-file root "nextstep/Cocoa/Emacs.base/Contents/Info.plist" |