comparison admin/admin.el @ 97043:9592c50233ab remove-carbon

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.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sun, 27 Jul 2008 18:24:48 +0000
parents 53126b877e24
children f13d2ef47961
comparison
equal deleted inserted replaced
97042:0ac199626cb9 97043:9592c50233ab
121 (rx (and "\"FileVersion\"" (0+ space) ?, (0+ space) 121 (rx (and "\"FileVersion\"" (0+ space) ?, (0+ space)
122 ?\" (submatch (1+ (in "0-9, "))) "\\0\""))) 122 ?\" (submatch (1+ (in "0-9, "))) "\\0\"")))
123 (set-version-in-file root "nt/emacs.rc" comma-space-version 123 (set-version-in-file root "nt/emacs.rc" comma-space-version
124 (rx (and "\"ProductVersion\"" (0+ space) ?, 124 (rx (and "\"ProductVersion\"" (0+ space) ?,
125 (0+ space) ?\" (submatch (1+ (in "0-9, "))) 125 (0+ space) ?\" (submatch (1+ (in "0-9, ")))
126 "\\0\""))) 126 "\\0\""))))
127 ;; Some files in the "mac" subdirectory also contain the version
128 ;; number.
129 (set-version-in-file
130 root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings"
131 version (rx (and "CFBundleShortVersionString" (0+ space) ?= (0+ space) ?\"
132 (submatch (1+ (in "0-9."))))))
133 (set-version-in-file
134 root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings"
135 version (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) ?\"
136 (submatch (1+ (in "0-9."))))))
137 (set-version-in-file root "mac/src/Emacs.r" (car version-components)
138 (rx (and "GNU Emacs " (submatch (1+ (in "0-9")))
139 " for Mac OS")))
140 (set-version-in-file root "mac/src/Emacs.r" (car version-components)
141 (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\,
142 (0+ space) "/* Major revision in BCD */")))
143 (set-version-in-file root "mac/src/Emacs.r" (cadr version-components)
144 (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\,
145 (0+ space) "/* Minor revision in BCD */")))
146 (set-version-in-file root "mac/src/Emacs.r" (cadr (cdr version-components))
147 (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\,
148 (0+ space) "/* Non-final release # */")))
149 (set-version-in-file root "mac/src/Emacs.r" version
150 (rx (and (submatch (1+ (in "0-9."))) (0+ space) ?\" ?\,
151 (0+ space) "/* Short version number */")))
152 (set-version-in-file root "mac/src/Emacs.r" version
153 (rx (and "/* Short version number */" (0+ space) ?\"
154 (submatch (1+ (in "0-9."))))))
155 (let* ((third-component (string-to-number (cadr (cdr version-components))))
156 (release (cond ((>= third-component 90) "alpha")
157 ((>= third-component 50) "development")
158 (t "final"))))
159 (set-version-in-file
160 root "mac/src/Emacs.r" release
161 (rx (and (submatch (1+ (in "a-z"))) (0+ space) ?\, (0+ space)
162 "/* development, alpha, beta, or final (release) */")))))
163 ;; nextstep. 127 ;; nextstep.
164 (set-version-in-file 128 (set-version-in-file
165 root "nextstep/Cocoa/Emacs.base/Contents/Info.plist" 129 root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
166 version (rx (and "CFBundleGetInfoString" (1+ anything) "Emacs" (1+ space) 130 version (rx (and "CFBundleGetInfoString" (1+ anything) "Emacs" (1+ space)
167 (submatch (1+ (in "0-9.")))))) 131 (submatch (1+ (in "0-9."))))))
209 (rx (and "emacs_copyright" (0+ (not (in ?\"))) 173 (rx (and "emacs_copyright" (0+ (not (in ?\")))
210 ?\" (submatch (1+ (not (in ?\")))) ?\"))) 174 ?\" (submatch (1+ (not (in ?\")))) ?\")))
211 (set-version-in-file root "lib-src/rcs2log" copyright 175 (set-version-in-file root "lib-src/rcs2log" copyright
212 (rx (and "Copyright" (0+ space) ?= (0+ space) 176 (rx (and "Copyright" (0+ space) ?= (0+ space)
213 ?\' (submatch (1+ nonl))))) 177 ?\' (submatch (1+ nonl)))))
214 (set-version-in-file
215 root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings"
216 copyright (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) ?\"
217 (1+ anything)
218 (submatch "Copyright" (1+ (not (in ?\")))))))
219 ;; This one is a nuisance, as it needs to be split over two lines. 178 ;; This one is a nuisance, as it needs to be split over two lines.
220 (string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright) 179 (string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright)
221 (let ((csign "\\0xa9")
222 (cyear (match-string 1 copyright)) ; "Copyright (C) 2007 "
223 (owner (match-string 2 copyright))) ; "Free Software Foundation, Inc."
224 (set-version-in-file root "mac/src/Emacs.r"
225 (regexp-quote
226 (replace-regexp-in-string "(C)"
227 (regexp-quote csign) cyear))
228 (rx (and
229 (submatch "Copyright" (0+ space) (eval csign)
230 (0+ space) (= 4 num)
231 (0+ (not (in ?\")))) ?\")))
232 (set-version-in-file root "mac/src/Emacs.r" owner
233 (rx (and ?\"
234 (submatch (1+ (not (in ?\"))))
235 ?\" (0+ space)
236 "/* Long version number */"))))
237 ;; nextstep. 180 ;; nextstep.
238 (set-version-in-file 181 (set-version-in-file
239 root "nextstep/Cocoa/Emacs.base/Contents/Info.plist" 182 root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
240 copyright (rx (and "CFBundleGetInfoString" (1+ anything) "Emacs" (1+ space) 183 copyright (rx (and "CFBundleGetInfoString" (1+ anything) "Emacs" (1+ space)
241 (1+ (in "0-9.")) (1+ space) 184 (1+ (in "0-9.")) (1+ space)