diff --git a/Mac/Build/PythonApplet.prj b/Mac/Build/PythonApplet.prj deleted file mode 100644 index 500cd896411..00000000000 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 9dc1387e4a3..ab3cd9fdc97 100644 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 f78b2b729d5..ee214e69d6d 100644 --- 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 Python.prj and -PythonApplet.prj will result in everything being built. The +building the fat target in PythonEngine.prj +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. -
Python +
PythonInterpeter
The interpreter. This is basically a routine to call out to the -shared library.

- -

PythonAppletPPC -
The applet skeleton application. Very similar to -PythonPPC, but it calls to a different entrypoint in the -core library. The mkapplet script will copy this complete -file, and add a 'PYC ' with the module to generate an -applet.

+shared library. Unlike in previous releases the same program is used for +creating applets (for which formerly PythonApplet was used).

Plugin projects
Each plugin module has a separate project. The Plugins.prj diff --git a/Mac/Lib/buildtools.py b/Mac/Lib/buildtools.py index 3dcb6ae8d41..badd8a1f665 100644 --- 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 3b7ecb60c3e..3eaed0677f2 100644 --- 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", [