The MacOS toolbox modules have acquired an _ in front of their name. Normal usage is through a wrapper module (without underscore) which lives in the Carbon package.

2 files changed, 87 insertions, 81 deletions

diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index 43d69e6..11340da 100644
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -250,28 +250,28 @@ I_PPC_PLUGINS : (buildmwproject, "CWIE", [
 	(":Extensions:Imaging:_tkinter.mcp", "_tkinter.ppc"),
 	(":Mac:Build:ColorPicker.mcp", "ColorPicker.ppc"),
 	(":Mac:Build:Printing.mcp", "Printing.ppc"),
-	(":Mac:Build:AE.mcp", "AE.ppc"),
-	(":Mac:Build:App.mcp", "App.ppc"),
-	(":Mac:Build:Cm.mcp", "Cm.ppc"),
-	(":Mac:Build:Ctl.mcp", "Ctl.ppc"),
-	(":Mac:Build:Dlg.mcp", "Dlg.ppc"),
-	(":Mac:Build:Drag.mcp", "Drag.ppc"),
-	(":Mac:Build:Evt.mcp", "Evt.ppc"),
-	(":Mac:Build:Fm.mcp", "Fm.ppc"),
-	(":Mac:Build:Help.mcp", "Help.ppc"),
-	(":Mac:Build:Icn.mcp", "Icn.ppc"),
-	(":Mac:Build:List.mcp", "List.ppc"),
-	(":Mac:Build:Menu.mcp", "Menu.ppc"),
-	(":Mac:Build:Mlte.mcp", "Mlte.ppc"),
-	(":Mac:Build:Qd.mcp", "Qd.ppc"),
-	(":Mac:Build:Qdoffs.mcp", "Qdoffs.ppc"),
-	(":Mac:Build:Qt.mcp", "Qt.ppc"),
-	(":Mac:Build:Res.mcp", "Res.ppc"),
-	(":Mac:Build:Scrap.mcp", "Scrap.ppc"),
-	(":Mac:Build:Snd.mcp", "Snd.ppc"),
-	(":Mac:Build:Sndihooks.mcp", "Sndihooks.ppc"),
-	(":Mac:Build:TE.mcp", "TE.ppc"),
-	(":Mac:Build:Win.mcp", "Win.ppc"),
+	(":Mac:Build:_AE.mcp", "_AE.ppc"),
+	(":Mac:Build:_App.mcp", "_App.ppc"),
+	(":Mac:Build:_Cm.mcp", "_Cm.ppc"),
+	(":Mac:Build:_Ctl.mcp", "_Ctl.ppc"),
+	(":Mac:Build:_Dlg.mcp", "_Dlg.ppc"),
+	(":Mac:Build:_Drag.mcp", "_Drag.ppc"),
+	(":Mac:Build:_Evt.mcp", "_Evt.ppc"),
+	(":Mac:Build:_Fm.mcp", "_Fm.ppc"),
+	(":Mac:Build:_Help.mcp", "_Help.ppc"),
+	(":Mac:Build:_Icn.mcp", "_Icn.ppc"),
+	(":Mac:Build:_List.mcp", "_List.ppc"),
+	(":Mac:Build:_Menu.mcp", "_Menu.ppc"),
+	(":Mac:Build:_Mlte.mcp", "_Mlte.ppc"),
+	(":Mac:Build:_Qd.mcp", "_Qd.ppc"),
+	(":Mac:Build:_Qdoffs.mcp", "_Qdoffs.ppc"),
+	(":Mac:Build:_Qt.mcp", "_Qt.ppc"),
+	(":Mac:Build:_Res.mcp", "_Res.ppc"),
+	(":Mac:Build:_Scrap.mcp", "_Scrap.ppc"),
+	(":Mac:Build:_Snd.mcp", "_Snd.ppc"),
+	(":Mac:Build:_Sndihooks.mcp", "_Sndihooks.ppc"),
+	(":Mac:Build:_TE.mcp", "_TE.ppc"),
+	(":Mac:Build:_Win.mcp", "_Win.ppc"),
 	]),
 
 I_CARBON_PLUGINS :  (buildmwproject, "CWIE", [
@@ -287,28 +287,28 @@ I_CARBON_PLUGINS :  (buildmwproject, "CWIE", [
 	(":Mac:Build:_dummy_tkinter.mcp", "_tkinter.carbon"),
 ##	(":Extensions:Imaging:_tkinter.carbon.mcp", "_tkinter.carbon"),
 	(":Mac:Build:ColorPicker.carbon.mcp", "ColorPicker.carbon"),
-	(":Mac:Build:AE.carbon.mcp", "AE.carbon"),
-	(":Mac:Build:App.carbon.mcp", "App.carbon"),
-	(":Mac:Build:CF.carbon.mcp", "CF.carbon"),
-	(":Mac:Build:Cm.carbon.mcp", "Cm.carbon"),
-	(":Mac:Build:Ctl.carbon.mcp", "Ctl.carbon"),
-	(":Mac:Build:Dlg.carbon.mcp", "Dlg.carbon"),
-	(":Mac:Build:Drag.carbon.mcp", "Drag.carbon"),
-	(":Mac:Build:Evt.carbon.mcp", "Evt.carbon"),
-	(":Mac:Build:Fm.carbon.mcp", "Fm.carbon"),
-	(":Mac:Build:Icn.carbon.mcp", "Icn.carbon"),
-	(":Mac:Build:List.carbon.mcp", "List.carbon"),
-	(":Mac:Build:Menu.carbon.mcp", "Menu.carbon"),
-	(":Mac:Build:Mlte.carbon.mcp", "Mlte.carbon"),
-	(":Mac:Build:Qd.carbon.mcp", "Qd.carbon"),
-	(":Mac:Build:Qdoffs.carbon.mcp", "Qdoffs.carbon"),
-	(":Mac:Build:Qt.carbon.mcp", "Qt.carbon"),
-	(":Mac:Build:Res.carbon.mcp", "Res.carbon"),
-	(":Mac:Build:Scrap.carbon.mcp", "Scrap.carbon"),
-	(":Mac:Build:Snd.carbon.mcp", "Snd.carbon"),
-	(":Mac:Build:Sndihooks.carbon.mcp", "Sndihooks.carbon"),
-	(":Mac:Build:TE.carbon.mcp", "TE.carbon"),
-	(":Mac:Build:Win.carbon.mcp", "Win.carbon"),
+	(":Mac:Build:_AE.carbon.mcp", "_AE.carbon"),
+	(":Mac:Build:_App.carbon.mcp", "_App.carbon"),
+	(":Mac:Build:_CF.carbon.mcp", "_CF.carbon"),
+	(":Mac:Build:_Cm.carbon.mcp", "_Cm.carbon"),
+	(":Mac:Build:_Ctl.carbon.mcp", "_Ctl.carbon"),
+	(":Mac:Build:_Dlg.carbon.mcp", "_Dlg.carbon"),
+	(":Mac:Build:_Drag.carbon.mcp", "_Drag.carbon"),
+	(":Mac:Build:_Evt.carbon.mcp", "_Evt.carbon"),
+	(":Mac:Build:_Fm.carbon.mcp", "_Fm.carbon"),
+	(":Mac:Build:_Icn.carbon.mcp", "_Icn.carbon"),
+	(":Mac:Build:_List.carbon.mcp", "_List.carbon"),
+	(":Mac:Build:_Menu.carbon.mcp", "_Menu.carbon"),
+	(":Mac:Build:_Mlte.carbon.mcp", "_Mlte.carbon"),
+	(":Mac:Build:_Qd.carbon.mcp", "_Qd.carbon"),
+	(":Mac:Build:_Qdoffs.carbon.mcp", "_Qdoffs.carbon"),
+	(":Mac:Build:_Qt.carbon.mcp", "_Qt.carbon"),
+	(":Mac:Build:_Res.carbon.mcp", "_Res.carbon"),
+	(":Mac:Build:_Scrap.carbon.mcp", "_Scrap.carbon"),
+	(":Mac:Build:_Snd.carbon.mcp", "_Snd.carbon"),
+	(":Mac:Build:_Sndihooks.carbon.mcp", "_Sndihooks.carbon"),
+	(":Mac:Build:_TE.carbon.mcp", "_TE.carbon"),
+	(":Mac:Build:_Win.carbon.mcp", "_Win.carbon"),
 	
 	]),
 
diff --git a/Mac/scripts/genpluginprojects.py b/Mac/scripts/genpluginprojects.py
index 9e7f584..1841d0a 100644
--- a/Mac/scripts/genpluginprojects.py
+++ b/Mac/scripts/genpluginprojects.py
@@ -59,7 +59,13 @@ def genpluginproject(architecture, module,
 	if not sourcedirs:
 		for moduledir in MODULEDIRS:
 			if '%' in moduledir:
-				moduledir = moduledir % module
+				# For historical reasons an initial _ in the modulename
+				# is not reflected in the folder name
+				if module[0] == '_':
+					modulewithout_ = module[1:]
+				else:
+					modulewithout_ = module
+				moduledir = moduledir % modulewithout_
 			fn = os.path.join(projectdir, os.path.join(moduledir, sources[0]))
 			if os.path.exists(fn):
 				moduledir, sourcefile = os.path.split(fn)
@@ -106,47 +112,47 @@ def	genallprojects(force=0):
 	genpluginproject("all", "_testcapi")
 	
 	# bgen-generated Toolbox modules
-	genpluginproject("carbon", "AE", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "AE", libraries=["ObjectSupportLib"], outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "App", libraries=["AppearanceLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "App", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Cm", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Cm", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Ctl", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Ctl", libraries=["ControlsLib", "AppearanceLib"], 
+	genpluginproject("carbon", "_AE", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_AE", libraries=["ObjectSupportLib"], outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_App", libraries=["AppearanceLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_App", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Cm", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Cm", outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Ctl", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Ctl", libraries=["ControlsLib", "AppearanceLib"], 
 			outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Dlg", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Dlg", libraries=["DialogsLib", "AppearanceLib"],
+	genpluginproject("carbon", "_Dlg", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Dlg", libraries=["DialogsLib", "AppearanceLib"],
 			outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Drag", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Drag", libraries=["DragLib"], outputdir="::Lib:Carbon")
-	genpluginproject("all", "Evt", outputdir="::Lib:Carbon")
-	genpluginproject("all", "Fm", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Help", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Icn", libraries=["IconServicesLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Icn", outputdir="::Lib:Carbon")
-	genpluginproject("all", "List", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Menu", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Menu", libraries=["MenusLib", "ContextualMenu", "AppearanceLib"],
+	genpluginproject("carbon", "_Drag", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Drag", libraries=["DragLib"], outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Evt", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Fm", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Help", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Icn", libraries=["IconServicesLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Icn", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_List", outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Menu", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Menu", libraries=["MenusLib", "ContextualMenu", "AppearanceLib"],
 			outputdir="::Lib:Carbon")
-	genpluginproject("all", "Qd", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Qt", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Qt", outputdir="::Lib:Carbon")
-	genpluginproject("all", "Qdoffs", outputdir="::Lib:Carbon")
-	genpluginproject("all", "Res", outputdir="::Lib:Carbon")
-	genpluginproject("all", "Scrap", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Snd", libraries=["SoundLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Snd", outputdir="::Lib:Carbon")
-	genpluginproject("all", "Sndihooks", sources=[":snd:Sndihooks.c"], outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "TE", libraries=["DragLib"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "TE", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Mlte", libraries=["Textension"], outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Mlte", outputdir="::Lib:Carbon")
-	genpluginproject("carbon", "Win", outputdir="::Lib:Carbon")
-	genpluginproject("ppc", "Win", libraries=["WindowsLib", "AppearanceLib"],
+	genpluginproject("all", "_Qd", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Qt", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Qt", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Qdoffs", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Res", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Scrap", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Snd", libraries=["SoundLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Snd", outputdir="::Lib:Carbon")
+	genpluginproject("all", "_Sndihooks", sources=[":snd:_Sndihooks.c"], outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_TE", libraries=["DragLib"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_TE", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Mlte", libraries=["Textension"], outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Mlte", outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_Win", outputdir="::Lib:Carbon")
+	genpluginproject("ppc", "_Win", libraries=["WindowsLib", "AppearanceLib"],
 			outputdir="::Lib:Carbon")
 	# Carbon Only?
-	genpluginproject("carbon", "CF", outputdir="::Lib:Carbon")
+	genpluginproject("carbon", "_CF", outputdir="::Lib:Carbon")
 	
 	# Other Mac modules
 	genpluginproject("all", "calldll", sources=["calldll.c"])