Pythonpath converted to Rez source, and vers resource removed from
bundle to its own Rez source file. With these changes various resources
are all set automatically from .h files.
diff --git a/Mac/Build/Python.prj b/Mac/Build/Python.prj
index 2c4ff72..2407f3a 100644
--- a/Mac/Build/Python.prj
+++ b/Mac/Build/Python.prj
Binary files differ
diff --git a/Mac/Build/PythonApplet.prj b/Mac/Build/PythonApplet.prj
index 735c9f4..c016798 100644
--- a/Mac/Build/PythonApplet.prj
+++ b/Mac/Build/PythonApplet.prj
Binary files differ
diff --git a/Mac/Build/PythonCore.prj b/Mac/Build/PythonCore.prj
index 4749768..e2ba306 100644
--- a/Mac/Build/PythonCore.prj
+++ b/Mac/Build/PythonCore.prj
Binary files differ
diff --git a/Mac/Build/PythonCoreCFM68K.prj b/Mac/Build/PythonCoreCFM68K.prj
index 3402cc7..2302b7f 100644
--- a/Mac/Build/PythonCoreCFM68K.prj
+++ b/Mac/Build/PythonCoreCFM68K.prj
Binary files differ
diff --git a/Mac/Build/PythonCorePPC.prj b/Mac/Build/PythonCorePPC.prj
index 9515eb3..e6853a6 100644
--- a/Mac/Build/PythonCorePPC.prj
+++ b/Mac/Build/PythonCorePPC.prj
Binary files differ
diff --git a/Mac/Build/PythonStandSmall.prj b/Mac/Build/PythonStandSmall.prj
index 009e897..46740e8 100644
--- a/Mac/Build/PythonStandSmall.prj
+++ b/Mac/Build/PythonStandSmall.prj
Binary files differ
diff --git a/Mac/Build/PythonStandalone.prj b/Mac/Build/PythonStandalone.prj
index fe609ca..1e95ba6 100644
--- a/Mac/Build/PythonStandalone.prj
+++ b/Mac/Build/PythonStandalone.prj
Binary files differ
diff --git a/Mac/Resources/bundle.rsrc b/Mac/Resources/bundle.rsrc
index 6006321..43a4702 100644
--- a/Mac/Resources/bundle.rsrc
+++ b/Mac/Resources/bundle.rsrc
Binary files differ
diff --git a/Mac/Resources/pythonpath.r b/Mac/Resources/pythonpath.r
new file mode 100644
index 0000000..288c5b4
--- /dev/null
+++ b/Mac/Resources/pythonpath.r
@@ -0,0 +1,89 @@
+/*
+** Resources for the sys.path initialization, the Python options
+** and the preference filename
+*/
+#include "Types.r"
+#include "patchlevel.h"
+#include "pythonresources.h"
+
+/* A few resource type declarations */
+
+type 'Popt' {
+ literal byte version = POPT_VERSION_CURRENT;
+ byte noInspect = 0, inspect = 1;
+ byte noVerbose = 0, verbose = 1;
+ byte noOptimize = 0, optimize = 1;
+ byte noUnbuffered = 0, unbuffered = 1;
+ byte noDebugParser = 0, debugParser = 1;
+ byte closeOnNormalExit = 0, noCloseOnNormalExit = 1;
+ byte closeOnErrorExit = 0, noCloseOnErrorExit = 1;
+ byte interactiveOptions = 0, noInteractiveOptions = 1;
+ byte argcArgv = 0, noArgcArgv = 1;
+ byte newStandardExceptions = 0, oldStandardExceptions = 1;
+ byte sitePython = 0, noSitePython = 1;
+};
+
+type 'TMPL' {
+ wide array {
+ pstring;
+ literal longint;
+ };
+};
+
+/* The resources themselves */
+
+/* Popt template, for editing them in ResEdit */
+
+resource 'TMPL' (PYTHONOPTIONS_ID, "Popt") {
+ {
+ "preference version", 'DBYT',
+ "Interactive after script", 'DBYT',
+ "Verbose import", 'DBYT',
+ "Optimize", 'DBYT',
+ "Unbuffered stdio", 'DBYT',
+ "Debug parser", 'DBYT',
+ "Keep window on normal exit", 'DBYT',
+ "Keep window on error exit", 'DBYT',
+ "No interactive option dialog", 'DBYT',
+ "No argc/argv emulation", 'DBYT',
+ "Old standard exceptions", 'DBYT',
+ "No site-python support", 'DBYT',
+ }
+};
+
+/* The default-default Python options */
+
+resource 'Popt' (PYTHONOPTIONS_ID, "Options") {
+ POPT_VERSION_CURRENT,
+ noInspect,
+ noVerbose,
+ noOptimize,
+ noUnbuffered,
+ noDebugParser,
+ closeOnNormalExit,
+ noCloseOnErrorExit,
+ interactiveOptions,
+ argcArgv,
+ newStandardExceptions,
+ sitePython,
+};
+
+/* The sys.path initializer */
+
+resource 'STR#' (PYTHONPATH_ID, "sys.path initialization") {
+ {
+ "$(PYTHON)",
+ "$(PYTHON):Lib",
+ "$(PYTHON):Mac:PlugIns",
+ "$(PYTHON):Mac:Lib",
+ "$(PYTHON):Mac:Lib:lib-toolbox",
+ "$(PYTHON):Mac:Lib:lib-scripting",
+ "$(PYTHON):Extensions:img:Lib"
+ }
+};
+
+/* The preferences filename */
+
+resource 'STR ' (PREFFILENAME_ID, PREFFILENAME_PASCAL_NAME) {
+ $$Format("Python %s Preferences", PY_VERSION)
+};
diff --git a/Mac/Resources/version.r b/Mac/Resources/version.r
new file mode 100644
index 0000000..4e52e6a
--- /dev/null
+++ b/Mac/Resources/version.r
@@ -0,0 +1,30 @@
+/*
+** Create the 'vers' version resource from information in the
+** Python include files.
+*/
+
+#include "Types.r"
+
+#include "patchlevel.h"
+
+/* Invent the Mac version from the Python version */
+#if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_ALPHA
+#define V_RELEASE alpha
+#endif
+#if PY_RELEASE_LEVEL == PY_RELEASE_LEVEL_BETA
+#define V_RELEASE beta
+#endif
+#ifndef V_RELEASE
+#define V_RELEASE final
+#endif
+
+resource 'vers' (1) {
+ PY_MAJOR_VERSION,
+ (PY_MINOR_VERSION<<4) | (PY_MICRO_VERSION),
+ V_RELEASE,
+ PY_RELEASE_SERIAL,
+ 0,
+ PY_VERSION,
+ $$Format("%s, © Stichting Mathematisch Centrum %s",
+ PY_VERSION, $$Date)
+};