Got rid of non-carbon stuff, and added new Alias, File and Folder modules.
diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index ee9cf2b..eca231c 100644
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -207,11 +207,10 @@
(":Mac:Build:waste.carbon.mcp", "waste.carbon"),
(":Mac:Build:zlib.carbon.mcp", "zlib.carbon"),
(":Mac:Build:hfsplus.carbon.mcp", "hfsplus.carbon"),
- ## (":Mac:Build:_dummy_tkinter.mcp", "_tkinter.carbon"),
- (":Extensions:Imaging:_tkinter.mcp", "_tkinter.carbon"),
(":Mac:Build:ColorPicker.carbon.mcp", "ColorPicker.carbon"),
(":Mac:Build:_AE.carbon.mcp", "_AE.carbon"),
(":Mac:Build:_AH.carbon.mcp", "_AH.carbon"),
+ (":Mac:Build:_Alias.carbon.mcp", "_Alias.carbon"),
(":Mac:Build:_App.carbon.mcp", "_App.carbon"),
(":Mac:Build:_CF.carbon.mcp", "_CF.carbon"),
(":Mac:Build:_CG.carbon.mcp", "_CG.carbon"),
@@ -221,7 +220,10 @@
(":Mac:Build:_Dlg.carbon.mcp", "_Dlg.carbon"),
(":Mac:Build:_Drag.carbon.mcp", "_Drag.carbon"),
(":Mac:Build:_Evt.carbon.mcp", "_Evt.carbon"),
+ (":Mac:Build:_File.carbon.mcp", "_File.carbon"),
(":Mac:Build:_Fm.carbon.mcp", "_Fm.carbon"),
+ (":Mac:Build:_Folder.carbon.mcp", "_Folder.carbon"),
+ (":Mac:Build:_Help.carbon.mcp", "_Help.carbon"),
(":Mac:Build:_IBCarbon.carbon.mcp", "_IBCarbon.carbon"),
(":Mac:Build:_Icn.carbon.mcp", "_Icn.carbon"),
(":Mac:Build:_List.carbon.mcp", "_List.carbon"),
diff --git a/Mac/scripts/genpluginprojects.py b/Mac/scripts/genpluginprojects.py
index 964b693..65ff348 100644
--- a/Mac/scripts/genpluginprojects.py
+++ b/Mac/scripts/genpluginprojects.py
@@ -3,8 +3,6 @@
import os
import string
-CARBON_ONLY=1
-
PYTHONDIR = sys.prefix
PROJECTDIR = os.path.join(PYTHONDIR, ":Mac:Build")
MODULEDIRS = [ # Relative to projectdirs
@@ -40,26 +38,13 @@
extraexportsymbols=[], outputdir=":::Lib:lib-dynload",
libraryflags=None, stdlibraryflags=None, prefixname=None,
initialize=None):
- if CARBON_ONLY and architecture == "ppc":
- return
- if architecture == "all":
- # For the time being we generate two project files. Not as nice as
- # a single multitarget project, but easier to implement for now.
- genpluginproject("ppc", module, project, projectdir, sources, sourcedirs,
- libraries, extradirs, extraexportsymbols, outputdir, libraryflags,
- stdlibraryflags, prefixname, initialize)
- genpluginproject("carbon", module, project, projectdir, sources, sourcedirs,
- libraries, extradirs, extraexportsymbols, outputdir, libraryflags,
- stdlibraryflags, prefixname, initialize)
- return
+ if architecture != "carbon":
+ raise 'Unsupported architecture: %s'%architecture
templatename = "template-%s" % architecture
targetname = "%s.%s" % (module, architecture)
dllname = "%s.%s.slb" % (module, architecture)
if not project:
- if architecture != "ppc":
- project = "%s.%s.mcp"%(module, architecture)
- else:
- project = "%s.mcp"%module
+ project = "%s.%s.mcp"%(module, architecture)
if not projectdir:
projectdir = PROJECTDIR
if not sources:
@@ -113,40 +98,30 @@
global FORCEREBUILD
FORCEREBUILD = force
# Standard Python modules
- genpluginproject("ppc", "pyexpat",
- sources=["pyexpat.c", "xmlparse.c", "xmlrole.c", "xmltok.c"],
- extradirs=[":::Modules:expat"],
- prefixname="mwerks_shared_config.h"
- )
genpluginproject("carbon", "pyexpat",
sources=["pyexpat.c", "xmlparse.c", "xmlrole.c", "xmltok.c"],
extradirs=[":::Modules:expat"],
prefixname="mwerks_shcarbon_config.h"
)
- genpluginproject("all", "zlib",
+ genpluginproject("carbon", "zlib",
libraries=["zlib.ppc.Lib"],
extradirs=["::::imglibs:zlib:mac", "::::imglibs:zlib"])
- genpluginproject("all", "gdbm",
+ genpluginproject("carbon", "gdbm",
libraries=["gdbm.ppc.gusi.lib"],
extradirs=["::::gdbm:mac", "::::gdbm"])
- genpluginproject("all", "_weakref", sources=["_weakref.c"])
- genpluginproject("all", "_symtable", sources=["symtablemodule.c"])
+ genpluginproject("carbon", "_weakref", sources=["_weakref.c"])
+ genpluginproject("carbon", "_symtable", sources=["symtablemodule.c"])
# Example/test modules
- genpluginproject("all", "_testcapi")
- genpluginproject("all", "xx")
- genpluginproject("all", "xxsubtype", sources=["xxsubtype.c"])
- genpluginproject("all", "_hotshot", sources=["_hotshot.c"])
+ genpluginproject("carbon", "_testcapi")
+ genpluginproject("carbon", "xx")
+ 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("ppc", "_AE", libraries=["ObjectSupportLib"],
- stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_App", libraries=["CarbonAccessors.o", "AppearanceLib"],
- libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
+ genpluginproject("carbon", "_Alias", outputdir="::Lib:Carbon")
genpluginproject("carbon", "_App", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_Cm", libraries=["QuickTimeLib"],
- stdlibraryflags="Debug, WeakImport", 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",
@@ -154,95 +129,43 @@
# libraries=["CGStubLib"],
# outputdir="::Lib:Carbon")
genpluginproject("carbon", "_Ctl", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_Ctl", libraries=["CarbonAccessors.o", "ControlsLib", "AppearanceLib"],
- libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
genpluginproject("carbon", "_Dlg", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_Dlg", libraries=["CarbonAccessors.o", "DialogsLib", "AppearanceLib"],
- libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
genpluginproject("carbon", "_Drag", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_Drag", libraries=["DragLib"],
- libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
- genpluginproject("all", "_Evt",
+ genpluginproject("carbon", "_Evt",
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
- genpluginproject("all", "_Fm",
+ genpluginproject("carbon", "_File",
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_Help", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_Icn", libraries=["IconServicesLib"],
- libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
+ genpluginproject("carbon", "_Fm",
+ stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
+ 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("all", "_List", outputdir="::Lib:Carbon")
+ genpluginproject("carbon", "_List", outputdir="::Lib:Carbon")
genpluginproject("carbon", "_Menu", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_Menu", libraries=["CarbonAccessors.o", "MenusLib", "ContextualMenu", "AppearanceLib"],
- libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
- genpluginproject("all", "_Qd",
+ genpluginproject("carbon", "_Qd",
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_Qt", libraries=["QuickTimeLib"],
- libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
genpluginproject("carbon", "_Qt",
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
- genpluginproject("all", "_Qdoffs",
+ genpluginproject("carbon", "_Qdoffs",
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
- genpluginproject("all", "_Res",
+ genpluginproject("carbon", "_Res",
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
- genpluginproject("all", "_Scrap", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_Snd", libraries=["CarbonAccessors.o", "SoundLib"], outputdir="::Lib:Carbon")
+ genpluginproject("carbon", "_Scrap", outputdir="::Lib:Carbon")
genpluginproject("carbon", "_Snd", outputdir="::Lib:Carbon")
- genpluginproject("all", "_Sndihooks", sources=[":snd:_Sndihooks.c"], outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_TE", libraries=["CarbonAccessors.o", "DragLib"],
- stdlibraryflags="Debug, WeakImport",
- libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
+ genpluginproject("carbon", "_Sndihooks", sources=[":snd:_Sndihooks.c"], outputdir="::Lib:Carbon")
genpluginproject("carbon", "_TE", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_Mlte", libraries=["Textension"],
- libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
genpluginproject("carbon", "_Mlte", outputdir="::Lib:Carbon")
genpluginproject("carbon", "_Win", outputdir="::Lib:Carbon")
- genpluginproject("ppc", "_Win", libraries=["CarbonAccessors.o", "WindowsLib", "AppearanceLib"],
- libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
- # Carbon Only?
genpluginproject("carbon", "_CF", sources=["_CFmodule.c", "pycfbridge.c"], outputdir="::Lib:Carbon")
genpluginproject("carbon", "_CarbonEvt", outputdir="::Lib:Carbon")
genpluginproject("carbon", "hfsplus")
# Other Mac modules
- genpluginproject("all", "calldll", sources=["calldll.c"])
- genpluginproject("all", "ColorPicker")
- genpluginproject("ppc", "Printing")
-## genpluginproject("ppc", "waste",
-## sources=[
-## "wastemodule.c",
-## 'WEAccessors.c', 'WEBirthDeath.c', 'WEDebug.c',
-## 'WEDrawing.c', 'WEFontTables.c', 'WEHighLevelEditing.c',
-## 'WEICGlue.c', 'WEInlineInput.c', 'WELineLayout.c', 'WELongCoords.c',
-## 'WELowLevelEditing.c', 'WEMouse.c', 'WEObjects.c', 'WEScraps.c',
-## 'WESelecting.c', 'WESelectors.c', 'WEUserSelectors.c', 'WEUtilities.c',
-## 'WEObjectHandlers.c',
-## 'WETabs.c',
-## 'WETabHooks.c'],
-## libraries=['DragLib'],
-## extradirs=[
-## '::::Waste 1.3 Distribution:*',
-## '::::ICProgKit1.4:APIs']
-## )
- # This is a hack, combining parts of Waste 2.0 with parts of 1.3
- genpluginproject("ppc", "waste",
- sources=[
- "wastemodule.c",
- "WEObjectHandlers.c",
- "WETabs.c", "WETabHooks.c"],
- libraries=[
- "WASTE.PPC.lib",
- "TextCommon",
- "UnicodeConverter",
- "DragLib",
- ],
- extradirs=[
- '{Compiler}:MacOS Support:(Third Party Support):Waste 2.0 Distribution:C_C++ Headers',
- '{Compiler}:MacOS Support:(Third Party Support):Waste 2.0 Distribution:Static Libraries',
- '::wastemods',
- ]
- )
+ genpluginproject("carbon", "calldll", sources=["calldll.c"])
+ genpluginproject("carbon", "ColorPicker")
genpluginproject("carbon", "waste",
sources=[
"wastemodule.c",
@@ -255,13 +178,7 @@
'::wastemods',
]
)
-## '::::Waste 1.3 Distribution:Extras:Sample Object Handlers',
-## '::::Waste 1.3 Distribution:Extras:Waste Tabs 1.3.2']
- genpluginproject("ppc", "ctb")
- genpluginproject("ppc", "icglue", sources=["icgluemodule.c"],
- libraries=["InternetConfigLib"])
genpluginproject("carbon", "icglue", sources=["icgluemodule.c"])
- genpluginproject("ppc", "macspeech", libraries=["SpeechLib"])
if __name__ == '__main__':
genallprojects()