Final tweaks for 2.2a3 distribution.

skrah · Sep 8, 2001 · f7e5714 · f7e5714
1 parent caef93d
commit f7e5714
Show file tree

Hide file tree

Showing 13 changed files with 104 additions and 60 deletions.
diff --git a/Mac/Build/PythonCore.exp b/Mac/Build/PythonCore.exp
@@ -171,6 +171,7 @@ PyRun_String
 PyErr_Display
 PyErr_PrintEx
 PyErr_Print
+PyRun_SimpleStringFlags
 PyRun_SimpleString
 PyRun_SimpleFileExFlags
 PyRun_SimpleFileEx
@@ -319,6 +320,9 @@ PyMethod_New
 PyInstance_NewRaw
 PyClass_IsSubclass
 PyInstance_New
+PyMethod_Class
+PyMethod_Self
+PyMethod_Function
 PyClass_New
 PyCObject_Type
 PyCObject_Import
@@ -421,6 +425,7 @@ PyLong_FromString
 PyLong_AsVoidPtr
 PyLong_FromVoidPtr
 PyLong_AsDouble
+_PyLong_AsScaledDouble
 _PyLong_AsByteArray
 _PyLong_FromByteArray
 PyLong_AsUnsignedLong
@@ -450,6 +455,7 @@ _Py_NotImplementedStruct
 _Py_cobject_hack
 _Py_abstract_hack
 PyObject_ClearWeakRefs
+Py_DivisionWarningFlag
 _PyTrash_delete_later
 _PyTrash_delete_nesting
 _PyTrash_destroy_chain
@@ -463,6 +469,7 @@ PyMem_Free
 PyMem_Realloc
 PyMem_Malloc
 _Py_ReadyTypes
+PyObject_Dir
 PyCallable_Check
 PyNumber_Coerce
 PyNumber_CoerceEx
@@ -533,6 +540,7 @@ PyTuple_GetItem
 PyTuple_Size
 PyTuple_New
 type_getsets
+subtype_getsets
 PyType_Type
 PyBaseObject_Type
 PySuper_Type
@@ -654,15 +662,15 @@ PyMac_StopGUSISpin
 RotateCursor
 SpinCursor
 PyMac_GetFullPath
-__convert_to_newlines
 PyMac_AppRefNum
 PyMac_options
 console_output_state
+__convert_to_newlines
 PyMac_GetDelayConsoleFlag
 Py_GetExecPrefix
 Py_GetPrefix
-Py_GetArgcArgv
 Py_GetProgramFullPath
+Py_GetArgcArgv
 PyMac_Exit
 abort
 PyMac_OutputNotSeen
@@ -681,9 +689,9 @@ macstat
 sync
 initgestalt
 initmacfs
-PyMac_BuildFSSpec
-PyMac_BuildFSRef
-PyMac_GetFSRef
+_PyMac_BuildFSSpec
+_PyMac_BuildFSRef
+_PyMac_GetFSRef
 newmfssobject
 _PyMac_GetFSSpec
 initmac
@@ -877,7 +885,7 @@ PyOS_vsnprintf
 PyOS_snprintf
 proxytype
 wrappertype
-PyGetSet_Type
+PyProperty_Type
 PyWrapper_New
 PyDictProxy_New
 proxy_str
@@ -897,7 +905,10 @@ _PyObject_GC_Track
 _PyGC_Dump
 initgc
 PyMac_OSErrException
+PyMacGluePtr_PyMac_BuildFSSpec
 PyMacGluePtr_PyMac_GetFSSpec
+PyMacGluePtr_PyMac_BuildFSRef
+PyMacGluePtr_PyMac_GetFSRef
 PyMacGluePtr_AEDesc_New
 PyMacGluePtr_AEDesc_Convert
 PyMacGluePtr_CmpObj_New
@@ -990,7 +1001,10 @@ CmpObj_Convert
 CmpObj_New
 AEDesc_Convert
 AEDesc_New
+PyMac_GetFSRef
+PyMac_BuildFSRef
 PyMac_GetFSSpec
+PyMac_BuildFSSpec
 PyMac_Buildwide
 PyMac_Getwide
 PyMac_BuildFixed

diff --git a/Mac/Build/PythonCore.mcp b/Mac/Build/PythonCore.mcp
diff --git a/Mac/Build/PythonCoreCarbon.exp b/Mac/Build/PythonCoreCarbon.exp
@@ -171,6 +171,7 @@ PyRun_String
 PyErr_Display
 PyErr_PrintEx
 PyErr_Print
+PyRun_SimpleStringFlags
 PyRun_SimpleString
 PyRun_SimpleFileExFlags
 PyRun_SimpleFileEx
@@ -319,6 +320,9 @@ PyMethod_New
 PyInstance_NewRaw
 PyClass_IsSubclass
 PyInstance_New
+PyMethod_Class
+PyMethod_Self
+PyMethod_Function
 PyClass_New
 PyCObject_Type
 PyCObject_Import
@@ -421,6 +425,7 @@ PyLong_FromString
 PyLong_AsVoidPtr
 PyLong_FromVoidPtr
 PyLong_AsDouble
+_PyLong_AsScaledDouble
 _PyLong_AsByteArray
 _PyLong_FromByteArray
 PyLong_AsUnsignedLong
@@ -450,6 +455,7 @@ _Py_NotImplementedStruct
 _Py_cobject_hack
 _Py_abstract_hack
 PyObject_ClearWeakRefs
+Py_DivisionWarningFlag
 _PyTrash_delete_later
 _PyTrash_delete_nesting
 _PyTrash_destroy_chain
@@ -463,6 +469,7 @@ PyMem_Free
 PyMem_Realloc
 PyMem_Malloc
 _Py_ReadyTypes
+PyObject_Dir
 PyCallable_Check
 PyNumber_Coerce
 PyNumber_CoerceEx
@@ -533,6 +540,7 @@ PyTuple_GetItem
 PyTuple_Size
 PyTuple_New
 type_getsets
+subtype_getsets
 PyType_Type
 PyBaseObject_Type
 PySuper_Type
@@ -648,15 +656,15 @@ PyMac_StopGUSISpin
 RotateCursor
 SpinCursor
 PyMac_GetFullPath
-__convert_to_newlines
 PyMac_AppRefNum
 PyMac_options
 console_output_state
+__convert_to_newlines
 PyMac_GetDelayConsoleFlag
 Py_GetExecPrefix
 Py_GetPrefix
-Py_GetArgcArgv
 Py_GetProgramFullPath
+Py_GetArgcArgv
 PyMac_Exit
 abort
 PyMac_OutputNotSeen
@@ -674,9 +682,9 @@ macstat
 sync
 initgestalt
 initmacfs
-PyMac_BuildFSSpec
-PyMac_BuildFSRef
-PyMac_GetFSRef
+_PyMac_BuildFSSpec
+_PyMac_BuildFSRef
+_PyMac_GetFSRef
 newmfsrobject
 newmfssobject
 _PyMac_GetFSSpec
@@ -871,7 +879,7 @@ PyOS_vsnprintf
 PyOS_snprintf
 proxytype
 wrappertype
-PyGetSet_Type
+PyProperty_Type
 PyWrapper_New
 PyDictProxy_New
 proxy_str
@@ -891,7 +899,10 @@ _PyObject_GC_Track
 _PyGC_Dump
 initgc
 PyMac_OSErrException
+PyMacGluePtr_PyMac_BuildFSSpec
 PyMacGluePtr_PyMac_GetFSSpec
+PyMacGluePtr_PyMac_BuildFSRef
+PyMacGluePtr_PyMac_GetFSRef
 PyMacGluePtr_AEDesc_New
 PyMacGluePtr_AEDesc_Convert
 PyMacGluePtr_CmpObj_New
@@ -984,7 +995,10 @@ CmpObj_Convert
 CmpObj_New
 AEDesc_Convert
 AEDesc_New
+PyMac_GetFSRef
+PyMac_BuildFSRef
 PyMac_GetFSSpec
+PyMac_BuildFSSpec
 PyMac_Buildwide
 PyMac_Getwide
 PyMac_BuildFixed

diff --git a/Mac/Build/PythonStandSmall.mcp b/Mac/Build/PythonStandSmall.mcp
diff --git a/Mac/Distributions/(vise)/Python 2.2.vct b/Mac/Distributions/(vise)/Python 2.2.vct
diff --git a/Mac/Distributions/binary.include b/Mac/Distributions/binary.include
@@ -29,6 +29,9 @@
 (':Extensions:README', None)
 (':Extensions:README.TOO', None)
 (':Extensions:audio', None)
+(':Extensions:example2:README', None)
+(':Extensions:example3:README', None)
+(':Extensions:example:README', None)
 (':Extensions:img:Lib', '')
 (':Extensions:img:Mac:genimgprojects.py', None)
 (':Extensions:img:Mac:imgcolormap.carbon.slb', '')
@@ -125,6 +128,7 @@
 (':Mac:Contrib:Sherlock', '')
 (':Mac:Contrib:Tabcleaner', '')
 (':Mac:Contrib:morefindertools', '')
+(':Mac:Contrib:osam:OSAm.carbon.slb', '')
 (':Mac:Contrib:osam:OSAm.exp', None)
 (':Mac:Contrib:osam:OSAm.ppc.slb', '')
 (':Mac:Contrib:osam:OSAm.ppc.slb.sit', None)
@@ -140,7 +144,7 @@
 (':Mac:MPW', None)
 (':Mac:Modules', None)
 (':Mac:OSX:README.macosx.txt', None)
-(':Mac:PlugIns', '')
+(':Mac:OSXResources', None)
 (':Mac:Python:Icon', None)
 (':Mac:ReadMe', ':ReadMe')
 (':Mac:ReadMe-dev', None)
@@ -168,6 +172,7 @@
 (':Objects:Icon', None)
 (':PC', None)
 (':PCbuild', None)
+(':PLAN.txt', None)
 (':Parser:Icon', None)
 (':Python IDE', None)
 (':Python:Icon', None)
@@ -209,10 +214,8 @@
 (':loop.py', None)
 (':mac2unix-real.shar', None)
 (':mac2unix.shar', None)
+(':pyconfig.h.in', None)
 (':pystone.py', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Extensions:example3:README', None)
-(':Extensions:example2:README', None)
-(':Extensions:example:README', None)
-(':Mac:Contrib:osam:OSAm.carbon.slb', '')
+(':Mac:OSX:README', None)
diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include
@@ -353,7 +353,6 @@
 (':Mac:Lib', None)
 (':Mac:MPW', None)
 (':Mac:Modules', None)
-(':Mac:OSX:README.macosx.txt', None)
 (':Mac:OSXResources', None)
 (':Mac:OSXResources:', None)
 (':Mac:PlugIns:readme.txt', None)
@@ -364,6 +363,15 @@
 (':Mac:ReadMe-src', None)
 (':Mac:Relnotes', None)
 (':Mac:Relnotes-source', None)
+(':Mac:Resources:Carbon.r', None)
+(':Mac:Resources:balloons.bh', None)
+(':Mac:Resources:bundle.rsrc', None)
+(':Mac:Resources:dialogs.rsrc', None)
+(':Mac:Resources:errors.rsrc', None)
+(':Mac:Resources:gusiprefs.rsrc', None)
+(':Mac:Resources:pythonpath.r', '')
+(':Mac:Resources:tkpython.rsrc', None)
+(':Mac:Resources:version.r', None)
 (':Mac:TODO', None)
 (':Mac:Tools:BBPy', None)
 (':Mac:Tools:CGI', None)
@@ -522,6 +530,8 @@
 (':Modules:yuv.h', None)
 (':Modules:yuvconvert.c', None)
 (':Modules:zlibmodule.c', None)
+(':Modules:zlibmodule.c~0', None)
+(':Modules:zlibmodule.c~1', None)
 (':Objects', None)
 (':Objects:Icon\r', None)
 (':PC', None)
@@ -576,12 +586,6 @@
 (':readmefiles', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Mac:Resources:pythonpath.r', '')
-(':Mac:Resources:version.r', None)
-(':Mac:Resources:tkpython.rsrc', None)
-(':Mac:Resources:gusiprefs.rsrc', None)
-(':Mac:Resources:errors.rsrc', None)
-(':Mac:Resources:dialogs.rsrc', None)
-(':Mac:Resources:Carbon.r', None)
-(':Mac:Resources:bundle.rsrc', None)
-(':Mac:Resources:balloons.bh', None)
+(':Mac:OSX:README.macosx.txt', None)
+(':Mac:OSX:README', None)
+(':Mac:OSX:Makefile', None)
diff --git a/Mac/Distributions/src.exclude b/Mac/Distributions/src.exclude
@@ -11,11 +11,11 @@
 *.slb
 *.xMAP
 *.xSYM
+*~[0-9]
 .#*
 .cvsignore
 @*
 CVS
 Makefile.pre.in
 PyIDE-src
 [(]*[)]
-*~[0-9]