[Python-checkins] python/dist/src/Mac/scripts fullbuild.py,1.86,1.87 genpluginprojects.py,1.36,1.37

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Fri, 13 Dec 2002 15:34:05 -0800


Update of /cvsroot/python/python/dist/src/Mac/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv2875

Modified Files:
	fullbuild.py genpluginprojects.py 
Log Message:
Got rid of non-carbon stuff, and added new Alias, File and Folder modules.

Index: fullbuild.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/fullbuild.py,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** fullbuild.py	6 Sep 2002 22:59:00 -0000	1.86
--- fullbuild.py	13 Dec 2002 23:34:03 -0000	1.87
***************
*** 208,216 ****
  		(":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:_App.carbon.mcp", "_App.carbon"),
  		(":Mac:Build:_CF.carbon.mcp", "_CF.carbon"),
--- 208,215 ----
  		(":Mac:Build:zlib.carbon.mcp", "zlib.carbon"),
  		(":Mac:Build:hfsplus.carbon.mcp", "hfsplus.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"),
***************
*** 222,226 ****
--- 221,228 ----
  		(":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"),

Index: genpluginprojects.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/genpluginprojects.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** genpluginprojects.py	6 Sep 2002 22:58:55 -0000	1.36
--- genpluginprojects.py	13 Dec 2002 23:34:03 -0000	1.37
***************
*** 4,9 ****
  import string
  
- CARBON_ONLY=1
- 
  PYTHONDIR = sys.prefix
  PROJECTDIR = os.path.join(PYTHONDIR, ":Mac:Build")
--- 4,7 ----
***************
*** 41,64 ****
  		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
  	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
  	if not projectdir:
  		projectdir = PROJECTDIR
--- 39,49 ----
  		libraryflags=None, stdlibraryflags=None, prefixname=None,
  		initialize=None):
! 	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:
! 		project = "%s.%s.mcp"%(module, architecture)
  	if not projectdir:
  		projectdir = PROJECTDIR
***************
*** 114,122 ****
  	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"],
--- 99,102 ----
***************
*** 124,151 ****
  		prefixname="mwerks_shcarbon_config.h"
  		)
! 	genpluginproject("all", "zlib", 
  		libraries=["zlib.ppc.Lib"], 
  		extradirs=["::::imglibs:zlib:mac", "::::imglibs:zlib"])
! 	genpluginproject("all", "gdbm", 
  		libraries=["gdbm.ppc.gusi.lib"], 
  		extradirs=["::::gdbm:mac", "::::gdbm"])
! 	genpluginproject("all", "_weakref", sources=["_weakref.c"])
! 	genpluginproject("all", "_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"])
  	
  	# 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", "_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
--- 104,126 ----
  		prefixname="mwerks_shcarbon_config.h"
  		)
! 	genpluginproject("carbon", "zlib", 
  		libraries=["zlib.ppc.Lib"], 
  		extradirs=["::::imglibs:zlib:mac", "::::imglibs:zlib"])
! 	genpluginproject("carbon", "gdbm", 
  		libraries=["gdbm.ppc.gusi.lib"], 
  		extradirs=["::::gdbm:mac", "::::gdbm"])
! 	genpluginproject("carbon", "_weakref", sources=["_weakref.c"])
! 	genpluginproject("carbon", "_symtable", sources=["symtablemodule.c"])
  	# Example/test modules
! 	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("carbon", "_Alias", 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
***************
*** 155,205 ****
  	#		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", 
  			stdlibraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
! 	genpluginproject("all", "_Fm", 
  			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", "_IBCarbon", sources=[":ibcarbon:_IBCarbon.c"], 
  			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=["CarbonAccessors.o", "MenusLib", "ContextualMenu", "AppearanceLib"],
! 			libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
! 	genpluginproject("all", "_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", 
  			stdlibraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
! 	genpluginproject("all", "_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", "_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", "_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")
--- 130,163 ----
  	#		outputdir="::Lib:Carbon")
  	genpluginproject("carbon", "_Ctl", outputdir="::Lib:Carbon")
  	genpluginproject("carbon", "_Dlg", outputdir="::Lib:Carbon")
  	genpluginproject("carbon", "_Drag", outputdir="::Lib:Carbon")
! 	genpluginproject("carbon", "_Evt", 
  			stdlibraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
! 	genpluginproject("carbon", "_File", 
  			stdlibraryflags="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("carbon", "_List", outputdir="::Lib:Carbon")
  	genpluginproject("carbon", "_Menu", outputdir="::Lib:Carbon")
! 	genpluginproject("carbon", "_Qd", 
  			stdlibraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
  	genpluginproject("carbon", "_Qt", 
  			libraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
! 	genpluginproject("carbon", "_Qdoffs", 
  			stdlibraryflags="Debug, WeakImport",  outputdir="::Lib:Carbon")
! 	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")
***************
*** 207,247 ****
  	
  	# 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", "waste",
  		sources=[
--- 165,170 ----
  	
  	# Other Mac modules
! 	genpluginproject("carbon", "calldll", sources=["calldll.c"])
! 	genpluginproject("carbon", "ColorPicker")
  	genpluginproject("carbon", "waste",
  		sources=[
***************
*** 256,266 ****
  			]
  		)
- ##			'::::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__':
--- 179,183 ----