Commit e791a642 authored by Jack Jansen's avatar Jack Jansen

If genpluginprojects is called from fullbuild we set the Python source...

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.
parent 214a0b13
...@@ -18,6 +18,7 @@ import MacOS ...@@ -18,6 +18,7 @@ import MacOS
import EasyDialogs import EasyDialogs
import re import re
import string import string
import genpluginprojects
import aetools import aetools
import AppleEvents import AppleEvents
...@@ -377,6 +378,8 @@ def main(): ...@@ -377,6 +378,8 @@ def main():
if not ok: if not ok:
sys.exit(0) sys.exit(0)
dir = dir.as_pathname() dir = dir.as_pathname()
# Set genpluginprojects to use this folder (slight hack)
genpluginprojects.PYTHONDIR = dir
todo = handle_dialog(os.path.join(dir, MACBUILDNO)) todo = handle_dialog(os.path.join(dir, MACBUILDNO))
......
...@@ -3,7 +3,8 @@ import sys ...@@ -3,7 +3,8 @@ import sys
import os import os
import string import string
PROJECTDIR = os.path.join(sys.prefix, ":Mac:Build") PYTHONDIR = sys.prefix
PROJECTDIR = os.path.join(PYTHONDIR, ":Mac:Build")
MODULEDIRS = [ # Relative to projectdirs MODULEDIRS = [ # Relative to projectdirs
"::Modules:%s", "::Modules:%s",
"::Modules", "::Modules",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment