diff --git a/Mac/Demo/building.html b/Mac/Demo/building.html
index c27de03040c..eb64963be91 100644
--- a/Mac/Demo/building.html
+++ b/Mac/Demo/building.html
@@ -54,7 +54,7 @@ Neeracher. The original CWGUSI is
obtainable from
ftp://sunsite.cnlab-switch.ch/software/platform/macos/src.
-At the moment Python is built with a slightly modified version of GUSI 1.8.1fc2,
+At the moment Python is built with a slightly modified version of GUSI,
these modifications are available in folder Python:Mac:GUSI-mods
.
@@ -121,32 +121,31 @@ Top-level-folder:
zlib
libpng
gdbm
+ MoreFiles 1.4.3 (not needed by Python, only by tcl/tk)
Python
Tcl/Tk Folder
tcl8.0
tk8.0
- MoreFiles 1.4.3
Waste 1.2 distribution (if you want waste)
First build GUSI. If you didn't get the python-specific GUSI you have to
move the files from the "CWGUSI-mods" to the right
-place in the CWGUSI distribution folder. Build the MSL target for your
-platform (MSLGUSI PPC, MSLGUSI 68K or MSLGUSI CFM68K).
+place in the CWGUSI distribution folder. Build the MSL version for your +platform (ppc, 68k, cfm68k).
Next, in
MoreFiles
, libjpeg
, pbmplus
,
zlib
, libpng
, gdbm
,
-andlibtiff
you build all projects. The projects are in "mac"
+andlibtiff
you build all projects. Sometimes 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.
build.mac68k.stand
-and build it. Do not run it yet, this will possibly result
-in a garbled preferences file.
+breeze: open the project in the folder build.macstand
and
+build the 68K target. Do not run it yet, this will possibly
+result in a garbled preferences file.
-First remove the Python preferences
file from your
+First remove the Python XXX preferences
file from your
preference folder, only if you had an older version of Python
installed. (this is also what you do if you did not heed the last
sentence of the preceeding paragraph). Next, move the interpreter to
@@ -320,35 +324,31 @@ create a correct initial preferences file. You are now all set, and
your tree should be completely compatible with a binary-only
distribution. Read the release notes
(Relnotes-somethingorother
) and
-ReadMeOrSuffer
in the Mac
folder.
+ReadMe
in the Mac
folder.
-
build.macppc.stand
. The order to build things is
-the following:
+folder build.mac
. The projects are all linked together, so
+building the fat targets in Python.prj
and
+PythonApplet.prj
will result in everything being built. The
+resulting applications and fat shared library are deposited in the main
+Python folder. For completeness sake here is a breakdown of the
+projects:
Extensions
folder of your system
folder. Do exactly that: put an alias there, copying or
-moving the file will cause you grief later.
+moving the file will cause you grief later if you rebuild the library and
+forget to copy it to the extensions folder again.
-+shared library.
PythonCorePPC
you should move
-PythonPPC
to the main Python folder. Next you remove any old
+After creating the alias to PythonCore
you remove any old
Python XXX Preferences
file from the Preferences
folder
(if you had python installed on your system before) and run the interpreter once
-to create the correct preferences file. You should also make an alias
-PythonApplet
pointing to PythonAppletPPC
in the main
-Python folder. (again: making an alias is preferrable to copying or moving the
-file, since this will cause the correct file to be used if you ever rebuild
-PythonAppletPPC). +to create the correct preferences file.
Next, you have to build the extension modules in the
-PlugIns
folder. Open each project with .ppc
in the
-name and build it. After all
+PlugIns
folder. The PlugIns.ppc
project has all the
+other projects as subprojects and builds everything. After all
the dynamically loaded modules are built you have to create a number
of aliases: some modules live together in a single dynamic
-library. Run the MkPluginAliases.py
script from
+library. Run the ConfigurePython.py
script from
Mac:scripts
to create the aliases.
Finally, you must build the standard applets:
-EditPythonPrefs
, mkapplet
, etc. This is
+EditPythonPrefs
, BuildApplet
, etc. This is
easiest done with the fullbuild
script from
-Mac:scripts
. Answer no to all questions except
-when it asks whether to build the applets.
+Mac:scripts
.
Actually, theYou are all set now, and should read the release notes and -fullbuild
script can be used to build @@ -392,13 +386,10 @@ place and use that to run fullbuild, or use the standalone PPC python for this. I tend to keep a standalone interpreter in a safe place for this use only.-Using fullbuild is also the only easy way to buid the fat application and applet. -See the fullbuild source for details on how to build the fat binaries "by hand". -
ReadMeOrSuffer
file from the Mac
folder.
+ReadMe
file from the Mac
folder.
.exp
files for PPC and CFM68KInclude
, Mac:Include
and
Mac:mwerks
from the source distribution and you should be
all set. A template for a dynamic module can be found in
-xx.ppc.µ
or xx.CFM68K.µ
.
+xx.prj
.
EditPythonPrefs
.
-The most logical way to embed Python is to link it against the shared library
-PythonCorePPC
or PythonCoreCFM68K
. An example project
-and source can be found in the embed folder.
+The most logical way to embed Python is to link it against the shared
+library PythonCore
. An example project and source can be
+found in the embed folder.