[Python-checkins] python/dist/src/Mac/scripts BuildApplet.rsrc,1.6,1.7 BuildApplication.rsrc,1.6,1.7 ConfigurePython.py,1.41,1.42 ConfigurePython.rsrc,1.15,1.16 EditPythonPrefs.rsrc,1.15,1.16 fullbuild.py,1.88,1.89 genpluginprojects.py,1.38,1.39
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Wed, 08 Jan 2003 08:27:47 -0800
Update of /cvsroot/python/python/dist/src/Mac/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv27782/Mac/scripts
Modified Files:
BuildApplet.rsrc BuildApplication.rsrc ConfigurePython.py
ConfigurePython.rsrc EditPythonPrefs.rsrc fullbuild.py
genpluginprojects.py
Log Message:
Merging the various tweaks for MacPython-OS9 2.3a1 back into the trunk.
Index: BuildApplet.rsrc
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/BuildApplet.rsrc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
Binary files /tmp/cvsad1rhA and /tmp/cvsc5NOm0 differ
Index: BuildApplication.rsrc
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/BuildApplication.rsrc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
Binary files /tmp/cvs3RN1OF and /tmp/cvssakeNd differ
Index: ConfigurePython.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/ConfigurePython.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ConfigurePython.py 7 Dec 2001 16:06:59 -0000 1.41
--- ConfigurePython.py 8 Jan 2003 16:27:43 -0000 1.42
***************
*** 161,167 ****
MacOS.splash(SPLASH_COPYCORE)
if verbose:
! print "Copying PythonCore..."
n = 0
- n = n + mkcorealias('PythonCore', 'PythonCore')
n = n + mkcorealias('PythonCoreCarbon', 'PythonCoreCarbon')
if n == 0:
--- 161,166 ----
MacOS.splash(SPLASH_COPYCORE)
if verbose:
! print "Copying PythonCoreCarbon..."
n = 0
n = n + mkcorealias('PythonCoreCarbon', 'PythonCoreCarbon')
if n == 0:
***************
*** 171,200 ****
print "Warning: PythonCore not copied to Extensions folder"
print " (Applets will not work unless run from the Python folder)"
- if sys.argv[0][-7:] == 'Classic':
- do_classic = 1
- elif sys.argv[0][-6:] == 'Carbon':
- do_classic = 0
- else:
- print "I don't know the sys.argv[0] function", sys.argv[0]
- if verbose:
- print "Configure classic or carbon - ",
- rv = string.strip(sys.stdin.readline())
- while rv and rv != "classic" and rv != "carbon":
- print "Configure classic or carbon - ",
- rv = string.strip(sys.stdin.readline())
- if rv == "classic":
- do_classic = 1
- elif rv == "carbon":
- do_classic = 0
- else:
- return
- else:
- sys.exit(1)
- if do_classic:
- MacOS.splash(SPLASH_COPYCLASSIC)
- buildcopy(sys.prefix, None, [("PythonInterpreterClassic", "PythonInterpreter")])
- else:
- MacOS.splash(SPLASH_COPYCARBON)
- buildcopy(sys.prefix, None, [("PythonInterpreterCarbon", "PythonInterpreter")])
MacOS.splash(SPLASH_BUILDAPPLETS)
buildapplet(sys.prefix, None, APPLET_LIST)
--- 170,173 ----
Index: ConfigurePython.rsrc
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/ConfigurePython.rsrc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
Binary files /tmp/cvsrntTMI and /tmp/cvsgSC1kh differ
Index: EditPythonPrefs.rsrc
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/EditPythonPrefs.rsrc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
Binary files /tmp/cvssI5l8J and /tmp/cvsKYjOZj differ
Index: fullbuild.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/fullbuild.py,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** fullbuild.py 24 Dec 2002 13:07:58 -0000 1.88
--- fullbuild.py 8 Jan 2003 16:27:44 -0000 1.89
***************
*** 203,206 ****
--- 203,207 ----
(":Mac:Build:pyexpat.carbon.mcp", "pyexpat.carbon"),
(":Mac:Build:calldll.carbon.mcp", "calldll.carbon"),
+ (":Mac:Build:datetime.carbon.mcp", "datetime.carbon"),
(":Mac:Build:gdbm.carbon.mcp", "gdbm.carbon"),
(":Mac:Build:icglue.carbon.mcp", "icglue.carbon"),
Index: genpluginprojects.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/genpluginprojects.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** genpluginprojects.py 24 Dec 2002 13:07:58 -0000 1.38
--- genpluginprojects.py 8 Jan 2003 16:27:44 -0000 1.39
***************
*** 115,164 ****
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", "_App", outputdir="::Lib:Carbon")
! genpluginproject("carbon", "_Cm", outputdir="::Lib:Carbon")
! # XXX can't work properly because we need to set a custom fragment initializer
! #genpluginproject("carbon", "_CG",
! # sources=["_CGModule.c", "CFMLateImport.c"],
! # libraries=["CGStubLib"],
! # 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")
genpluginproject("carbon", "hfsplus")
--- 115,159 ----
genpluginproject("carbon", "_testcapi")
genpluginproject("carbon", "xx")
+ genpluginproject("carbon", "datetime")
genpluginproject("carbon", "xxsubtype", sources=["xxsubtype.c"])
genpluginproject("carbon", "_hotshot", sources=["_hotshot.c"])
# bgen-generated Toolbox modules
! genpluginproject("carbon", "_AE")
! genpluginproject("carbon", "_AH")
! genpluginproject("carbon", "_App")
! genpluginproject("carbon", "_Cm")
! genpluginproject("carbon", "_Ctl")
! genpluginproject("carbon", "_Dlg")
! genpluginproject("carbon", "_Drag")
genpluginproject("carbon", "_Evt",
! stdlibraryflags="Debug, WeakImport")
genpluginproject("carbon", "_File",
! stdlibraryflags="Debug, WeakImport")
genpluginproject("carbon", "_Fm",
! stdlibraryflags="Debug, WeakImport")
genpluginproject("carbon", "_Folder",
! stdlibraryflags="Debug, WeakImport")
! genpluginproject("carbon", "_Help")
! genpluginproject("carbon", "_IBCarbon", sources=[":ibcarbon:_IBCarbon.c"])
! genpluginproject("carbon", "_Icn")
! genpluginproject("carbon", "_List")
! genpluginproject("carbon", "_Menu")
genpluginproject("carbon", "_Qd",
! stdlibraryflags="Debug, WeakImport")
genpluginproject("carbon", "_Qt",
! libraryflags="Debug, WeakImport")
genpluginproject("carbon", "_Qdoffs",
! stdlibraryflags="Debug, WeakImport")
genpluginproject("carbon", "_Res",
! stdlibraryflags="Debug, WeakImport")
! genpluginproject("carbon", "_Scrap")
! genpluginproject("carbon", "_Snd")
! genpluginproject("carbon", "_Sndihooks", sources=[":snd:_Sndihooks.c"])
! genpluginproject("carbon", "_TE")
! genpluginproject("carbon", "_Mlte")
! genpluginproject("carbon", "_Win")
! genpluginproject("carbon", "_CF", sources=["_CFmodule.c", "pycfbridge.c"])
! genpluginproject("carbon", "_CarbonEvt")
genpluginproject("carbon", "hfsplus")