(finally) unified the interpreter and the applet as Just suggested ages ago. The

resulting program is called PythonInterpreter.

diff --git a/Mac/Build/PythonApplet.prj b/Mac/Build/PythonApplet.prj
deleted file mode 100644 (file)
index 500cd89..0000000
Binary files a/Mac/Build/PythonApplet.prj and /dev/null differ

diff --git a/Mac/Build/Python.prj b/Mac/Build/PythonInterpreter.prj
similarity index 55%
rename from Mac/Build/Python.prj
rename to Mac/Build/PythonInterpreter.prj
index 9dc1387e4a33b283bf660f739770cd868308c801..ab3cd9fdc97bdf2095f29d3c2ce2f92bfaeef653 100644 (file)
Binary files a/Mac/Build/Python.prj and b/Mac/Build/PythonInterpreter.prj differ

diff --git a/Mac/Demo/building.html b/Mac/Demo/building.html
index f78b2b729d5a30ca7d869399ac8f0fb3df0dd447..ee214e69d6d5833a23be52c4bb6ca5f3d84be8c1 100644 (file)
--- a/Mac/Demo/building.html
+++ b/Mac/Demo/building.html
@@ -346,8 +346,8 @@ it from the system folder and running Python once again will re-create it.
 First you optionally build the external libraries with buildlibs.prj. Next, 
 the projects for
 interpreter, core library and applet skeleton  are all linked together, so
-building the fat targets in <code>Python.prj</code> and
-<code>PythonApplet.prj</code> will result in everything being built. The
+building the fat target in <code>PythonEngine.prj</code> 
+will result in everything being built. The
 resulting applications and fat shared library are deposited in the main
 Python folder. Finally, you build all the plugins with the plugins.prj project.
 
@@ -364,16 +364,10 @@ moving the file will cause you grief later if you rebuild the library and
 forget to copy it to the extensions folder again. The InstallPython applet
 will also do this, along with creating the plugin aliases.
 
-<DT> Python
+<DT> PythonInterpeter
 <DD> The interpreter. This is basically a routine to call out to the
-shared library.  <p>
-
-<DT> PythonAppletPPC
-<DD> The applet skeleton application. Very similar to
-<code>PythonPPC</code>, but it calls to a different entrypoint in the
-core library. The <code>mkapplet</code> script will copy this complete
-file, and add a <code>'PYC '</code> with the module to generate an
-applet. <p>
+shared library. Unlike in previous releases the same program is used for
+creating applets (for which formerly PythonApplet was used). <p>
 
 <DT> Plugin projects
 <DD> Each plugin module has a separate project. The <code>Plugins.prj</code>

diff --git a/Mac/Lib/buildtools.py b/Mac/Lib/buildtools.py
index 3dcb6ae8d41ec3eab71bc897da6c37ff238641ab..badd8a1f6653413bebe4ad843d16982f8f328167 100644 (file)
--- a/Mac/Lib/buildtools.py
+++ b/Mac/Lib/buildtools.py
@@ -22,7 +22,7 @@ DEBUG=1
 MAGIC = imp.get_magic()
 
 # Template file (searched on sys.path)
-TEMPLATE = "PythonApplet"
+TEMPLATE = "PythonInterpreter"
 
 # Specification of our resource
 RESTYPE = 'PYC '

diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index 3b7ecb60c3e83784aeb2da3be535e88fc65eb01b..3eaed0677f2c3c6f60b7afdffa0c943930b7a436 100644 (file)
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -149,8 +149,7 @@ def handle_dialog(filename):
 BUILD_DICT = {
 I_CORE : (buildmwproject, "CWIE", [
                (":Mac:Build:PythonCore.prj", "PythonCore"),
-               (":Mac:Build:Python.prj", "PythonFAT"),
-               (":Mac:Build:PythonApplet.prj", "PythonAppletFAT"),
+               (":Mac:Build:PythonInterpreter.prj", "PythonInterpreter"),
        ]),
 
 I_PPC_PLUGINS : (buildmwproject, "CWIE", [