Changeset 11542

Timestamp:

Dec 17, 2008, 9:14:09 PM (11 years ago)

Author:

gb

Message:

When creating a standalone application bundle (or rather when
*COCOA-APPLICATION-INSTALL-ALTCONSOLE* is true), try to ensure that
ccl:cocoa-ide;altconsole;AltConsole.app is up-to-date and copy it
into the application bundle's Resources directory if so.

File:

• trunk/source/cocoa-ide/ide-bundle.lisp (modified) (3 diffs)

trunk/source/cocoa-ide/ide-bundle.lisp

@@ -13 +13 @@
                                            (source-ignore '(".svn" "cvs" ".cvsignore"))
                                            (copy-headers *cocoa-application-copy-headers-p*)
+                                           (install-altconsole *cocoa-application-install-altconsole*)
                                            (if-exists :overwrite))
   ;; TODO: Right now if the bundle exists, we leave alone any files that we don't replace.
@@ -41 +42 @@
                                                                (cons "Resources" subdirs)))))
           (recursive-copy-directory ccl-headers dest-headers :if-exists if-exists :test #'ignore-test)))
+      (when install-altconsole
+        (install-altconsole bundle-path))
       ;; Is this necessary?
+      ;; At one point in the past, it was necessary for the bundle to
+      ;; contain an executable file whose name matched what was specified
+      ;; in its Info.plist file.  That executable file could be practically
+      ;; anything, as long as its executable bits were set.
       (let* ((image-name (ccl::standard-kernel-name))
              (ccl-image (make-pathname :name image-name :host "ccl"))
@@ -50 +57 @@
       (ccl::touch target-dir))))
 
+;;; This runs "make install" to generate
+;;; "ccl:cocoa-ide;altconsole;AltConsole.app",
+;;; then copies that application bundle into the "Resources" directory
+;;; of the target bundle.  It might be simpler to just have "make install"
+;;; put things in the right place, but "the right place" is likely to
+;;; be a pathname that contains a space. Quoting such a pathname -
+;;; and figuring out how to get make to do so - is left as an exercise.
+(defun install-altconsole (bundle-path)
+  (let* ((altconsole-path (merge-pathnames ";Contents;Resources;AltConsole.app;" bundle-path))
+         (build-directory "ccl:cocoa-ide;altconsole;")
+         (build-bundle-path "ccl:cocoa-ide;altconsole;AltConsole.app")
+         (make-output (make-string-output-stream))
+         (args `("-C" ,(native-translated-namestring build-directory) "install")))
+    (recursive-delete-directory altconsole-path :if-does-not-exist nil)
+    (unwind-protect
+         (multiple-value-bind (exit-status code)
+             (external-process-status
+              (run-program "make" args :output make-output :error make-output))
+           (unless (and (eq exit-status :exited) (zerop code))
+             (format t "~&'make install' of AltConsole.app failed:~&~a"
+                     (get-output-stream-string make-output))
+             (return-from install-altconsole nil)))
+      (close make-output))
+    ;;(ensure-directories-exist altconsole-path)
+    (recursive-copy-directory build-bundle-path altconsole-path)
+    (ccl::touch altconsole-path)
+    t))
+
 (progn
   (require "FAKE-CFBUNDLE-PATH")