Files for 2.1b1 distribution.

2 files changed, 34 insertions, 40 deletions

diff --git a/Mac/ReadMe b/Mac/ReadMe
index dd69df3..d4c9588 100644
--- a/Mac/ReadMe
+++ b/Mac/ReadMe
@@ -1,18 +1,11 @@
-How to install Python 2.1a3 on your Macintosh
+How to install Python 2.1b1 on your Macintosh
 ---------------------------------------------
 
-Note that this is really an alpha: it is only lightly tested and contains a lot
-of new code. Moreover, this release is Carbon only, so it will run on MacOS 8.1
-or later and MacOS X. The next alpha will again run in "classic MacOS" (8.0 or
-later). For MacOS 8.1 through 8.6 you will have to install CarbonLib (version 1.0.4
-or later) yourself from the Apple website.
-
-I'm hoping for a fairly quick alpha cycle, with about 3 distributions in quick
-succession, so please give feedback (to pythonmac-sig@python.org) as soon as
-possible. You should definitely include the full version number of you MacOS
-and the full version string of your MacPython.
-
-Whether PIL, Tk and Numeric work in this release is a complete guess.
+This is the first beta for a MacPython that can run on classic MacOS (from 8.1
+onwards) and natively on MacOSX. The installer tries to work out whether you can
+use the Carbon version or not. This is also the first MacPython distribution
+to be packaged as an active installer, which only downloads the parts you actually
+need. Let me hear about problems in these areas.
 
 You should definitely read the Relnotes file too.
 
@@ -31,45 +24,38 @@ now. The documentation is in HTML format, start with index.html.
 
 Caveats
 -------
-This is a final candidate version, so use with caution, and please report
-problems as soon as possible, to pythonmac-sig@python.org.
-
 Aside from the general new Python 2.1 features compared to 2.0 the main
 feature of this release is Carbon support.
 
-This installer installs MacPython for Carbon only. If you have a machine
-running 8.5 or earlier you should wait for the next alfa and sitck with 2.0.
-If you want
-68k support you will have to stay with 1.5.2.
+This installer installs MacPython for classic PPC MacOS, MacPython for Carbon
+(OS X, OS 9 or OS8 with CarbonLib installed) or both, depending on your
+configuration. By selecting custom install you can bypass these tests and
+install what you want.
 
-This version of Python expects a recent version of Appearance, so it may
-be that users with pre MacOS 8.5 systems have trouble running it. If
-that is the case try getting CarbonLib from Apple, I am told this
-includes Appearance and NavServices. You may also have to disable the
-"Use navservices" preference for best results.
+If you want 68k support you will have to stay with 1.5.2.
 
 What to install
 ---------------
 
-This installer is PPC only: too many new MacOS features are not
-available on 68K, and doing workarounds, even just #ifdeffing in the
-code, is too much work for me right now. If someone wants to revive
-68K-MacPython: please do so.
-
 The optional parts in this distribution are
 - TK+PIL: Tkinter and support modules, plus Imaging, the Python image manipulation 
   package (allows you to read, write and display images and do lots of operations on them).
+  For Carbon MacPython you only get PIL: there is no Tcl/Tk for Carbon yet.
 - img: another imaging package. Has more file format support and is faster
   than imaging, but has only limited operations on images. There is a bridge
   between the packages.
 - Numeric: the LLNL Numeric Python extension. All sorts of nifty operations
   on matrices and such. This is the most recent version from the sourceforge archive.
+  Numeric has moved from Extensions to :Lib:site-python, by the way, see the release
+  notes.
 - Developers kit: all header files and some tools and sample projects to get you started on
   writing Python extensions if you have CodeWarrior.
 All these except the DevKit are installed with Easy Install.
 
-After the installer finishes it automatically launches the
-ConfigurePython applet, to finish configuration of your Python.
+After the installer finishes it automatically launches the appropriate
+ConfigurePython applet, to finish configuration of your Python. If you run MacOS9
+(or 8 with CarbonLib installed) you can switch back and forth between the classic and
+Carbon versions of Python by running either ConfigurePythonClassic or ConfigurePythonCarbon.
 
 Moving your Python installation after installing is generally not a good idea.
 If you have to do this anyway you should remove your preference file, run
@@ -88,10 +74,11 @@ After installing
 It is probably a good idea to run the automatic tests. Start
 Python and "import test.autotest". 
 
-Three tests will fail on MacOS9, all with MemoryErrors: test_gzip, test_sha,
+Three tests will fail on MacOS9, all with MemoryErrors: test_sha,
 test_longexp and test_zlib (on MacOSX nothing should fail).
 If you increase the PythonInterpreter memory
-partition size they will pass. It will, however, print some messages
+partition size they will pass (but for longexp you have to increas it by an
+incredible amount). It will, however, print some messages
 about optional features not supported. You should not worry about these,
 they are modules that are supported by Python on other platforms. Also,
 if you didn't run compileall before autotesting you may run out of
@@ -112,7 +99,7 @@ Uninstalling
 
 Two items are installed in the system folder: the interpreter shared
 libraries PythonCore and PythonCoreCarbon lives in the Extensions folder and the
-"Python 2.1a3 Preferences" file in the Python subfolder in the
+"Python 2.1b1 Preferences" file in the Python subfolder in the
 Preferences folder. All the rest of Python lives in the folder you
 installed in.
 
diff --git a/Mac/Relnotes b/Mac/Relnotes
index 1047fdd..c4831ca 100644
--- a/Mac/Relnotes
+++ b/Mac/Relnotes
@@ -1,15 +1,15 @@
-Changes in 2.1a3 since 2.0
+Changes in 2.1b1 since 2.0
 --------------------------
 
 These release notes refer to Mac-specific changes only. See NEWS (in the Misc folder)
 for machine-independent changes. Changes since previous alfa/beta releases for 2.1 are
-marked with [*] and at the bottom of the list. Note that 2.1a3 is a Mac-only release.
-The machine-independent stuff is at a state somewhere between 2.1a2 and 2.1b1.
+marked with [*] and at the bottom of the list.
 
 - The good news: this release is Carbon-based, so it runs natively on MacOS 8.6 or
   later and MacOSX.
-- The bad news: this release is Carbon-only. The next alpha release will be both
-  Carbon and classic PPC.
+- Alternatively there is a classic PPC interpreter as well. There are two reasons you
+  might want to use this: (a) you have a pre-MacOS9 system and don't want to install
+  CarbonLib, or (b) you need Tkinter, for which no Carbon version is available yet.
 - Distutils is included and seems to work.
 - There's a new module (package, actually) mkcwproject which builds CodeWarrior
   projects from simple templates. See Distutils or :Mac:scripts:genpluginprojects.py
@@ -60,6 +60,13 @@ The machine-independent stuff is at a state somewhere between 2.1a2 and 2.1b1.
   favor of re. Code not fully tested. [*]
 - IDE could crash on some edit operations due to WEGetUndoInfo(). Fixed. [*]
 - time.time() again returns positive values. [*]
+- Classic PPC is included again. [*]
+- Numeric is included again. It is now built using distutils, and lives in :Lib:site-python.
+  This makes it a lot easier to replace Numeric with a new version (when one comes out). [*]
+- PIL is included again. [*]
+- PythonInterpreterCarbon and PythonInterpreterClassic are now files of type "Atmp", not
+  "APPL", so there should not be any confusion as to what the real application is
+  (PythonInterpreter). [*]
 
 
 What is not in this distribution