Changeset 15350


Ignore:
Timestamp:
May 4, 2012, 7:54:38 PM (7 years ago)
Author:
rme
Message:

Rename "cocoa-application" to "cocoa-ide" in numerous places.

Location:
trunk/source/cocoa-ide
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/cocoa-ide/app-delegate.lisp

    r15291 r15350  
    208208        (#/orderFront: (#/window wc) +null-ptr+)))))
    209209
    210 (defvar *cocoa-application-finished-launching* (make-semaphore)
     210(defvar *cocoa-ide-finished-launching* (make-semaphore)
    211211  "Semaphore that's signaled when the application's finished launching ...")
    212212
     
    214214    ((self lisp-application-delegate) notification)
    215215  (declare (ignore notification))
    216   (signal-semaphore *cocoa-application-finished-launching*))
     216  (signal-semaphore *cocoa-ide-finished-launching*))
    217217
    218218(objc:defmethod (#/applicationShouldOpenUntitledFile: #>BOOL)
  • trunk/source/cocoa-ide/build-application.lisp

    r13035 r15350  
    3939                                        ; as the app's main. this name gets written
    4040                                        ; into the Info.plist on the "NSMainNibFile" key
    41                           (application-class 'gui::cocoa-application)
     41                          (application-class 'gui::cocoa-ide)
    4242                          (private-frameworks nil)
    4343                          (toplevel-function nil)
  • trunk/source/cocoa-ide/builder-utilities.lisp

    r15327 r15350  
    375375;;; different directory structures used by Cocoa and Cocotron (Windows).
    376376(defun copy-private-frameworks (private-frameworks app-path)
    377   (let ((private-frameworks #+windows-target (append *cocoa-application-frameworks*
     377  (let ((private-frameworks #+windows-target (append *cocoa-ide-frameworks*
    378378                                                     private-frameworks)
    379379                            #-windows-target private-frameworks)
    380380        (frameworks-dir (bundle-frameworks-path app-path)))
    381381    #+windows-target
    382     (dolist (lib *cocoa-application-libraries*)
     382    (dolist (lib *cocoa-ide-libraries*)
    383383      (copy-file lib frameworks-dir :preserve-attributes t :if-exists :supersede))
    384384    (when private-frameworks
  • trunk/source/cocoa-ide/cocoa-application.lisp

    r15327 r15350  
    2323
    2424
    25 (defvar *cocoa-application-path*
     25(defvar *cocoa-ide-path*
    2626  (let* ((bits (nth-value 1 (host-platform))))
    2727    (format nil "ccl:Clozure CL~a.app;" bits)))
    28 (defvar *cocoa-application-copy-headers-p* nil)
    29 (defvar *cocoa-application-install-altconsole* t)
    30 (defvar *cocoa-application-bundle-suffix*
     28(defvar *cocoa-ide-copy-headers-p* nil)
     29(defvar *cocoa-ide-install-altconsole* t)
     30(defvar *cocoa-ide-bundle-suffix*
    3131  (multiple-value-bind (os bits cpu) (host-platform)
    3232    (declare (ignore os))
    3333    (format nil "Clozure CL-~a~a" (string-downcase cpu) bits)))
    34 (defvar *cocoa-application-frameworks* #+cocotron '("ccl:cocotron;Foundation.framework;" "ccl:cocotron;AppKit.framework;" "ccl:cocotron;CoreData.framework;") #-cocotron nil)
    35 (defvar *cocoa-application-libraries* #+cocotron '("ccl:cocotron;Foundation>.1>.0.dll" "ccl:cocotron;AppKit>.1>.0.dll" "ccl:cocotron;CoreData>.1>.0.dll") #-cocotron nil)
     34(defvar *cocoa-ide-frameworks* #+cocotron '("ccl:cocotron;Foundation.framework;" "ccl:cocotron;AppKit.framework;" "ccl:cocotron;CoreData.framework;") #-cocotron nil)
     35(defvar *cocoa-ide-libraries* #+cocotron '("ccl:cocotron;Foundation>.1>.0.dll" "ccl:cocotron;AppKit>.1>.0.dll" "ccl:cocotron;CoreData>.1>.0.dll") #-cocotron nil)
    3636       
    3737(defvar *cocoa-ide-force-compile* nil)
     
    4646;;; and error output for the initial lisp process will be directed
    4747;;; there.
    48 (build-ide *cocoa-application-path*)
     48(build-ide *cocoa-ide-path*)
  • trunk/source/cocoa-ide/cocoa-remote-lisp.lisp

    r15168 r15350  
    6161    view))
    6262
    63 (defmethod ccl::create-rlisp-listener ((app cocoa-application) (rthread ccl::remote-lisp-thread))
     63(defmethod ccl::create-rlisp-listener ((app cocoa-ide) (rthread ccl::remote-lisp-thread))
    6464  (let* ((view (or (listener-view-for-remote-thread rthread :activate t)
    6565                   (create-remote-listener-view rthread)))
     
    152152   (restarts-window :initform nil :accessor backtrace-context-restarts-window)))
    153153
    154 (defmethod ccl::remote-context-class ((application cocoa-application)) 'cocoa-remote-backtrace-context)
     154(defmethod ccl::remote-context-class ((application cocoa-ide)) 'cocoa-remote-backtrace-context)
    155155
    156156(defmethod restarts-dialog ((context cocoa-remote-backtrace-context))
  • trunk/source/cocoa-ide/cocoa-window.lisp

    r15346 r15350  
    2323  (def-cocoa-default *tab-width* :int 8 "Width of editor tab stops, in characters"))
    2424
    25 (defclass cocoa-application (application)
     25(defclass cocoa-ide (application)
    2626  ())
    2727
    28 (defun init-cocoa-application ()
     28(defun init-cocoa-ide ()
    2929  (with-autorelease-pool
    3030      (#/standardUserDefaults ns:ns-user-defaults)
     
    195195        (return)))))
    196196
    197 (defun start-cocoa-application (&key
     197(defun start-cocoa-ide (&key
    198198                                (application-proxy-class-name
    199199                                 *default-ns-application-proxy-class-name*))
     
    205205               (with-autorelease-pool
    206206                   (enable-foreground)
    207                  (or *NSApp* (setq *NSApp* (init-cocoa-application)))
     207                 (or *NSApp* (setq *NSApp* (init-cocoa-ide)))
    208208                 #-cocotron
    209209                 (let* ((icon (#/imageNamed: ns:ns-image #@"NSApplicationIcon")))
     
    213213                 (when (and application-proxy-class-name
    214214                            (%null-ptr-p (#/delegate *nsapp*)))
    215                    (let* ((classptr (ccl::%objc-class-classptr
     215                   (let* (#+nil (classptr (ccl::%objc-class-classptr
    216216                                     (ccl::load-objc-class-descriptor application-proxy-class-name)))
    217                           (instance (#/init (#/alloc classptr))))
     217                          (class (#_NSClassFromString (%make-nsstring application-proxy-class-name)))
     218                          (instance (#/init (#/alloc class))))
    218219                     
    219220                     (#/setDelegate: *NSApp* instance))))
  • trunk/source/cocoa-ide/cocoa.lisp

    r14616 r15350  
    55  (pushnew :cocotron *features*))
    66
    7 (defvar *cocoa-application-path* #+gz "ccl:GZ temp bundle.app;" #-gz
     7(defvar *cocoa-ide-path* #+gz "ccl:GZ temp bundle.app;" #-gz
    88        (let* ((bits (nth-value 1 (host-platform))))
    99          (format nil "ccl:temp bundle~a.app;"
    1010                  bits)))
    11 (defvar *cocoa-application-copy-headers-p* nil)
    12 (defvar *cocoa-application-install-altconsole* nil)
    13 (defvar *cocoa-application-bundle-suffix*
     11(defvar *cocoa-ide-copy-headers-p* nil)
     12(defvar *cocoa-ide-install-altconsole* nil)
     13(defvar *cocoa-ide-bundle-suffix*
    1414  (multiple-value-bind (os bits cpu) (host-platform)
    1515    (declare (ignore os))
    1616    (format nil "temp bundle-~a~a" (string-downcase cpu) bits)))
    1717(defvar *cocoa-ide-force-compile* nil)
    18 (defvar *cocoa-application-frameworks* #+cocotron '("ccl:cocotron;Foundation.framework;" "ccl:cocotron;AppKit.framework;" "ccl:cocotron;CoreData.framework;") #-cocotron nil)
    19 (defvar *cocoa-application-libraries* #+cocotron '("ccl:cocotron;Foundation>.1>.0.dll" "ccl:cocotron;AppKit>.1>.0.dll" "ccl:cocotron;CoreData>.1>.0.dll") #-cocotron nil)
     18(defvar *cocoa-ide-frameworks* #+cocotron '("ccl:cocotron;Foundation.framework;" "ccl:cocotron;AppKit.framework;" "ccl:cocotron;CoreData.framework;") #-cocotron nil)
     19(defvar *cocoa-ide-libraries* #+cocotron '("ccl:cocotron;Foundation>.1>.0.dll" "ccl:cocotron;AppKit>.1>.0.dll" "ccl:cocotron;CoreData>.1>.0.dll") #-cocotron nil)
    2020
    2121(load "ccl:cocoa-ide;defsystem.lisp")
  • trunk/source/cocoa-ide/defsystem.lisp

    r15188 r15350  
    1111;; These are used to communicate with ide-bundle, which must be loaded before objc-support.
    1212;; They are defvar'ed so the caller can set them before loading us.
    13 (defvar *cocoa-application-path* nil)
    14 (defvar *cocoa-application-copy-headers-p* nil)
     13(defvar *cocoa-ide-path* nil)
     14(defvar *cocoa-ide-copy-headers-p* nil)
    1515(require "IDE-BUNDLE")
    1616
     
    2222   "CCL"
    2323   ;; symbols defined here
    24    *cocoa-application-path*
    25    *cocoa-application-copy-headers-p*
     24   *cocoa-ide-path*
     25   *cocoa-ide-copy-headers-p*
    2626   load-ide
    2727   build-ide
  • trunk/source/cocoa-ide/ide-bundle.lisp

    r15200 r15350  
    1212(defun create-ide-bundle (bundle-path &key (source "ccl:cocoa-ide;ide-contents;")
    1313                                           (source-ignore '(".svn" "cvs" ".cvsignore"))
    14                                            (copy-headers *cocoa-application-copy-headers-p*)
    15                                            (install-altconsole *cocoa-application-install-altconsole*)
     14                                           (copy-headers *cocoa-ide-copy-headers-p*)
     15                                           (install-altconsole *cocoa-ide-install-altconsole*)
    1616                                           (if-exists :overwrite))
    1717  ;; TODO: Right now if the bundle exists, we leave alone any files that we don't replace.
     
    198198
    199199(progn
    200   (create-ide-bundle *cocoa-application-path*)
    201   (fake-cfbundle-path *cocoa-application-path* "ccl:cocoa-ide;Info.plist-proto" "com.clozure" *cocoa-application-bundle-suffix* *cocoa-application-frameworks* *cocoa-application-libraries* #+windows-target "ccl:cocoa-ide;ide-contents;resources;openmcl-icon.ico"))
     200  (create-ide-bundle *cocoa-ide-path*)
     201  (fake-cfbundle-path *cocoa-ide-path* "ccl:cocoa-ide;Info.plist-proto" "com.clozure" *cocoa-ide-bundle-suffix* *cocoa-ide-frameworks* *cocoa-ide-libraries* #+windows-target "ccl:cocoa-ide;ide-contents;resources;openmcl-icon.ico"))
  • trunk/source/cocoa-ide/inspector.lisp

    r15167 r15350  
    197197    wc))
    198198
    199 (defmethod ccl::spawn-inspector ((app cocoa-application) inspector)
     199(defmethod ccl::spawn-inspector ((app cocoa-ide) inspector)
    200200  (queue-for-gui (lambda () (make-inspector-window inspector))))
    201201
  • trunk/source/cocoa-ide/start.lisp

    r15188 r15350  
    7373;;; Support for saving a stand-alone IDE
    7474
    75 (defmethod ccl::application-error ((a cocoa-application) condition error-pointer)
     75(defmethod ccl::application-error ((a cocoa-ide) condition error-pointer)
    7676  (ccl::break-loop-handle-error condition error-pointer))
    7777
    78 (defmethod ccl::application-init-file ((a cocoa-application))
     78(defmethod ccl::application-init-file ((a cocoa-ide))
    7979  (unless (shift-key-now-p)
    8080    '("home:ccl-init" "home:\\.ccl-init")))
     
    8585;;; (If it seems like some of this needs to be thought out a
    8686;;; bit better ... I'd tend to agree.)
    87 (defmethod ccl::parse-application-arguments ((a cocoa-application))
     87(defmethod ccl::parse-application-arguments ((a cocoa-ide))
    8888  (values nil nil nil nil))
    8989
    90 (defmethod toplevel-function ((a cocoa-application) init-file)
     90(defmethod toplevel-function ((a cocoa-ide) init-file)
    9191  (declare (ignore init-file))
    9292  #-cocotron
     
    105105      (when (try-connecting-to-altconsole)
    106106        (setq have-interactive-terminal-io t)))
    107     ;; TODO: to avoid confusion, should now reset *cocoa-application-path* to
     107    ;; TODO: to avoid confusion, should now reset *cocoa-ide-path* to
    108108    ;; actual bundle path where started up.
    109     (start-cocoa-application)))
     109    (start-cocoa-ide)))
    110110
    111111
     
    119119
    120120  ;; Wait until we're sure that the Cocoa event loop has started.
    121   (wait-on-semaphore *cocoa-application-finished-launching*)
     121  (wait-on-semaphore *cocoa-ide-finished-launching*)
    122122
    123123  #-cocotron                            ;needs conditionalization
     
    145145    (save-application image-file
    146146                      :prepend-kernel t
    147                       :application-class 'cocoa-application
     147                      :application-class 'cocoa-ide
    148148                      #+windows-target #+windows-target
    149149                      :application-type :gui)))
     
    267267
    268268
    269 (start-cocoa-application)
     269(start-cocoa-ide)
Note: See TracChangeset for help on using the changeset viewer.