Mod by Donovan Preston to allow MacPython to live in a Python.app bundle and...

Mod by Donovan Preston to allow MacPython to live in a Python.app bundle and understand the __main__.py convention used there for applets. This gives us applets that work on both OS9 and OSX! (Although "applet" may not be the correct word for something that is going to be multimegabyte:-).

But: the code is currently disabled, as it requires CodeWarrior 7 and I'm still using 6.

Mac/Python/macmain.c

@@ -38,6 +38,13 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <Windows.h>
 #include <Fonts.h>
 #include <Balloons.h>
+#if TARGET_API_MAC_CARBON
+#include <CFBundle.h>
+#include <CFURL.h>
+#include <CFString.h>
+#include <CFBase.h>
+#include <CFArray.h>
+#endif /* TARGET_API_MAC_CARBON */
 #ifdef USE_APPEARANCE
 #include <Gestalt.h>
 #include <Appearance.h>
@@ -487,7 +494,7 @@ PyMac_Initialize(void)
 
 #endif /* USE_MAC_APPLET_SUPPORT */
 
-#if TARGET_API_MAC_OSX
+#if TARGET_API_MAC_OSX /* Really: TARGET_API_MAC_CARBON */
 
 static int
 locateResourcePy(char * resourceName, char * resourceURLCStr, int length) {
@@ -495,15 +502,23 @@ locateResourcePy(char * resourceName, char * resourceURLCStr, int length) {
     CFURLRef URL, absoluteURL;
     CFStringRef filenameString, filepathString, rsrcString;
     CFIndex size, i;
-    CFArrayRef arrayRef;
-    Boolean success = 0;
+    CFArrayRef arrayRef = NULL;
+    int success = 0;
     
-    /* Create a CFString with the resource name in it */
-    rsrcString = CFStringCreateWithCString(0, resourceName, kCFStringEncodingMacRoman);
+#if TARGET_API_MAC_OSX
+	CFURLPathStyle thePathStyle = kCFURLPOSIXPathStyle;
+#else
+	CFURLPathStyle thePathStyle = kCFURLHFSPathStyle;
+#endif
 
     /* Get a reference to our main bundle */
     mainBundle = CFBundleGetMainBundle();
 
+	/* If we are running inside a bundle, look through it. Otherwise, do nothing. */
+	if (mainBundle) {
+	    /* Create a CFString with the resource name in it */
+	    rsrcString = CFStringCreateWithCString(0, resourceName, kCFStringEncodingMacRoman);
+
 	    /* Look for py files in the main bundle by type */
 	    arrayRef = CFBundleCopyResourceURLsOfType( mainBundle, 
 	            CFSTR("py"), 
@@ -517,7 +532,7 @@ locateResourcePy(char * resourceName, char * resourceURLCStr, int length) {
 	        if (CFStringCompare(filenameString, rsrcString, 0) == kCFCompareEqualTo) {
 	            /* We found a match, get the file's full path */
 	            absoluteURL = CFURLCopyAbsoluteURL(URL);
-            filepathString = CFURLCopyFileSystemPath(absoluteURL, kCFURLPOSIXPathStyle);
+	            filepathString = CFURLCopyFileSystemPath(absoluteURL, thePathStyle);
 	            CFRelease(absoluteURL);
 
 	            /* Copy the full path into the caller's character buffer */
@@ -528,12 +543,16 @@ locateResourcePy(char * resourceName, char * resourceURLCStr, int length) {
 	        }
 	        CFRelease(filenameString);
 	    }
-    CFRelease(rsrcString);
 		CFRelease(arrayRef);
-
+	    CFRelease(rsrcString);
+	}
     return success;
 }
 
+#endif /* TARGET_API_MAC_CARBON */
+
+#if TARGET_API_MAC_OSX
+
 int
 main(int argc, char **argv)
 {
@@ -580,8 +599,17 @@ PyMac_InitApplication(void)
 	int argc;
 	char **argv;
 	
+	static char scriptpath[1024];
+	char *script = NULL;
+
 	init_common(&argc, &argv, 0);
 
+#if TARGET_API_MAC_OSX /* Really: TARGET_API_MAC_CARBON */
+	/* If we are running inside of a bundle, and a __main__.py is available, use it */
+	if (locateResourcePy("__main__.py", scriptpath, 1024))
+		script = scriptpath;
+#endif
+	
 	if ( argc > 1 ) {
 		/* We're running a script. Attempt to change current directory */
 		char curwd[256], *endp;
@@ -603,7 +631,7 @@ PyMac_InitApplication(void)
 			exit(0);
 		}
 	}
-	Py_Main(argc, argv, NULL);
+	Py_Main(argc, argv, script);
 }
 #endif /* TARGET_API_MAC_OSX */