[Python-checkins] CVS: python/dist/src/Mac/scripts genpluginprojects.py,1.16,1.16.2.1

Guido van Rossum gvanrossum@users.sourceforge.net
Mon, 20 Aug 2001 10:12:40 -0700


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

Modified Files:
      Tag: r22a2-branch
	genpluginprojects.py 
Log Message:
Merge Jack's changes from the trunk

Index: genpluginprojects.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/genpluginprojects.py,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** genpluginprojects.py	2001/08/16 20:39:17	1.16
--- genpluginprojects.py	2001/08/20 17:12:38	1.16.2.1
***************
*** 36,47 ****
  		sources=[], sourcedirs=[],
  		libraries=[], extradirs=[],
! 		extraexportsymbols=[]):
  	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)
  		genpluginproject("carbon", module, project, projectdir, sources, sourcedirs,
! 				libraries, extradirs, extraexportsymbols)
  		return
  	templatename = "template-%s" % architecture
--- 36,47 ----
  		sources=[], sourcedirs=[],
  		libraries=[], extradirs=[],
! 		extraexportsymbols=[], outputdir=":::Lib:lib-dynload"):
  	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)
  		genpluginproject("carbon", module, project, projectdir, sources, sourcedirs,
! 				libraries, extradirs, extraexportsymbols, outputdir)
  		return
  	templatename = "template-%s" % architecture
***************
*** 79,83 ****
  		"extrasearchdirs" : sourcedirs + extradirs,
  		"libraries": libraries,
! 		"mac_outputdir" : "::Plugins",
  		"extraexportsymbols" : extraexportsymbols,
  		"mac_targetname" : targetname,
--- 79,83 ----
  		"extrasearchdirs" : sourcedirs + extradirs,
  		"libraries": libraries,
! 		"mac_outputdir" : outputdir,
  		"extraexportsymbols" : extraexportsymbols,
  		"mac_targetname" : targetname,
***************
*** 107,147 ****
  	
  	# bgen-generated Toolbox modules
! 	genpluginproject("carbon", "AE")
! 	genpluginproject("ppc", "AE", libraries=["ObjectSupportLib"])
! 	genpluginproject("ppc", "App", libraries=["AppearanceLib"])
! 	genpluginproject("carbon", "App")
! 	genpluginproject("ppc", "Cm", libraries=["QuickTimeLib"])
! 	genpluginproject("carbon", "Cm")
! 	genpluginproject("carbon", "Ctl")
! 	genpluginproject("ppc", "Ctl", libraries=["ControlsLib", "AppearanceLib"])
! 	genpluginproject("carbon", "Dlg")
! 	genpluginproject("ppc", "Dlg", libraries=["DialogsLib", "AppearanceLib"])
! 	genpluginproject("carbon", "Drag")
! 	genpluginproject("ppc", "Drag", libraries=["DragLib"])
! 	genpluginproject("all", "Evt")
! 	genpluginproject("all", "Fm")
! 	genpluginproject("ppc", "Help")
! 	genpluginproject("ppc", "Icn", libraries=["IconServicesLib"])
! 	genpluginproject("carbon", "Icn")
! 	genpluginproject("all", "List")
! 	genpluginproject("carbon", "Menu")
! 	genpluginproject("ppc", "Menu", libraries=["MenusLib", "ContextualMenu", "AppearanceLib"])
! 	genpluginproject("all", "Qd")
! 	genpluginproject("ppc", "Qt", libraries=["QuickTimeLib"])
! 	genpluginproject("carbon", "Qt")
! 	genpluginproject("all", "Qdoffs")
! 	genpluginproject("all", "Res")
! 	genpluginproject("all", "Scrap")
! 	genpluginproject("ppc", "Snd", libraries=["SoundLib"])
! 	genpluginproject("carbon", "Snd")
! 	genpluginproject("all", "Sndihooks", sources=[":snd:Sndihooks.c"])
! 	genpluginproject("ppc", "TE", libraries=["DragLib"])
! 	genpluginproject("carbon", "TE")
! 	genpluginproject("ppc", "Mlte", libraries=["Textension"])
! 	genpluginproject("carbon", "Mlte")
! 	genpluginproject("carbon", "Win")
! 	genpluginproject("ppc", "Win", libraries=["WindowsLib", "AppearanceLib"])
  	# Carbon Only?
! 	genpluginproject("carbon", "CF")
  	
  	# Other Mac modules
--- 107,151 ----
  	
  	# 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"], 
! 			outputdir="::Lib:Carbon")
! 	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"],
! 			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"],
! 			outputdir="::Lib:Carbon")
  	# Carbon Only?
! 	genpluginproject("carbon", "CF", outputdir="::Lib:Carbon")
  	
  	# Other Mac modules