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.

3 files changed, 119 insertions, 0 deletions

diff --git a/Mac/Resources/bundle.rsrc b/Mac/Resources/bundle.rsrc
index 6006321af7..43a4702677 100644
--- a/Mac/Resources/bundle.rsrc
+++ b/Mac/Resources/bundle.rsrc
diff --git a/Mac/Resources/pythonpath.r b/Mac/Resources/pythonpath.r
new file mode 100644
index 0000000000..288c5b44ef
--- /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 0000000000..4e52e6a639
--- /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)
+};