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

Jack Jansen jackjansen@users.sourceforge.net
Fri, 22 Mar 2002 06:15:09 -0800


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

Modified Files:
	genpluginprojects.py 
Log Message:
- Weaklink InterfaceLib in _Res module
- forgot to pass libraryflags and stdlibraryflags on to ppc/carbon
  project generation.

First half of fix to 531398.

Index: genpluginprojects.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/genpluginprojects.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** genpluginprojects.py	14 Mar 2002 23:14:43 -0000	1.28
--- genpluginprojects.py	22 Mar 2002 14:15:07 -0000	1.29
***************
*** 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
***************
*** 163,167 ****
  	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")
--- 165,170 ----
  	genpluginproject("carbon", "_Qt", outputdir="::Lib:Carbon")
  	genpluginproject("all", "_Qdoffs", 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")