Merging the various tweaks for MacPython-OS9 2.3a1 back into the trunk.

7 files changed, 31 insertions, 62 deletions

diff --git a/Mac/scripts/BuildApplet.rsrc b/Mac/scripts/BuildApplet.rsrc
index 6434d10..edabc61 100644
--- a/Mac/scripts/BuildApplet.rsrc
+++ b/Mac/scripts/BuildApplet.rsrc
diff --git a/Mac/scripts/BuildApplication.rsrc b/Mac/scripts/BuildApplication.rsrc
index 59fa640..0617418 100644
--- a/Mac/scripts/BuildApplication.rsrc
+++ b/Mac/scripts/BuildApplication.rsrc
diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py
index 2b59d60..99f39ac 100644
--- a/Mac/scripts/ConfigurePython.py
+++ b/Mac/scripts/ConfigurePython.py
@@ -160,9 +160,8 @@ def main():
 	# Create the PythonCore alias(es)
 	MacOS.splash(SPLASH_COPYCORE)
 	if verbose:
-		print "Copying PythonCore..."
+		print "Copying PythonCoreCarbon..."
 	n = 0
-	n = n + mkcorealias('PythonCore', 'PythonCore')
 	n = n + mkcorealias('PythonCoreCarbon', 'PythonCoreCarbon')
 	if n == 0:
 		from Carbon import Dlg
@@ -170,32 +169,6 @@ def main():
 		if verbose:
 			print "Warning: PythonCore not copied to Extensions folder"
 			print "         (Applets will not work unless run from the Python folder)"
-	if sys.argv[0][-7:] == 'Classic':
-		do_classic = 1
-	elif sys.argv[0][-6:] == 'Carbon':
-		do_classic = 0
-	else:
-		print "I don't know the sys.argv[0] function", sys.argv[0]
-		if verbose:
-			print "Configure classic or carbon - ",
-			rv = string.strip(sys.stdin.readline())
-			while rv and rv != "classic" and rv != "carbon":
-				print "Configure classic or carbon - ",
-				rv = string.strip(sys.stdin.readline())
-			if rv == "classic":
-				do_classic = 1
-			elif rv == "carbon":
-				do_classic = 0
-			else:
-				return
-		else:
-			sys.exit(1)
-	if do_classic:
-		MacOS.splash(SPLASH_COPYCLASSIC)
-		buildcopy(sys.prefix, None, [("PythonInterpreterClassic", "PythonInterpreter")])
-	else:
-		MacOS.splash(SPLASH_COPYCARBON)
-		buildcopy(sys.prefix, None, [("PythonInterpreterCarbon", "PythonInterpreter")])
 	MacOS.splash(SPLASH_BUILDAPPLETS)
 	buildapplet(sys.prefix, None, APPLET_LIST)
 
diff --git a/Mac/scripts/ConfigurePython.rsrc b/Mac/scripts/ConfigurePython.rsrc
index d3c69d8..f91ae61 100644
--- a/Mac/scripts/ConfigurePython.rsrc
+++ b/Mac/scripts/ConfigurePython.rsrc
diff --git a/Mac/scripts/EditPythonPrefs.rsrc b/Mac/scripts/EditPythonPrefs.rsrc
index ed1a171..745cbec 100644
--- a/Mac/scripts/EditPythonPrefs.rsrc
+++ b/Mac/scripts/EditPythonPrefs.rsrc
diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index 53f6517..1a8fc6d 100644
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -202,6 +202,7 @@ def buildcarbonplugins(top, dummy1, dummy2):
 		(":Mac:Build:xxsubtype.carbon.mcp", "xxsubtype.carbon"),
 		(":Mac:Build:pyexpat.carbon.mcp", "pyexpat.carbon"),
 		(":Mac:Build:calldll.carbon.mcp", "calldll.carbon"),
+		(":Mac:Build:datetime.carbon.mcp", "datetime.carbon"),
 		(":Mac:Build:gdbm.carbon.mcp", "gdbm.carbon"),
 		(":Mac:Build:icglue.carbon.mcp", "icglue.carbon"),
 		(":Mac:Build:waste.carbon.mcp", "waste.carbon"),
diff --git a/Mac/scripts/genpluginprojects.py b/Mac/scripts/genpluginprojects.py
index fb180b8..e346e95 100644
--- a/Mac/scripts/genpluginprojects.py
+++ b/Mac/scripts/genpluginprojects.py
@@ -114,52 +114,47 @@ def	genallprojects(force=0):
 	# Example/test modules
 	genpluginproject("carbon", "_testcapi")
 	genpluginproject("carbon", "xx")
+	genpluginproject("carbon", "datetime")
 	genpluginproject("carbon", "xxsubtype", sources=["xxsubtype.c"])
 	genpluginproject("carbon", "_hotshot", sources=["_hotshot.c"])
 	
 	# bgen-generated Toolbox modules
-	genpluginproject("carbon", "_AE", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_AH", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_App", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Cm", outputdir="::Lib:Carbon")
-	# XXX can't work properly because we need to set a custom fragment initializer
-	#genpluginproject("carbon", "_CG", 
-	#		sources=["_CGModule.c", "CFMLateImport.c"],
-	#		libraries=["CGStubLib"],
-	#		outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Ctl", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Dlg", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Drag", outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_AE")
+	genpluginproject("carbon", "_AH")
+	genpluginproject("carbon", "_App")
+	genpluginproject("carbon", "_Cm")
+	genpluginproject("carbon", "_Ctl")
+	genpluginproject("carbon", "_Dlg")
+	genpluginproject("carbon", "_Drag")
 	genpluginproject("carbon", "_Evt", 
-			stdlibraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
+			stdlibraryflags="Debug, WeakImport")
 	genpluginproject("carbon", "_File", 
-			stdlibraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
+			stdlibraryflags="Debug, WeakImport")
 	genpluginproject("carbon", "_Fm", 
-			stdlibraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
+			stdlibraryflags="Debug, WeakImport")
 	genpluginproject("carbon", "_Folder", 
-			stdlibraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Help", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_IBCarbon", sources=[":ibcarbon:_IBCarbon.c"], 
-			outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Icn", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_List", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Menu", outputdir="::Lib:Carbon")
+			stdlibraryflags="Debug, WeakImport")
+	genpluginproject("carbon", "_Help")
+	genpluginproject("carbon", "_IBCarbon", sources=[":ibcarbon:_IBCarbon.c"])
+	genpluginproject("carbon", "_Icn")
+	genpluginproject("carbon", "_List")
+	genpluginproject("carbon", "_Menu")
 	genpluginproject("carbon", "_Qd", 
-			stdlibraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
+			stdlibraryflags="Debug, WeakImport")
 	genpluginproject("carbon", "_Qt", 
-			libraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
+			libraryflags="Debug, WeakImport")
 	genpluginproject("carbon", "_Qdoffs", 
-			stdlibraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
+			stdlibraryflags="Debug, WeakImport")
 	genpluginproject("carbon", "_Res", 
-			stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Scrap", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Snd", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Sndihooks", sources=[":snd:_Sndihooks.c"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_TE", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Mlte", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_Win", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_CF", sources=["_CFmodule.c", "pycfbridge.c"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "_CarbonEvt", outputdir="::Lib:Carbon")
+			stdlibraryflags="Debug, WeakImport")
+	genpluginproject("carbon", "_Scrap")
+	genpluginproject("carbon", "_Snd")
+	genpluginproject("carbon", "_Sndihooks", sources=[":snd:_Sndihooks.c"])
+	genpluginproject("carbon", "_TE")
+	genpluginproject("carbon", "_Mlte")
+	genpluginproject("carbon", "_Win")
+	genpluginproject("carbon", "_CF", sources=["_CFmodule.c", "pycfbridge.c"])
+	genpluginproject("carbon", "_CarbonEvt")
 	genpluginproject("carbon", "hfsplus")
 	
 	# Other Mac modules