Applying r22c1 branch mods back to the trunk.
diff --git "a/Mac/Distributions/\050vise\051/Python 2.2.vct" "b/Mac/Distributions/\050vise\051/Python 2.2.vct"
index 2576f38..e53f6f4 100644
--- "a/Mac/Distributions/\050vise\051/Python 2.2.vct"
+++ "b/Mac/Distributions/\050vise\051/Python 2.2.vct"
Binary files differ
diff --git a/Mac/Distributions/binary.exclude b/Mac/Distributions/binary.exclude
index ea770a4..e0b3b92 100644
--- a/Mac/Distributions/binary.exclude
+++ b/Mac/Distributions/binary.exclude
@@ -19,6 +19,8 @@
*.orig
*.prj
*.prj.exp
+*.pyc
+*.pyo
*.xSYM
*.µ
*.µ.exp
@@ -32,5 +34,3 @@
Makefile*
Setup.in
[(]*[)]
-*.pyc
-*.pyo
diff --git a/Mac/Distributions/binary.include b/Mac/Distributions/binary.include
index e75b325..1c6f417 100644
--- a/Mac/Distributions/binary.include
+++ b/Mac/Distributions/binary.include
@@ -219,3 +219,5 @@
(':pystone.py', None)
(':setup.py', None)
(':site-packages', None)
+(':Mac:ReadMe~0', None)
+(':Mac:Contrib:mpwsystem', '')
diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include
index 65e1fbb..e7476e6 100644
--- a/Mac/Distributions/dev.include
+++ b/Mac/Distributions/dev.include
@@ -263,6 +263,9 @@
(':Mac:Build:gdbm.mcp', None)
(':Mac:Build:gdbm.mcp.exp', None)
(':Mac:Build:gdbm.mcp.xml', None)
+(':Mac:Build:hfsplus.carbon.mcp', None)
+(':Mac:Build:hfsplus.carbon.mcp.exp', None)
+(':Mac:Build:hfsplus.carbon.mcp.xml', None)
(':Mac:Build:icglue.carbon.mcp', None)
(':Mac:Build:icglue.carbon.mcp.exp', None)
(':Mac:Build:icglue.carbon.mcp.xml', None)
@@ -406,6 +409,7 @@
(':Mac:mwerks:mwerks_plugin_config.h', ':Mac:mwerks:')
(':Mac:mwerks:mwerks_shared_config.h', ':Mac:mwerks:')
(':Mac:mwerks:mwerks_shcarbon_config.h', '')
+(':Mac:mwerks:mwerks_shlib_config.h', '')
(':Mac:mwerks:mwerks_small_config.h', ':Mac:mwerks:')
(':Mac:mwerks:mwerks_thrcarbonsm_config.h', None)
(':Mac:mwerks:mwerks_threadsmall_config.h', '')
@@ -596,7 +600,16 @@
(':readmefiles', None)
(':setup.py', None)
(':site-packages', None)
-(':Mac:Build:hfsplus.carbon.mcp.xml', None)
-(':Mac:Build:hfsplus.carbon.mcp.exp', None)
-(':Mac:Build:hfsplus.carbon.mcp', None)
-(':Mac:mwerks:mwerks_shlib_config.h', '')
+(':Mac:Build:_CG.carbon.old.mcp', None)
+(':Mac:Build:_CG.carbon.mcp.exp', None)
+(':Mac:Build:_CG.carbon.mcp', None)
+(':Mac:Build:_CarbonEvt.carbon.mcp.xml', None)
+(':Mac:Build:_CarbonEvt.carbon.mcp.exp', None)
+(':Mac:Build:_CarbonEvt.carbon.mcp', None)
+(':Mac:ReadMe~0', None)
+(':Modules:timemodule.c~1', None)
+(':Modules:timemodule.c~0', None)
+(':Mac:Build:PythonStandSmall.old.mcp', None)
+(':Mac:Build:PythonInterpreter.old.mcp', None)
+(':Mac:Build:PythonCore.axp', None)
+(':Mac:Build:_dummy_tkinter.old.mcp', None)