[Python-checkins] python/dist/src/Mac/scripts fullbuild.py,1.80,1.81 genpluginprojects.py,1.31,1.32
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
2002年6月26日 15:06:10 -0700
Update of /cvsroot/python/python/dist/src/Mac/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv17483
Modified Files:
fullbuild.py genpluginprojects.py
Log Message:
Disabled non-carbon builds (for the moment still optional) and made
these scripts work with the new precompiled headers.
Index: fullbuild.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/fullbuild.py,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** fullbuild.py 22 Jan 2002 23:24:41 -0000 1.80
--- fullbuild.py 26 Jun 2002 22:06:08 -0000 1.81
***************
*** 10,13 ****
--- 10,15 ----
# script, rebuilding running programs does not work...
+ CARBON_ONLY = 1
+
MACBUILDNO=":Mac:Include:macbuildno.h"
***************
*** 25,37 ****
from Carbon import AppleEvents
! OLDAESUPPORT = 0
!
! if OLDAESUPPORT:
! from Metrowerks_Shell_Suite import Metrowerks_Shell_Suite
! from CodeWarrior_suite import CodeWarrior_suite
! from Metrowerks_Standard_Suite import Metrowerks_Standard_Suite
! from Required_Suite import Required_Suite
! else:
! import CodeWarrior
from Carbon import Res
--- 27,31 ----
from Carbon import AppleEvents
! import CodeWarrior
from Carbon import Res
***************
*** 75,90 ****
N_BUTTONS=27
! if OLDAESUPPORT:
! class MwShell(Metrowerks_Shell_Suite, CodeWarrior_suite, Metrowerks_Standard_Suite,
! Required_Suite, aetools.TalkTo):
! pass
else:
! MwShell = CodeWarrior.CodeWarrior
!
RUNNING=[]
def buildmwproject(top, creator, projects):
"""Build projects with an MW compiler"""
! mgr = MwShell(creator, start=1)
mgr.send_timeout = AppleEvents.kNoTimeOut
--- 69,90 ----
N_BUTTONS=27
! if CARBON_ONLY:
! BUTTONS_DISABLE = [
! I_PPC_EXTLIBS,
! I_PPC_CORE,
! I_PPC_PLUGINS,
! I_PPC_EXTENSIONS,
! I_INTERPRETER,
! I_PPC_FULL,
! I_PPC_SMALL,
! ]
else:
! BUTTONS_DISABLE = []
!
RUNNING=[]
def buildmwproject(top, creator, projects):
"""Build projects with an MW compiler"""
! mgr = CodeWarrior.CodeWarrior(creator, start=1)
mgr.send_timeout = AppleEvents.kNoTimeOut
***************
*** 178,181 ****
--- 178,184 ----
d.SetDialogCancelItem(I_CANCEL)
results = [0]*N_BUTTONS
+ for n in BUTTONS_DISABLE:
+ ctl = d.GetDialogItemAsControl(n)
+ ctl.HideControl()
while 1:
n = Dlg.ModalDialog(None)
Index: genpluginprojects.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/genpluginprojects.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** genpluginprojects.py 23 May 2002 22:33:56 -0000 1.31
--- genpluginprojects.py 26 Jun 2002 22:06:08 -0000 1.32
***************
*** 4,7 ****
--- 4,9 ----
import string
+ CARBON_ONLY=1
+
PYTHONDIR = sys.prefix
PROJECTDIR = os.path.join(PYTHONDIR, ":Mac:Build")
***************
*** 39,42 ****
--- 41,46 ----
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
***************
*** 83,87 ****
pass
elif architecture == "carbon":
! prefixname = "mwerks_carbonplugin_config.h"
else:
prefixname = "mwerks_plugin_config.h"
--- 87,91 ----
pass
elif architecture == "carbon":
! prefixname = "mwerks_shcarbon_pch"
else:
prefixname = "mwerks_plugin_config.h"
***************
*** 113,122 ****
sources=["pyexpat.c", "xmlparse.c", "xmlrole.c", "xmltok.c"],
extradirs=[":::Modules:expat"],
! prefixname="mwerks_pyexpat_config.h"
)
genpluginproject("carbon", "pyexpat",
sources=["pyexpat.c", "xmlparse.c", "xmlrole.c", "xmltok.c"],
extradirs=[":::Modules:expat"],
! prefixname="mwerks_carbonpyexpat_config.h"
)
genpluginproject("all", "zlib",
--- 117,126 ----
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",
***************
*** 195,199 ****
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
# Carbon Only?
! genpluginproject("carbon", "_CF", outputdir="::Lib:Carbon")
genpluginproject("carbon", "_CarbonEvt", outputdir="::Lib:Carbon")
genpluginproject("carbon", "hfsplus")
--- 199,203 ----
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
# Carbon Only?
! genpluginproject("carbon", "_CF", sources=[":cf:_CFmodule.c", ":cf:pycfbridge.c"], outputdir="::Lib:Carbon")
genpluginproject("carbon", "_CarbonEvt", outputdir="::Lib:Carbon")
genpluginproject("carbon", "hfsplus")