From e791a6421fae40dd7aae1f67fd6b6d737c510af7 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Thu, 16 Aug 2001 20:39:17 +0000 Subject: [PATCH] If genpluginprojects is called from fullbuild we set the Python source directory to be the same as fullbuild uses (in stead of using the default sys.prefix). This fixes an issue Mark Day raised that you can't use fullbuild with one Python installation to build another one. --- Mac/scripts/fullbuild.py | 3 +++ Mac/scripts/genpluginprojects.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py index d3a5a13c7c5..43d69e6b550 100644 --- a/Mac/scripts/fullbuild.py +++ b/Mac/scripts/fullbuild.py @@ -18,6 +18,7 @@ import EasyDialogs import re import string +import genpluginprojects import aetools import AppleEvents @@ -377,6 +378,8 @@ def main(): if not ok: sys.exit(0) dir = dir.as_pathname() + # Set genpluginprojects to use this folder (slight hack) + genpluginprojects.PYTHONDIR = dir todo = handle_dialog(os.path.join(dir, MACBUILDNO)) diff --git a/Mac/scripts/genpluginprojects.py b/Mac/scripts/genpluginprojects.py index ead0c24e0fb..0ee6bcea03e 100644 --- a/Mac/scripts/genpluginprojects.py +++ b/Mac/scripts/genpluginprojects.py @@ -3,7 +3,8 @@ import os import string -PROJECTDIR = os.path.join(sys.prefix, ":Mac:Build") +PYTHONDIR = sys.prefix +PROJECTDIR = os.path.join(PYTHONDIR, ":Mac:Build") MODULEDIRS = [ # Relative to projectdirs "::Modules:%s", "::Modules",