Commit 9c70f159 authored by Just van Rossum's avatar Just van Rossum

only set $PYTHONHOME when building a standalone app.

parent ec51f67a
...@@ -280,7 +280,8 @@ mainprogram = os.path.join(resdir, "%(mainprogram)s") ...@@ -280,7 +280,8 @@ mainprogram = os.path.join(resdir, "%(mainprogram)s")
sys.argv.insert(1, mainprogram) sys.argv.insert(1, mainprogram)
os.environ["PYTHONPATH"] = resdir os.environ["PYTHONPATH"] = resdir
os.environ["PYTHONHOME"] = resdir if %(standalone)s:
os.environ["PYTHONHOME"] = resdir
os.environ["PYTHONEXECUTABLE"] = executable os.environ["PYTHONEXECUTABLE"] = executable
os.environ["DYLD_LIBRARY_PATH"] = libdir os.environ["DYLD_LIBRARY_PATH"] = libdir
os.execve(executable, sys.argv, os.environ) os.execve(executable, sys.argv, os.environ)
...@@ -445,6 +446,7 @@ class AppBuilder(BundleBuilder): ...@@ -445,6 +446,7 @@ class AppBuilder(BundleBuilder):
hashbang = sys.executable hashbang = sys.executable
while os.path.islink(hashbang): while os.path.islink(hashbang):
hashbang = os.readlink(hashbang) hashbang = os.readlink(hashbang)
standalone = self.standalone
open(bootstrappath, "w").write(BOOTSTRAP_SCRIPT % locals()) open(bootstrappath, "w").write(BOOTSTRAP_SCRIPT % locals())
os.chmod(bootstrappath, 0775) os.chmod(bootstrappath, 0775)
......
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