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 | 3d074c725507d130eea81600a7d5c3664436edef (patch) | |
tree | 07445cef5cede10df875d100b94f93a3e61e7636 /admin | |
parent | 66b49b089fc27e774332e7e01999c6fe99744394 (diff) | |
download | emacs-3d074c725507d130eea81600a7d5c3664436edef.tar.gz |
Remove support for Mac Carbon.remove-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')
-rw-r--r-- | admin/CPP-DEFINES | 5 | ||||
-rw-r--r-- | admin/ChangeLog | 7 | ||||
-rw-r--r-- | admin/FOR-RELEASE | 2 | ||||
-rw-r--r-- | admin/admin.el | 59 | ||||
-rw-r--r-- | admin/make-tarball.txt | 3 |
5 files changed, 11 insertions, 65 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 54aef9b1cf3..bbfdc59f16f 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -3,8 +3,6 @@ of their use. Feel free to add more macros and more categories. ** Distinguishing OSes ** -MAC_OS8 Compiling for Mac OS Classic (v8 or v9). No longer supported, all code using it can be removed. -MAC_OSX Compiling for Mac OS X. Not bare Darwin. CYGWIN Compiling the Cygwin port. __CYGWIN__ Ditto MSDOS Compiling the MS-DOS port. @@ -21,8 +19,6 @@ USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type inst ** Distinguishing GUIs ** HAVE_NTGUI Use the native W32 GUI for windows, frames, menus&scrollbars. -MAC_OS Compiling for the `mac' window-system. -HAVE_CARBON Compile support for the Carbon GUI. Requires MAC_OS? HAVE_NS Use the NeXT/OpenStep/Cocoa UI under Mac OS X or GNUstep. NS_IMPL_GNUSTEP Compile support for GNUSTEP implementation of NS GUI API. NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API. @@ -38,7 +34,6 @@ USE_GTK Use the Gtk toolkit for menus&scrollbars. Requires HAVE_X11. FRAME_TERMCAP_P A tty (character terminal) frame. FRAME_X_P A frame on X Window system. FRAME_MSDOS_P An MS-DOS frame (used only by the DOS port). -FRAME_MAC_P A Mac frame. FRAME_W32_P A frame using native MS-Windows GUI. FRAME_WINDOW_P A GUI frame (like X, w32, etc.) diff --git a/admin/ChangeLog b/admin/ChangeLog index e3e8d86edb7..06ad75ce5e9 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,10 @@ +2008-07-27 Dan Nicolaescu <dann@ics.uci.edu> + + * make-tarball.txt: + * admin.el: + * FOR-RELEASE: + * CPP-DEFINES: Remove mentions of Mac Carbon. + 2008-07-16 Glenn Morris <rgm@gnu.org> * admin.el (set-version, set-copyright): Add nextstep/ files. diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 57e1163b7f4..3a37dc93a09 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -125,6 +125,8 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00951.html * DOCUMENTATION +** Verify if doc/emacs/macos.texi is still useful, remove it if it is not. + ** Document multi-tty features http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01639.html http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01602.html 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" diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index a5be0ca1d6f..4650c88cefd 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -23,8 +23,7 @@ For each step, check for possible errors. 6. Commit configure, README, doc/emacs/emacs.texi, doc/lispref/elisp.texi, etc/AUTHORS, lisp/version.el, - mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings, - mac/src/Emacs.r, nt/emacs.rc. Copy lisp/loaddefs.el to + nt/emacs.rc. 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. |