Changeset 15365

Timestamp:

May 17, 2012, 9:28:02 AM (13 years ago)

Author:

R. Matthew Emerson

Message:

When building a standalone IDE, don't prepend the kernel to the heap
image file. Instead, write the heap image file to
.../Contents/Resources/ccl/. The lisp kernel, which goes to the usual
place (.../Contents/MacOS/) can find the heap image there.

In the app store version, the ccl: logical host points to
Resources/ccl also. For now, leave in the special case in
init-ccl-directory-for-ide (in app-delegate.lisp), that makes ccl:
refer to the directory containing the application bundle.

File:

• trunk/source/cocoa-ide/start.lisp (modified) (2 diffs)

trunk/source/cocoa-ide/start.lisp

@@ -32 +32 @@
   (let* ((path (ccl::ccl-directory))
          (dir (pathname-directory path)))
-    (if (equalp (last dir 2) '("Contents" "MacOS"))
+    (if (equalp (last dir 3) '("Contents" "Resources" "ccl"))
         (make-pathname :directory (butlast dir 3))
         path)))
@@ -137 +137 @@
   #-cocotron
   (ccl::touch bundle-path)
-
-  (let ((image-file (make-pathname :name (ccl::standard-kernel-name) :type nil :version nil
-                                   :defaults (merge-pathnames (format nil";Contents;~a;" #+darwin-target "MacOS" #+cocotron "Windows")  bundle-path))))
+  (let ((kernel-file (make-pathname :name (ccl::standard-kernel-name) 
+                                    :type nil 
+                                    :version nil 
+                                    :defaults (merge-pathnames 
+                                               #+darwin-target
+                                               ";Contents;MacOS;"
+                                               #+cocotron
+                                               ";Contents;Windows;"
+                                               bundle-path))) 
+        (image-file (make-pathname :name (ccl::standard-kernel-name) 
+                                   :type "image" 
+                                   :version nil 
+                                   :defaults (merge-pathnames 
+                                              ";Contents;Resources;ccl;" 
+                                              bundle-path)))) 
     (format *error-output* "~2%Saving application to ~a~2%" (truename bundle-path))
     (force-output *error-output*)
     (ensure-directories-exist image-file)
+    (ccl:copy-file (ccl::kernel-path) kernel-file :if-exists :supersede 
+                   :preserve-attributes t)
     (save-application image-file
-                      :prepend-kernel t
                       :application-class 'cocoa-ide
                       #+windows-target #+windows-target