Final tweaks for 2.2a3 distribution.

5 files changed, 38 insertions, 28 deletions

diff --git a/Mac/Distributions/(vise)/Python 2.2.vct b/Mac/Distributions/(vise)/Python 2.2.vct
index 8bc26cf..89ab9b1 100644
--- 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
index 4701bfc..aef2eaf 100644
--- 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
index 6fa9d50..3996c4a 100644
--- 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
index 4d9e3fb..b72d54d 100644
--- a/Mac/Distributions/src.exclude
+++ b/Mac/Distributions/src.exclude
@@ -11,6 +11,7 @@
 *.slb
 *.xMAP
 *.xSYM
+*~[0-9]
 .#*
 .cvsignore
 @*
@@ -18,4 +19,3 @@ CVS
 Makefile.pre.in
 PyIDE-src
 [(]*[)]
-*~[0-9]
diff --git a/Mac/Distributions/src.include b/Mac/Distributions/src.include
index a380332..623d436 100644
--- a/Mac/Distributions/src.include
+++ b/Mac/Distributions/src.include
@@ -2,6 +2,8 @@
 (':BuildApplet', None)
 (':BuildApplication', None)
 (':ConfigurePython', None)
+(':ConfigurePythonCarbon', None)
+(':ConfigurePythonClassic', None)
 (':Demo', '')
 (':Doc', None)
 (':EditPythonPrefs', None)
@@ -12,6 +14,9 @@
 (':Extensions:README', '')
 (':Extensions:README.TOO', '')
 (':Extensions:audio', None)
+(':Extensions:example', '')
+(':Extensions:example2', '')
+(':Extensions:example3', '')
 (':Extensions:img', '')
 (':Extensions:midi', None)
 (':Extensions:pyexpat', None)
@@ -56,7 +61,6 @@
 (':Mac:Lib', '')
 (':Mac:MPW', '')
 (':Mac:Modules', '')
-(':Mac:PlugIns:readme.txt', '')
 (':Mac:Python', '')
 (':Mac:ReadMe', '')
 (':Mac:ReadMe-dev', None)
@@ -72,6 +76,7 @@
 (':Mac:Tools:bruce', None)
 (':Mac:Tools:macfreeze', '')
 (':Mac:Unsupported', '')
+(':Mac:Wastemods', '')
 (':Mac:_checkversion.py', None)
 (':Mac:mwerks', '')
 (':Mac:mwerks:old', None)
@@ -90,8 +95,11 @@
 (':Python68K', None)
 (':PythonApplet', None)
 (':PythonCore', None)
+(':PythonCoreCarbon', None)
 (':PythonFAT', None)
 (':PythonInterpreter', None)
+(':PythonInterpreterCarbon', None)
+(':PythonInterpreterClassic', None)
 (':PythonPPC', None)
 (':PythonStandCarbon', None)
 (':PythonStandSmall', None)
@@ -99,6 +107,7 @@
 (':PythonStandSmallThreading', None)
 (':PythonStandalone', None)
 (':README', '')
+(':RISCOS', None)
 (':Tools:Icon\r', None)
 (':Tools:README', '')
 (':Tools:audiopy', '')
@@ -125,16 +134,10 @@
 (':mac2unix.shar', None)
 (':mkapplet', None)
 (':pystone.py', None)
-(':site-packages', None)
 (':setup.py', None)
-(':PythonInterpreterClassic', None)
-(':PythonInterpreterCarbon', None)
-(':PythonCoreCarbon', None)
-(':ConfigurePythonClassic', None)
-(':ConfigurePythonCarbon', None)
-(':Extensions:example', '')
+(':site-packages', None)
+(':PLAN.txt', '')
+(':PythonStandSmallCarbon', None)
+(':PythonCarbonStandalone', None)
+(':Mac:OSXResources', '')
 (':Mac:OSX', '')
-(':Mac:Wastemods', '')
-(':Extensions:example2', '')
-(':Extensions:example3', '')
-(':RISCOS', None)