[Openmcl-cvs-notifications] r12641 - /trunk/source/cocoa-ide/start.lisp

[gb at clozure.com]

Author: gb
Date: Fri Aug 21 16:17:20 2009
New Revision: 12641

Log:
Conditionalize for Cocotron: get the platform-specific bundle
subdirectory right, don't try to load EasyGUI for now (contains
some Mac-specific code that needs to be conditionalized), don't
try to call CCL::TOUCH on directories (not necessary in Cocotron,
and doesn't seem to work in Windows ...)

Modified:
    trunk/source/cocoa-ide/start.lisp

Modified: trunk/source/cocoa-ide/start.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/cocoa-ide/start.lisp (original)
+++ trunk/source/cocoa-ide/start.lisp Fri Aug 21 16:17:20 2009
@@ -128,6 +128,7 @@
     ;; Wait until we're sure that the Cocoa event loop has started.
     (wait-on-semaphore *cocoa-application-finished-launching*)
 =

+    #-cocotron                          ;needs conditionalization
     (require :easygui)
 =

     (ccl::maybe-map-objc-classes t)
@@ -141,10 +142,11 @@
       (when missing
         (break "ObjC classes ~{~&~a~} are declared but not defined." missi=
ng)))
 =

+    #-cocotron
     (ccl::touch bundle-path)
 =

     (let ((image-file (make-pathname :name (ccl::standard-kernel-name) :ty=
pe nil :version nil
-                                     :defaults (merge-pathnames ";Contents=
;MacOS;" bundle-path))))
+                                     :defaults (merge-pathnames (format ni=
l";Contents;~a;" #+darwin-target "MacOS" #+cocotron "Windows")  bundle-path=
))))
       (format *error-output* "~2%Saving application to ~a~2%" (truename bu=
ndle-path))
       (force-output *error-output*)
       (ensure-directories-exist image-file)