[Python-checkins] CVS: python/dist/src/Mac/scripts genpluginprojects.py,1.26,1.26.6.1
Jack Jansen
jackjansen@users.sourceforge.net
Mon, 25 Mar 2002 04:33:50 -0800
Update of /cvsroot/python/python/dist/src/Mac/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv5110
Modified Files:
Tag: release22-maint
genpluginprojects.py
Log Message:
Backport of 1.27, 1.29 and 1.30:
CodeWarrior includes Waste and Internet Config nowadays, obviating the need for separate downloads.
- Weaklink InterfaceLib in _Res module
- forgot to pass libraryflags and stdlibraryflags on to ppc/carbon
project generation.
First half of fix to 531398.
Weaklink most toolbox modules, improving backward compatibility. Modules will no longer fail to load if a single routine is missing on the curent OS version, inShould finally fix 531398. 2.2.1 candidate.se an exception.
Index: genpluginprojects.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/genpluginprojects.py,v
retrieving revision 1.26
retrieving revision 1.26.6.1
diff -C2 -d -r1.26 -r1.26.6.1
*** genpluginprojects.py 13 Dec 2001 13:21:38 -0000 1.26
--- genpluginprojects.py 25 Mar 2002 12:33:48 -0000 1.26.6.1
***************
*** 42,48 ****
# 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
--- 42,50 ----
# a single multitarget project, but easier to implement for now.
genpluginproject("ppc", module, project, projectdir, sources, sourcedirs,
! libraries, extradirs, extraexportsymbols, outputdir, libraryflags,
! stdlibraryflags, prefixname)
genpluginproject("carbon", module, project, projectdir, sources, sourcedirs,
! libraries, extradirs, extraexportsymbols, outputdir, libraryflags,
! stdlibraryflags, prefixname)
return
templatename = "template-%s" % architecture
***************
*** 123,131 ****
# bgen-generated Toolbox modules
genpluginproject("carbon", "_AE", outputdir="::Lib:Carbon")
! genpluginproject("ppc", "_AE", libraries=["ObjectSupportLib"], 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"], outputdir="::Lib:Carbon")
genpluginproject("carbon", "_Cm", outputdir="::Lib:Carbon")
# XXX can't work properly because we need to set a custom fragment initializer
--- 125,135 ----
# bgen-generated Toolbox modules
genpluginproject("carbon", "_AE", 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
***************
*** 141,149 ****
libraryflags="Debug, WeakImport", 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")
--- 145,157 ----
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", "_Icn", outputdir="::Lib:Carbon")
genpluginproject("all", "_List", outputdir="::Lib:Carbon")
***************
*** 151,166 ****
genpluginproject("ppc", "_Menu", libraries=["CarbonAccessors.o", "MenusLib", "ContextualMenu", "AppearanceLib"],
libraryflags="Debug, WeakImport", 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=["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"], 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")
--- 159,182 ----
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")
***************
*** 176,196 ****
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("carbon", "waste",
sources=[
--- 192,229 ----
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=[
***************
*** 202,214 ****
'{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',
! '::::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=["ICGlueCFM-PPC.lib"],
! extradirs=["::::ICProgKit1.4:APIs"])
! genpluginproject("carbon", "icglue", sources=["icgluemodule.c"],
! extradirs=["::::ICProgKit1.4:APIs"])
genpluginproject("ppc", "macspeech", libraries=["SpeechLib"])
--- 235,247 ----
'{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',
! ]
)
+ ## '::::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"])