Merging the various tweaks for MacPython-OS9 2.3a1 back into the trunk.

7 files changed, 51 insertions, 58 deletions

diff --git a/Mac/Distributions/(vise)/Python 2.3.vct b/Mac/Distributions/(vise)/Python 2.3.vct
index db0bcd1..b876e5a 100644
--- a/Mac/Distributions/(vise)/Python 2.3.vct
+++ b/Mac/Distributions/(vise)/Python 2.3.vct
diff --git a/Mac/Distributions/binary.include b/Mac/Distributions/binary.include
index 16712f3..ad20729 100644
--- a/Mac/Distributions/binary.include
+++ b/Mac/Distributions/binary.include
@@ -2,6 +2,7 @@
 (':BeOS', None)
 (':BuildApplet', None)
 (':BuildApplication', None)
+(':ConfigurePython', '')
 (':Demo', '')
 (':Demo:cwilib', None)
 (':Demo:embed', None)
@@ -111,7 +112,6 @@
 (':Mac:Contrib:PythonDetector:OpenPythonLib with NS', '')
 (':Mac:Contrib:PythonDetector:PythonDetector', '')
 (':Mac:Contrib:PythonDetector:readme.txt', '')
-(':Mac:Contrib:PythonScript', '')
 (':Mac:Contrib:Sherlock', '')
 (':Mac:Contrib:Tabcleaner', '')
 (':Mac:Contrib:mpwsystem', '')
@@ -138,7 +138,6 @@
 (':Mac:ReadMe-src', None)
 (':Mac:ReadMe~0', None)
 (':Mac:ReadmeSource', None)
-(':Mac:Relnotes', ':Relnotes:')
 (':Mac:Resources', None)
 (':Mac:TODO', None)
 (':Mac:Tools:CGI', '')
@@ -168,6 +167,7 @@
 (':Python:Icon', None)
 (':PythonCarbonStandalone', None)
 (':PythonCoreCarbon', '')
+(':PythonInterpreter', '')
 (':PythonStandCarbon', None)
 (':PythonStandSmall', None)
 (':PythonStandSmallCarbon', None)
@@ -205,5 +205,3 @@
 (':pystone.py', None)
 (':setup.py', None)
 (':site-packages', None)
-(':ConfigurePython', '')
-(':PythonInterpreter', '')
diff --git a/Mac/Distributions/dev.exclude b/Mac/Distributions/dev.exclude
index 8664074..c1cb22b 100644
--- a/Mac/Distributions/dev.exclude
+++ b/Mac/Distributions/dev.exclude
@@ -5,12 +5,14 @@
 *.dbg
 *.hqx
 *.idb
+*.pch
 *.pyc
 *.pyo
 *.slb
 *.xMAP
 *.xSYM
 *Icon
+*_pch
 *~[0-9]
 .#*
 .DS_Store
@@ -18,5 +20,3 @@
 @*
 CVS
 [(]*[)]
-*.pch
-*_pch
diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include
index e579f01..46d277e 100644
--- a/Mac/Distributions/dev.include
+++ b/Mac/Distributions/dev.include
@@ -6,7 +6,6 @@
 (':ConfigurePythonClassic', None)
 (':Demo', None)
 (':Demo:embed', ':Demo:embed')
-(':Demo:extend', ':Demo:extend')
 (':Demo:pysvr', ':Demo:pysvr')
 (':Doc', None)
 (':EditPythonPrefs', None)
@@ -70,16 +69,10 @@
 (':Mac:Build:PythonInterpreter.mcp', None)
 (':Mac:Build:PythonInterpreter.old.mcp', None)
 (':Mac:Build:PythonStandSmall.mcp', None)
-(':Mac:Build:PythonStandSmall.mcp~0', None)
-(':Mac:Build:PythonStandSmall.mcp~1', None)
 (':Mac:Build:PythonStandSmall.old.mcp', None)
 (':Mac:Build:PythonStandalone.mcp', None)
-(':Mac:Build:PythonStandalone.mcp~0', None)
-(':Mac:Build:PythonStandalone.mcp~1', None)
 (':Mac:Build:Qt.carbon.mcp.exp', None)
-(':Mac:Build:Qt.carbon.mcp.xml~0', None)
 (':Mac:Build:Qt.mcp.exp', None)
-(':Mac:Build:Qt.mcp.xml~0', None)
 (':Mac:Build:Snd.carbon.mcp.exp', None)
 (':Mac:Build:Snd.carbon.mcp.xml', None)
 (':Mac:Build:Snd.mcp.exp', None)
@@ -98,6 +91,9 @@
 (':Mac:Build:_AE.mcp', None)
 (':Mac:Build:_AE.mcp.exp', None)
 (':Mac:Build:_AE.mcp.xml', None)
+(':Mac:Build:_AH.carbon.mcp', None)
+(':Mac:Build:_AH.carbon.mcp.exp', None)
+(':Mac:Build:_AH.carbon.mcp.xml', None)
 (':Mac:Build:_App.carbon.mcp', None)
 (':Mac:Build:_App.carbon.mcp.exp', None)
 (':Mac:Build:_App.carbon.mcp.xml', None)
@@ -149,9 +145,15 @@
 (':Mac:Build:_Fm.mcp', None)
 (':Mac:Build:_Fm.mcp.exp', None)
 (':Mac:Build:_Fm.mcp.xml', None)
+(':Mac:Build:_Help.carbon.mcp', None)
+(':Mac:Build:_Help.carbon.mcp.exp', None)
+(':Mac:Build:_Help.carbon.mcp.xml', None)
 (':Mac:Build:_Help.mcp', None)
 (':Mac:Build:_Help.mcp.exp', None)
 (':Mac:Build:_Help.mcp.xml', None)
+(':Mac:Build:_IBCarbon.carbon.mcp', None)
+(':Mac:Build:_IBCarbon.carbon.mcp.exp', None)
+(':Mac:Build:_IBCarbon.carbon.mcp.xml', None)
 (':Mac:Build:_Icn.carbon.mcp', None)
 (':Mac:Build:_Icn.carbon.mcp.exp', None)
 (':Mac:Build:_Icn.carbon.mcp.xml', None)
@@ -291,6 +293,9 @@
 (':Mac:Build:pyexpat.mcp', None)
 (':Mac:Build:pyexpat.mcp.exp', None)
 (':Mac:Build:pyexpat.mcp.xml', None)
+(':Mac:Build:pygusiconfig.carbon.lib', None)
+(':Mac:Build:pygusiconfig.smcarbon.lib', None)
+(':Mac:Build:temp_delete_me', None)
 (':Mac:Build:waste.carbon.mcp', None)
 (':Mac:Build:waste.carbon.mcp.exp', None)
 (':Mac:Build:waste.carbon.mcp.xml', None)
@@ -300,15 +305,9 @@
 (':Mac:Build:xx.carbon.mcp', '')
 (':Mac:Build:xx.carbon.mcp.exp', '')
 (':Mac:Build:xx.carbon.mcp.xml', '')
-(':Mac:Build:xx.mcp', '')
-(':Mac:Build:xx.mcp.exp', '')
-(':Mac:Build:xx.mcp.xml', None)
 (':Mac:Build:xxsubtype.carbon.mcp', None)
 (':Mac:Build:xxsubtype.carbon.mcp.exp', None)
 (':Mac:Build:xxsubtype.carbon.mcp.xml', None)
-(':Mac:Build:xxsubtype.mcp', None)
-(':Mac:Build:xxsubtype.mcp.exp', None)
-(':Mac:Build:xxsubtype.mcp.xml', None)
 (':Mac:Build:zlib.carbon.mcp', None)
 (':Mac:Build:zlib.carbon.mcp.exp', None)
 (':Mac:Build:zlib.carbon.mcp.xml', None)
@@ -372,6 +371,7 @@
 (':Mac:Lib', None)
 (':Mac:MPW', None)
 (':Mac:Modules', None)
+(':Mac:OSX', None)
 (':Mac:OSX:Makefile', None)
 (':Mac:OSX:README', None)
 (':Mac:OSX:README.macosx.txt', None)
@@ -394,6 +394,7 @@
 (':Mac:Resources:gusiprefs.rsrc', None)
 (':Mac:Resources:pythonpath.r', '')
 (':Mac:Resources:tkpython.rsrc', None)
+(':Mac:Resources:tkpython.rsrc-', None)
 (':Mac:Resources:version.r', None)
 (':Mac:TODO', None)
 (':Mac:Tools:BBPy', None)
@@ -415,6 +416,7 @@
 (':Mac:mwerks:mwerks_carbonNOGUSI_config.h', None)
 (':Mac:mwerks:mwerks_nscarbon_config.h', '')
 (':Mac:mwerks:mwerks_shcarbon_config.h', '')
+(':Mac:mwerks:mwerks_smcarbon_config.h', '')
 (':Mac:mwerks:mwerks_thrcarbonsm_config.h', None)
 (':Mac:mwerks:mwerks_threadsmall_config.h', '')
 (':Mac:mwerks:mwerks_tkplugin_config.h', ':Mac:mwerks:')
@@ -440,6 +442,7 @@
 (':Modules:_hotshot.c', None)
 (':Modules:_localemodule.c', None)
 (':Modules:_sre.c', None)
+(':Modules:_ssl.c', None)
 (':Modules:_testcapimodule.c', None)
 (':Modules:_tkinter.c', None)
 (':Modules:_weakref.c', None)
@@ -466,6 +469,7 @@
 (':Modules:dbmmodule.c', None)
 (':Modules:dlmodule.c', None)
 (':Modules:errnomodule.c', None)
+(':Modules:expat', None)
 (':Modules:fcntlmodule.c', None)
 (':Modules:flmodule.c', None)
 (':Modules:fmmodule.c', None)
@@ -518,6 +522,7 @@
 (':Modules:shamodule.c', None)
 (':Modules:signalmodule.c', None)
 (':Modules:socketmodule.c', None)
+(':Modules:socketmodule.h', None)
 (':Modules:soundex.c', None)
 (':Modules:sre.h', None)
 (':Modules:sre_constants.h', None)
@@ -582,6 +587,7 @@
 (':Tools:bgen', '')
 (':Tools:compiler', None)
 (':Tools:faqwiz', None)
+(':Tools:framer', None)
 (':Tools:freeze', '')
 (':Tools:i18n', None)
 (':Tools:idle', None)
@@ -605,24 +611,21 @@
 (':readmefiles', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Mac:Build:_IBCarbon.carbon.mcp.xml', None)
-(':Mac:Build:_IBCarbon.carbon.mcp.exp', None)
-(':Mac:Build:_IBCarbon.carbon.mcp', None)
-(':Mac:Build:_Help.carbon.mcp.xml', None)
-(':Mac:Build:_Help.carbon.mcp.exp', None)
-(':Mac:Build:_Help.carbon.mcp', None)
-(':Mac:Build:_AH.carbon.mcp.xml', None)
-(':Mac:Build:_AH.carbon.mcp.exp', None)
-(':Mac:Build:_AH.carbon.mcp', None)
-(':Mac:Build:temp_delete_me', None)
-(':Mac:Build:pygusiconfig.smcarbon.lib', None)
-(':Mac:Build:pygusiconfig.carbon.lib', None)
-(':Mac:mwerks:mwerks_carbonpyexpat_config.h', '')
-(':Mac:mwerks:mwerks_pyexpat_config.h', '')
-(':Mac:mwerks:mwerks_smcarbon_config.h', '')
-(':Mac:OSX', None)
-(':Modules:_ssl.c', None)
-(':Modules:socketmodule.h', None)
-(':Mac:Resources:tkpython.rsrc-', None)
-(':Modules:expat', None)
-(':Tools:framer', None)
+(':Mac:Build:_Folder.carbon.mcp.xml', None)
+(':Mac:Build:_Folder.carbon.mcp.exp', None)
+(':Mac:Build:_Folder.carbon.mcp', None)
+(':Mac:Build:_File.carbon.mcp.xml', None)
+(':Mac:Build:_File.carbon.mcp.exp', None)
+(':Mac:Build:_File.carbon.mcp', None)
+(':Mac:Build:_Alias.carbon.mcp.xml', None)
+(':Mac:Build:_Alias.carbon.mcp.exp', None)
+(':Mac:Build:_Alias.carbon.mcp', None)
+(':Modules:zipimport.c', None)
+(':Modules:ossaudiodev.c', None)
+(':Modules:datetimemodule.c', None)
+(':Modules:bz2module.c', None)
+(':Modules:_randommodule.c', None)
+(':Modules:_bsddb.c', None)
+(':Mac:Build:datetime.carbon.mcp.xml', None)
+(':Mac:Build:datetime.carbon.mcp.exp', None)
+(':Mac:Build:datetime.carbon.mcp', None)
diff --git a/Mac/Distributions/readme.txt b/Mac/Distributions/readme.txt
index 0593ee6..5ae41ce 100644
--- a/Mac/Distributions/readme.txt
+++ b/Mac/Distributions/readme.txt
@@ -2,18 +2,17 @@ How to make a Python-distribution.
 ----------------------------------
 
 These notes are mainly for myself, or for whoever tries to make a MacPython
-distribution when I'm fed up with it. They were last updated for 2.2b1.
+distribution when I'm fed up with it. They were last updated for 2.3a1.
 
 - Increase fragment version number in PythonCore and PythonCoreCarbon.
   the fragment number is Python's sys.hexversion, it should be set in the
   "PEF" preferences.
 - Increase version number in _versioncheck.py
 - Build PythonStandSmall, run once in root folder
-- Update Relnotes, readme's, Demo:build.html
-- Make sure tkresources.rsrc is up-to-date
+- Update NEWS, readme's, Demo:build.html
 - fullbuild everything with increase-buildno
-- Test both classic and Carbon with test.regrtest
-- Update Numeric and build/install it both with Classic and with Carbon python
+- Test with test.regrtest
+- Update Numeric and build/install it
 - Recompile OSAm and possibly other Contrib stuff
 - mkdistr binary.include
 - mkdistr dev.include
@@ -33,8 +32,7 @@ distribution when I'm fed up with it. They were last updated for 2.2b1.
   Only the :Lib:plat-xxxx should be missing. Otherwise go back to Installer Vise and
   add the missing stuff. Make sure of all settings for the new files (esp. "where"
   and "gestalt" are easy to miss).
-- test on virgin systems (OSX, OS9, OS8 without Carbon). Make sure to test
-  tkinter too.
+- test on virgin systems (both OS9 and OSX). 
 - Remove the local installation so you don't get confused by it.
 - checkin everything except PythonX.Y.vct.
 - mkdistr src.include
diff --git a/Mac/Distributions/src.exclude b/Mac/Distributions/src.exclude
index aa188a8..e63e55e 100644
--- a/Mac/Distributions/src.exclude
+++ b/Mac/Distributions/src.exclude
@@ -8,6 +8,7 @@
 *.in
 *.lib
 *.pyc
+*.pyo
 *.slb
 *.xMAP
 *.xSYM
@@ -19,4 +20,3 @@ CVS
 Makefile.pre.in
 PyIDE-src
 [(]*[)]
-*.pyo
diff --git a/Mac/Distributions/src.include b/Mac/Distributions/src.include
index aa25223..ec735c7 100644
--- a/Mac/Distributions/src.include
+++ b/Mac/Distributions/src.include
@@ -1,3 +1,4 @@
+(':.DS_Store', None)
 (':BeOS', None)
 (':BuildApplet', None)
 (':BuildApplication', None)
@@ -11,12 +12,7 @@
 (':Extensions:Imaging', None)
 (':Extensions:Pmw', None)
 (':Extensions:PyDOM', None)
-(':Extensions:README', '')
-(':Extensions:README.TOO', '')
 (':Extensions:audio', None)
-(':Extensions:example', '')
-(':Extensions:example2', '')
-(':Extensions:example3', '')
 (':Extensions:img', '')
 (':Extensions:midi', None)
 (':Extensions:pyexpat', None)
@@ -29,6 +25,7 @@
 (':Include', '')
 (':LICENSE', '')
 (':Lib', '')
+(':Mac:.DS_Store', None)
 (':Mac:Build', '')
 (':Mac:Build:PythonAppletCFM68K', None)
 (':Mac:Build:PythonAppletPPC', None)
@@ -41,6 +38,7 @@
 (':Mac:Compat', '')
 (':Mac:Contrib', '')
 (':Mac:Demo', '')
+(':Mac:Distributions:(vise)', None)
 (':Mac:Distributions:68k-shared.exclude', None)
 (':Mac:Distributions:68k-shared.include', None)
 (':Mac:Distributions:68k-stand.exclude', None)
@@ -67,7 +65,6 @@
 (':Mac:ReadMe', '')
 (':Mac:ReadMe-dev', None)
 (':Mac:ReadMe-src', ':ReadMe-src')
-(':Mac:Relnotes', ':Relnotes:')
 (':Mac:Resources', '')
 (':Mac:TODO', None)
 (':Mac:Tools:CGI', '')
@@ -77,20 +74,17 @@
 (':Mac:Tools:PyIDE', None)
 (':Mac:Tools:bruce', None)
 (':Mac:Tools:macfreeze', '')
-(':Mac:Unsupported', '')
 (':Mac:Wastemods', '')
 (':Mac:_checkversion.py', None)
 (':Mac:mwerks', '')
 (':Mac:mwerks:old', None)
 (':Mac:mwerks:projects', None)
 (':Mac:scripts', '')
-(':Mac:tclmods', '')
 (':Misc', '')
 (':Modules', '')
 (':Objects', '')
 (':PC', None)
 (':PCbuild', None)
-(':PLAN.txt', '')
 (':Parser', '')
 (':PlugIns', None)
 (':Python', '')
@@ -141,4 +135,4 @@
 (':pystone.py', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Mac:Distributions:(vise)', None)
+(':Tools:framer', '')