diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-08-16 20:39:17 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-08-16 20:39:17 (GMT) |
| commit | e791a6421fae40dd7aae1f67fd6b6d737c510af7 (patch) | |
| tree | 478e786dcf4acb51e3736cfbf7581099a17dec7e | |
| parent | 214a0b138291a649b90f86ae7d3b2a788016947d (diff) | |
| download | cpython-e791a6421fae40dd7aae1f67fd6b6d737c510af7.zip cpython-e791a6421fae40dd7aae1f67fd6b6d737c510af7.tar.gz cpython-e791a6421fae40dd7aae1f67fd6b6d737c510af7.tar.bz2 | |
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.
| -rw-r--r-- | Mac/scripts/fullbuild.py | 3 | ||||
| -rw-r--r-- | Mac/scripts/genpluginprojects.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py index d3a5a13..43d69e6 100644 --- a/Mac/scripts/fullbuild.py +++ b/Mac/scripts/fullbuild.py @@ -18,6 +18,7 @@ import MacOS 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 ead0c24..0ee6bce 100644 --- a/Mac/scripts/genpluginprojects.py +++ b/Mac/scripts/genpluginprojects.py @@ -3,7 +3,8 @@ import sys 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", |