diff --git a/Mac/Build/App.prj b/Mac/Build/App.prj index 6b8436c535a..d94d83d0fb0 100644 Binary files a/Mac/Build/App.prj and b/Mac/Build/App.prj differ diff --git a/Mac/Build/Cm.prj b/Mac/Build/Cm.prj index 79dab7ff5e8..583d9a6f542 100644 Binary files a/Mac/Build/Cm.prj and b/Mac/Build/Cm.prj differ diff --git a/Mac/Build/ColorPicker.prj b/Mac/Build/ColorPicker.prj index 2b1b60dbc24..d6bb75d43e9 100644 Binary files a/Mac/Build/ColorPicker.prj and b/Mac/Build/ColorPicker.prj differ diff --git a/Mac/Build/Drag.prj b/Mac/Build/Drag.prj index 5fbc6b2605a..64e9cca5ea5 100644 Binary files a/Mac/Build/Drag.prj and b/Mac/Build/Drag.prj differ diff --git a/Mac/Build/Fm.prj b/Mac/Build/Fm.prj index a0ff95fc244..2436aab47a7 100644 Binary files a/Mac/Build/Fm.prj and b/Mac/Build/Fm.prj differ diff --git a/Mac/Build/Help.prj b/Mac/Build/Help.prj index e74d92153f9..bfa48a3e44b 100644 Binary files a/Mac/Build/Help.prj and b/Mac/Build/Help.prj differ diff --git a/Mac/Build/Icn.prj b/Mac/Build/Icn.prj index 5025eeae577..77e76a2ac20 100644 Binary files a/Mac/Build/Icn.prj and b/Mac/Build/Icn.prj differ diff --git a/Mac/Build/List.prj b/Mac/Build/List.prj index 4c9490304d0..efe8520bf8c 100644 Binary files a/Mac/Build/List.prj and b/Mac/Build/List.prj differ diff --git a/Mac/Build/Printing.prj b/Mac/Build/Printing.prj index f930f5b454d..4ccd1565067 100644 Binary files a/Mac/Build/Printing.prj and b/Mac/Build/Printing.prj differ diff --git a/Mac/Build/PythonCore.prj b/Mac/Build/PythonCore.prj index 00dc7999c82..f1c05e5065b 100644 Binary files a/Mac/Build/PythonCore.prj and b/Mac/Build/PythonCore.prj differ diff --git a/Mac/Build/PythonCorePPC.prj b/Mac/Build/PythonCorePPC.prj index bc5873ba09b..95f2882b6e1 100644 Binary files a/Mac/Build/PythonCorePPC.prj and b/Mac/Build/PythonCorePPC.prj differ diff --git a/Mac/Build/PythonInterpreter.prj b/Mac/Build/PythonInterpreter.prj index 54558e0c2cf..f7e4b2e0464 100644 Binary files a/Mac/Build/PythonInterpreter.prj and b/Mac/Build/PythonInterpreter.prj differ diff --git a/Mac/Build/PythonStandSmall.prj b/Mac/Build/PythonStandSmall.prj index b73b0dbd264..d93f32013b7 100644 Binary files a/Mac/Build/PythonStandSmall.prj and b/Mac/Build/PythonStandSmall.prj differ diff --git a/Mac/Build/Qdoffs.prj b/Mac/Build/Qdoffs.prj index a50923cc52f..5f436eda87e 100644 Binary files a/Mac/Build/Qdoffs.prj and b/Mac/Build/Qdoffs.prj differ diff --git a/Mac/Build/Qt.prj b/Mac/Build/Qt.prj index 1047db8ffab..348501beaa7 100644 Binary files a/Mac/Build/Qt.prj and b/Mac/Build/Qt.prj differ diff --git a/Mac/Build/Scrap.prj b/Mac/Build/Scrap.prj index 6fd322c87b6..23316cda4e4 100644 Binary files a/Mac/Build/Scrap.prj and b/Mac/Build/Scrap.prj differ diff --git a/Mac/Build/Snd.prj b/Mac/Build/Snd.prj index 50d1cd65c83..781af7eff4c 100644 Binary files a/Mac/Build/Snd.prj and b/Mac/Build/Snd.prj differ diff --git a/Mac/Build/Sndihooks.prj b/Mac/Build/Sndihooks.prj index 4209ff07d4b..245df2b8883 100644 Binary files a/Mac/Build/Sndihooks.prj and b/Mac/Build/Sndihooks.prj differ diff --git a/Mac/Build/TE.prj b/Mac/Build/TE.prj index 100f262b3fd..48afbdaf3d9 100644 Binary files a/Mac/Build/TE.prj and b/Mac/Build/TE.prj differ diff --git a/Mac/Build/calldll.ppc.prj b/Mac/Build/calldll.ppc.prj index 429407e8b58..3a8bc4a8db2 100644 Binary files a/Mac/Build/calldll.ppc.prj and b/Mac/Build/calldll.ppc.prj differ diff --git a/Mac/Build/ctb.prj b/Mac/Build/ctb.prj index 416e0f3c13d..f09b10c8d5d 100644 Binary files a/Mac/Build/ctb.prj and b/Mac/Build/ctb.prj differ diff --git a/Mac/Build/gdbm.prj b/Mac/Build/gdbm.prj index 0e9b39d7817..a9c98db38ca 100644 Binary files a/Mac/Build/gdbm.prj and b/Mac/Build/gdbm.prj differ diff --git a/Mac/Build/icglue.prj b/Mac/Build/icglue.prj index fe7c526c5c5..5ab8f68687e 100644 Binary files a/Mac/Build/icglue.prj and b/Mac/Build/icglue.prj differ diff --git a/Mac/Build/macspeech.prj b/Mac/Build/macspeech.prj index 2c976235f86..531f68dc422 100644 Binary files a/Mac/Build/macspeech.prj and b/Mac/Build/macspeech.prj differ diff --git a/Mac/Build/pyexpat.prj b/Mac/Build/pyexpat.prj index bfde572efbc..04d832517ca 100644 Binary files a/Mac/Build/pyexpat.prj and b/Mac/Build/pyexpat.prj differ diff --git a/Mac/Build/ucnhash.prj b/Mac/Build/ucnhash.prj index b2b1a5eadee..ab73867ba6f 100644 Binary files a/Mac/Build/ucnhash.prj and b/Mac/Build/ucnhash.prj differ diff --git a/Mac/Build/waste.prj b/Mac/Build/waste.prj index 658b6eea1fc..2df5e8601f8 100644 Binary files a/Mac/Build/waste.prj and b/Mac/Build/waste.prj differ diff --git a/Mac/Build/zlib.prj b/Mac/Build/zlib.prj index 9dc408892fa..145a6be5a82 100644 Binary files a/Mac/Build/zlib.prj and b/Mac/Build/zlib.prj differ diff --git a/Mac/Distributions/(vise)/Python 2.0.vct b/Mac/Distributions/(vise)/Python 2.0.vct index 085042efb44..6acd9294479 100644 Binary files a/Mac/Distributions/(vise)/Python 2.0.vct and b/Mac/Distributions/(vise)/Python 2.0.vct differ diff --git a/Mac/Distributions/src.exclude b/Mac/Distributions/src.exclude index 09723fcc37f..e87fbf766fb 100644 --- a/Mac/Distributions/src.exclude +++ b/Mac/Distributions/src.exclude @@ -6,10 +6,14 @@ *.hqx *.idb *.in +*.lib *.pyc *.slb *.xMAP *.xSYM +.#* +.cvsignore +@* CVS Makefile.pre.in PyIDE-src diff --git a/Mac/Distributions/src.include b/Mac/Distributions/src.include index 6b271f40d57..61a0221ba31 100644 --- a/Mac/Distributions/src.include +++ b/Mac/Distributions/src.include @@ -23,6 +23,7 @@ (':Grammar:Makefile', None) (':Icon\015', None) (':Include', '') +(':LICENSE', '') (':Lib', '') (':Mac:Build', '') (':Mac:Build:PythonAppletCFM68K', None) @@ -36,14 +37,25 @@ (':Mac:Compat', '') (':Mac:Contrib', '') (':Mac:Demo', '') -(':Mac:Distributions', None) -(':Mac:GUSI-mods', '') +(':Mac:Distributions:68k-shared.exclude', None) +(':Mac:Distributions:68k-shared.include', None) +(':Mac:Distributions:68k-stand.exclude', None) +(':Mac:Distributions:68k-stand.include', None) +(':Mac:Distributions:binary.exclude', '') +(':Mac:Distributions:binary.include', '') +(':Mac:Distributions:dev.exclude', '') +(':Mac:Distributions:dev.include', '') +(':Mac:Distributions:readme.txt', '') +(':Mac:Distributions:src.exclude', '') +(':Mac:Distributions:src.include', '') (':Mac:HISTORY', ':Relnotes:') +(':Mac:IDE scripts', '') (':Mac:Icon\015', None) (':Mac:Include', '') (':Mac:Lib', '') (':Mac:MPW', '') (':Mac:Modules', '') +(':Mac:PlugIns:readme.txt', '') (':Mac:Python', '') (':Mac:ReadMe', '') (':Mac:ReadMe-dev', None) @@ -51,30 +63,20 @@ (':Mac:Relnotes', ':Relnotes:') (':Mac:Resources', '') (':Mac:TODO', None) +(':Mac:Tools:CGI', '') +(':Mac:Tools:CGI:BuildCGIApplet', None) (':Mac:Tools:IDE', None) (':Mac:Tools:Icon\015', None) (':Mac:Tools:PyIDE', None) (':Mac:Tools:bruce', None) (':Mac:Tools:macfreeze', '') -(':Mac:Tools:twit', '') (':Mac:Unsupported', '') (':Mac:_checkversion.py', None) -(':Mac:mwerks:Icon\015', None) -(':Mac:mwerks:errno_unix.h', '') -(':Mac:mwerks:macuseshlstart.c', '') -(':Mac:mwerks:malloc', '') -(':Mac:mwerks:mwerks_applet_config.h', '') -(':Mac:mwerks:mwerks_nonshared_config.h', '') -(':Mac:mwerks:mwerks_plugin_config.h', '') -(':Mac:mwerks:mwerks_shared_config.h', '') -(':Mac:mwerks:mwerks_small_config.h', '') -(':Mac:mwerks:mwerks_tkplugin_config.h', '') -(':Mac:mwerks:mwfopenrf.c', '') +(':Mac:mwerks', '') (':Mac:mwerks:old', None) (':Mac:mwerks:projects', None) (':Mac:scripts', '') (':Mac:tclmods', '') -(':Mac:think', '') (':Misc', '') (':Modules', '') (':Objects', '') @@ -90,14 +92,20 @@ (':PythonFAT', None) (':PythonInterpreter', None) (':PythonPPC', None) +(':PythonStandCarbon', None) (':PythonStandSmall', None) +(':PythonStandSmallShGUSI', None) +(':PythonStandSmallThreading', None) +(':PythonStandalone', None) (':README', '') (':Tools:Icon\015', None) (':Tools:README', '') (':Tools:audiopy', '') (':Tools:bgen', '') +(':Tools:compiler', '') (':Tools:faqwiz', '') (':Tools:freeze', '') +(':Tools:i18n', '') (':Tools:idle', '') (':Tools:modulator', '') (':Tools:pynche', '') @@ -116,3 +124,6 @@ (':mkapplet', None) (':pystone.py', None) (':site-packages', None) +(':Mac:Distributions:gusi2.include', None) +(':Mac:Distributions:gusi2.exclude', None) +(':Tools:unicode:makeunicodedata.py', '') diff --git a/Mac/Include/macbuildno.h b/Mac/Include/macbuildno.h index f1bf41a5a6f..3b11c1faa97 100644 --- a/Mac/Include/macbuildno.h +++ b/Mac/Include/macbuildno.h @@ -1 +1 @@ -#define BUILD 66 +#define BUILD 71 diff --git a/Mac/_checkversion.py b/Mac/_checkversion.py index a7ce8efff79..22ffc020a53 100644 --- a/Mac/_checkversion.py +++ b/Mac/_checkversion.py @@ -5,7 +5,7 @@ import pyversioncheck _PACKAGE="MacPython" -_VERSION="2.0b1" +_VERSION="2.0" _URL="http://www.cwi.nl/~jack/macpythonversion.txt" try: