[Python-checkins] python/dist/src/Mac/Distributions binary.include,1.22,1.23 dev.exclude,1.10,1.11 dev.include,1.27,1.28 readme.txt,1.8,1.9 src.exclude,1.7,1.8 src.include,1.7,1.8

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Wed, 08 Jan 2003 08:28:11 -0800


Update of /cvsroot/python/python/dist/src/Mac/Distributions
In directory sc8-pr-cvs1:/tmp/cvs-serv27782/Mac/Distributions

Modified Files:
	binary.include dev.exclude dev.include readme.txt src.exclude 
	src.include 
Log Message:
Merging the various tweaks for MacPython-OS9 2.3a1 back into the trunk.


Index: binary.include
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/binary.include,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** binary.include	6 Sep 2002 23:33:50 -0000	1.22
--- binary.include	8 Jan 2003 16:27:38 -0000	1.23
***************
*** 3,6 ****
--- 3,7 ----
  (':BuildApplet', None)
  (':BuildApplication', None)
+ (':ConfigurePython', '')
  (':Demo', '')
  (':Demo:cwilib', None)
***************
*** 112,116 ****
  (':Mac:Contrib:PythonDetector:PythonDetector', '')
  (':Mac:Contrib:PythonDetector:readme.txt', '')
- (':Mac:Contrib:PythonScript', '')
  (':Mac:Contrib:Sherlock', '')
  (':Mac:Contrib:Tabcleaner', '')
--- 113,116 ----
***************
*** 139,143 ****
  (':Mac:ReadMe~0', None)
  (':Mac:ReadmeSource', None)
- (':Mac:Relnotes', ':Relnotes:')
  (':Mac:Resources', None)
  (':Mac:TODO', None)
--- 139,142 ----
***************
*** 169,172 ****
--- 168,172 ----
  (':PythonCarbonStandalone', None)
  (':PythonCoreCarbon', '')
+ (':PythonInterpreter', '')
  (':PythonStandCarbon', None)
  (':PythonStandSmall', None)
***************
*** 206,209 ****
  (':setup.py', None)
  (':site-packages', None)
- (':ConfigurePython', '')
- (':PythonInterpreter', '')
--- 206,207 ----

Index: dev.exclude
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/dev.exclude,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dev.exclude	6 Sep 2002 23:33:54 -0000	1.10
--- dev.exclude	8 Jan 2003 16:27:38 -0000	1.11
***************
*** 6,9 ****
--- 6,10 ----
  *.hqx
  *.idb
+ *.pch
  *.pyc
  *.pyo
***************
*** 12,15 ****
--- 13,17 ----
  *.xSYM
  *Icon
+ *_pch
  *~[0-9]
  .#*
***************
*** 19,22 ****
  CVS
  [(]*[)]
- *.pch
- *_pch
--- 21,22 ----

Index: dev.include
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/dev.include,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** dev.include	6 Sep 2002 23:34:00 -0000	1.27
--- dev.include	8 Jan 2003 16:27:38 -0000	1.28
***************
*** 7,11 ****
  (':Demo', None)
  (':Demo:embed', ':Demo:embed')
- (':Demo:extend', ':Demo:extend')
  (':Demo:pysvr', ':Demo:pysvr')
  (':Doc', None)
--- 7,10 ----
***************
*** 71,84 ****
  (':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)
--- 70,77 ----
***************
*** 99,102 ****
--- 92,98 ----
  (':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)
***************
*** 150,156 ****
--- 146,158 ----
  (':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)
***************
*** 292,295 ****
--- 294,300 ----
  (':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)
***************
*** 301,313 ****
  (':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)
--- 306,312 ----
***************
*** 373,376 ****
--- 372,376 ----
  (':Mac:MPW', None)
  (':Mac:Modules', None)
+ (':Mac:OSX', None)
  (':Mac:OSX:Makefile', None)
  (':Mac:OSX:README', None)
***************
*** 395,398 ****
--- 395,399 ----
  (':Mac:Resources:pythonpath.r', '')
  (':Mac:Resources:tkpython.rsrc', None)
+ (':Mac:Resources:tkpython.rsrc-', None)
  (':Mac:Resources:version.r', None)
  (':Mac:TODO', None)
***************
*** 416,419 ****
--- 417,421 ----
  (':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', '')
***************
*** 441,444 ****
--- 443,447 ----
  (':Modules:_localemodule.c', None)
  (':Modules:_sre.c', None)
+ (':Modules:_ssl.c', None)
  (':Modules:_testcapimodule.c', None)
  (':Modules:_tkinter.c', None)
***************
*** 467,470 ****
--- 470,474 ----
  (':Modules:dlmodule.c', None)
  (':Modules:errnomodule.c', None)
+ (':Modules:expat', None)
  (':Modules:fcntlmodule.c', None)
  (':Modules:flmodule.c', None)
***************
*** 519,522 ****
--- 523,527 ----
  (':Modules:signalmodule.c', None)
  (':Modules:socketmodule.c', None)
+ (':Modules:socketmodule.h', None)
  (':Modules:soundex.c', None)
  (':Modules:sre.h', None)
***************
*** 583,586 ****
--- 588,592 ----
  (':Tools:compiler', None)
  (':Tools:faqwiz', None)
+ (':Tools:framer', None)
  (':Tools:freeze', '')
  (':Tools:i18n', None)
***************
*** 606,628 ****
  (':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)
--- 612,631 ----
  (':setup.py', None)
  (':site-packages', 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)

Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/readme.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** readme.txt	22 May 2002 14:30:37 -0000	1.8
--- readme.txt	8 Jan 2003 16:27:38 -0000	1.9
***************
*** 3,7 ****
  
  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.
  
  - Increase fragment version number in PythonCore and PythonCoreCarbon.
--- 3,7 ----
  
  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.3a1.
  
  - Increase fragment version number in PythonCore and PythonCoreCarbon.
***************
*** 10,18 ****
  - 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
  - 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
  - Recompile OSAm and possibly other Contrib stuff
  - mkdistr binary.include
--- 10,17 ----
  - Increase version number in _versioncheck.py
  - Build PythonStandSmall, run once in root folder
! - Update NEWS, readme's, Demo:build.html
  - fullbuild everything with increase-buildno
! - Test with test.regrtest
! - Update Numeric and build/install it
  - Recompile OSAm and possibly other Contrib stuff
  - mkdistr binary.include
***************
*** 34,39 ****
    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.
  - Remove the local installation so you don't get confused by it.
  - checkin everything except PythonX.Y.vct.
--- 33,37 ----
    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 (both OS9 and OSX). 
  - Remove the local installation so you don't get confused by it.
  - checkin everything except PythonX.Y.vct.

Index: src.exclude
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/src.exclude,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** src.exclude	30 Oct 2001 22:41:39 -0000	1.7
--- src.exclude	8 Jan 2003 16:27:38 -0000	1.8
***************
*** 9,12 ****
--- 9,13 ----
  *.lib
  *.pyc
+ *.pyo
  *.slb
  *.xMAP
***************
*** 20,22 ****
  PyIDE-src
  [(]*[)]
- *.pyo
--- 21,22 ----

Index: src.include
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Distributions/src.include,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** src.include	30 Oct 2001 22:41:43 -0000	1.7
--- src.include	8 Jan 2003 16:27:38 -0000	1.8
***************
*** 1,2 ****
--- 1,3 ----
+ (':.DS_Store', None)
  (':BeOS', None)
  (':BuildApplet', None)
***************
*** 12,21 ****
  (':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)
--- 13,17 ----
***************
*** 30,33 ****
--- 26,30 ----
  (':LICENSE', '')
  (':Lib', '')
+ (':Mac:.DS_Store', None)
  (':Mac:Build', '')
  (':Mac:Build:PythonAppletCFM68K', None)
***************
*** 42,45 ****
--- 39,43 ----
  (':Mac:Contrib', '')
  (':Mac:Demo', '')
+ (':Mac:Distributions:(vise)', None)
  (':Mac:Distributions:68k-shared.exclude', None)
  (':Mac:Distributions:68k-shared.include', None)
***************
*** 68,72 ****
  (':Mac:ReadMe-dev', None)
  (':Mac:ReadMe-src', ':ReadMe-src')
- (':Mac:Relnotes', ':Relnotes:')
  (':Mac:Resources', '')
  (':Mac:TODO', None)
--- 66,69 ----
***************
*** 78,82 ****
  (':Mac:Tools:bruce', None)
  (':Mac:Tools:macfreeze', '')
- (':Mac:Unsupported', '')
  (':Mac:Wastemods', '')
  (':Mac:_checkversion.py', None)
--- 75,78 ----
***************
*** 85,89 ****
  (':Mac:mwerks:projects', None)
  (':Mac:scripts', '')
- (':Mac:tclmods', '')
  (':Misc', '')
  (':Modules', '')
--- 81,84 ----
***************
*** 91,95 ****
  (':PC', None)
  (':PCbuild', None)
- (':PLAN.txt', '')
  (':Parser', '')
  (':PlugIns', None)
--- 86,89 ----
***************
*** 142,144 ****
  (':setup.py', None)
  (':site-packages', None)
! (':Mac:Distributions:(vise)', None)
--- 136,138 ----
  (':setup.py', None)
  (':site-packages', None)
! (':Tools:framer', '')