Changeset 15187

Timestamp:

Jan 27, 2012, 11:55:05 AM (13 years ago)

Author:

R. Matthew Emerson

Message:

On Darwin, if the default image isn't found, assume we're in an
application bundle and try to load it from ".../Resources/ccl/".

File:

• trunk/source/lisp-kernel/pmcl-kernel.c (modified) (3 diffs)

trunk/source/lisp-kernel/pmcl-kernel.c

@@ -98 +98 @@
 #include <mach-o/dyld.h>
 #include <dlfcn.h>
+#include <libgen.h>
 #endif
 
@@ -960 +961 @@
 #endif
 
-
+#ifdef DARWIN
+char *
+bundle_image_name(char *orig)
+{
+  char *base = basename(orig);
+  char *dir = dirname(orig);
+  char path[MAXPATHLEN];
+
+  snprintf(path, MAXPATHLEN, "%s/../Resources/ccl/%s", dir, base);
+  return path_by_appending_image(path);
+}
+#endif
 
 char *program_name = NULL;
@@ -1924 +1936 @@
     } else {
       image_name = default_image_name(real_executable_name);
+#ifdef DARWIN
+      if (!probe_file(image_name)) {
+        image_name = bundle_image_name(real_executable_name);
+      }
+#endif
     }
   }