diff --git a/Mac/Demo/PICTbrowse/PICTbrowse.rsrc.hqx b/Mac/Demo/PICTbrowse/PICTbrowse.rsrc.hqx
index bdf3c778330..4357bbdd92f 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse.rsrc.hqx
+++ b/Mac/Demo/PICTbrowse/PICTbrowse.rsrc.hqx
@@ -2,10 +2,10 @@
:$e"*3e4LFQphFf8ZFR0bB`"bFh*M8P0&4!#3#!'8,V!!N!3"!!!!!6m!!!!r!!!
!9G'"(r!!q[m!!2Vr!!$kf!!!qYJ!!2VB!!$kf!!!q[qJ$e"*3e4LFQphFf8ZFR0
-bB`)!!!"bFh*M8P0&4!#3"R*cFQ058d9%!*!BVAAL!`#3"J'8r`!!q[m!!2VB!!$
+bB`)!!!"bFh*M8P0&4!#3"R*cFQ058d9%!*!BVPGG(3#3"J'8r`!!q[m!!2VB!!$
kf!!!qYJ!!2VB!!$krk!!q[mJm!$kr`!!q[m!!2VB&3!!qYJ!!2VB!!!6qYJ!!2V
r)!SJ#b!-!D!!)!Da%"6i!2Vr!!$kf!!!qYJ!!2VB!!$kf!!!qYJ!!2Vr!!$kr`!
!q[ri!2Vr%#B!!2Vr`!$krc$i!2Vr!*!%&3"!!"!"&!$&!!!"!!%!N!8#!*!&)J!
"!*!&"3!+!+-!V!#3"l3!2!$)!(B%"&0SEhF!!!%!!!!"2`!!!$m!!!"9!2!Xj"0
i!!!!(!"'!!&%6%p(!!!!%N4*9%`!!!!H!J#3#`)!rrm!!!!C!*!%$N*bEhGcCA)
-JGfPZC'phVc!:
+JGfPZC'ph%ES:
diff --git a/Mac/Demo/building.html b/Mac/Demo/building.html
index fee9cfd7b7d..7d3aa926f33 100644
--- a/Mac/Demo/building.html
+++ b/Mac/Demo/building.html
@@ -44,10 +44,10 @@ What you need.
related stuff.
You need MetroWerks CodeWarrior. The current distribution has
-been built with CodeWarrior Pro 1. Ordering information is
+been built with CodeWarrior Pro 2. Ordering information is
available on the MetroWerks
-homepage. You might still be able to build Python with MPW or
-Think/Symantec C but you are basically on your own.
+homepage. Building Python with MPW or Think/Symantec C is
+probably impossible without major surgery.
You need GUSI, the Grand Unified Socket Interface, by Matthias
Neeracher. The original CWGUSI is
@@ -61,7 +61,7 @@ What you need.
The MacPython project files are configured to
include a plethora of optional modules, and these modules need a
-number extra packages. To use the project files as-is you have to
+number of extra packages. To use the project files as-is you have to
download these packages too. PPC and CFM68K Python have all such modules as
dynamically loaded modules, so if you don't need a certain package it
suffices to just refrain from builing the extension module. For static 68K
@@ -81,8 +81,8 @@ What you need.
Waste, a TextEdit replacement written by Marco Piovanelli, <piovanel@kagi.com>. Python
-was built using version 1.2, which you can obtain from <ftp://rhino.harvard.edu/pub/dan/WASTE>
+was built using version 1.3, which you can obtain from <http://www.boingo.com/waste>
and various other places.
Gdbm library for the Mac. Available from Jack's Mac software page at
@@ -121,12 +121,12 @@ Setting Up
zlib
libpng
gdbm
- MoreFiles 1.4.3 (not needed by Python, only by tcl/tk)
Python
Tcl/Tk Folder
tcl8.0
tk8.0
- Waste 1.2 distribution (if you want waste)
+ MoreFiles 1.4.3
+ Waste 1.3 distribution (if you want waste)
First build GUSI. If you didn't get the python-specific GUSI you have to
@@ -137,7 +137,7 @@ Setting Up
Next, in
MoreFiles, libjpeg, pbmplus,
zlib, libpng, gdbm,
-andlibtiff you build all projects. Sometimes the projects are in "mac"
+andlibtiff you build all projects. Usually the projects are in "mac"
subfolders, sometimes they are in the main folder. Tcl/tk is a special
case, see below. Of course, if you are only interested in one of
static 68K, CFM68K or PPC you can skip building the other libraries.
@@ -174,14 +174,7 @@
Building Waste
You do not need to build the Waste libraries, as Python includes the
-source modules themselves. You have to make one modification,
-though. In file ICCFMGlue.c in folder Minimal IC
-APIs, add the following lines:
-
-
-#include
-#include
-
+source modules themselves.
The organization of the Python source tree
@@ -190,19 +183,16 @@ The organization of the Python source tree
folders:
-- build.mac68k.stand
-
- This is where you build static 68K interpreters.
+
- build.macstand
+
- This is where you build static 68K interpreter, and possibly (if
+you want them) static PPC and fat interpreters. There is also a project
+here that builds smaller versions of the static interpreter.
-
- build.mac68k.shared
-
- This is where you build the CFM68K shared library, interpreter
-and applet framework.
-
-
- build.macppc.shared
-
- This is where you build the PPC shared library, interpreter and
-applet framework. You can also build the fat applet framework here.
-
-
- build.macppc.stand
-
- This is where you build a nonshared PPC interpreter (optional).
+
- build.mac
+
- This is where you build the CFM68K, PPC and fat shared library,
+interpreter and applet framework. The fat targets are deposited in the
+main folder (one level up), the others, which are intermediate results
+really, are left here.
- Demo
- Demo programs that are not Mac-specific. Some of these may not
@@ -211,7 +201,7 @@
The organization of the Python source tree
- Extensions
- Extensions to the interpreter that are not Mac-specific. Contains
only the
img extension in this distribution. Extensions
-are not built here, as they are on Unix, but incorporated in
+are not always built here, as they are on Unix, but sometimes incorporated in
the core interpreter or built as plugin modules.
- Grammar
diff --git a/Mac/Demo/cgi.html b/Mac/Demo/cgi.html
index c2369cf0a76..651d205d8c2 100644
--- a/Mac/Demo/cgi.html
+++ b/Mac/Demo/cgi.html
@@ -79,3 +79,4 @@
A Minimal CGI script
To test the script drop cgitest.cgi.py onto mkapplet,
move the resulting cgitest.cgi to somewhere where it is reachable
by NetPresenz, and point your web browser towards it.
+