modify our venv scripts to set GRAAL_PYTHON_OPTIONS on activation

timfel · timfel · commit da8766104fb5 · 2019-01-22T14:07:09.000+01:00
diff --git a/graalpython/lib-python/3/venv/__init__.py b/graalpython/lib-python/3/venv/__init__.py
@@ -46,6 +46,11 @@ def __init__(self, system_site_packages=False, clear=False,
         self.symlinks = symlinks
         self.upgrade = upgrade
         self.with_pip = with_pip
+        # Truffle change
+        if with_pip:
+            logger.warning("Not install pip on GraalPython")
+        self.with_pip = False
+        # End Truffle change
         self.prompt = prompt
 
     def create(self, env_dir):
@@ -113,6 +118,48 @@ def create_if_needed(d):
         context.executable = executable
         context.python_dir = dirname
         context.python_exe = exename
+
+        # Truffle change: when our executable is not just a file (e.g. we're
+        # running through java), we need to provide a script for launching
+        if hasattr(sys, "executable_list"):
+            # our 'sys.executable' is really a full commandline, so we need a
+            # script to launch it
+            import atexit, tempfile
+            tempdir = tempfile.mkdtemp()
+            script = os.path.join(tempdir, "graalpython")
+            if sys.platform == 'win32':
+                script += ".bat"
+
+            with open(script, "w") as f:
+                if sys.platform != "win32":
+                    f.write("#!/bin/sh\n")
+                for s in sys.executable_list:
+                    if " " in s:
+                        f.write('"')
+                        f.write(s.replace('"', '\\"'))
+                        f.write('" ')
+                    else:
+                        f.write(s)
+                        f.write(" ")
+                if sys.platform == "win32":
+                    f.write("%*")
+                else:
+                    f.write("$@")
+
+            if sys.platform != "win32":
+                os.chmod(script, 0o777)
+
+            atexit.register(lambda: os.unlink(script))
+            atexit.register(lambda: os.rmdir(tempdir))
+
+            dirname, exename = context.python_dir, context.python_exe = sys.graal_python_home, "graalpython"
+            context.executable = script
+
+            if self.symlinks:
+                logger.warning("We're not using symlinks on GraalPython")
+            self.symlinks = False
+        # End of Truffle change
+
         if sys.platform == 'win32':
             binname = 'Scripts'
             incpath = 'Include'
@@ -285,6 +332,16 @@ def replace_variables(self, text, context):
         text = text.replace('__VENV_PROMPT__', context.prompt)
         text = text.replace('__VENV_BIN_NAME__', context.bin_name)
         text = text.replace('__VENV_PYTHON__', context.env_exe)
+        # Truffle change: we need to set some extra options for the launcher to work
+        text = text.replace(
+            '__VENV_GRAAL_PYTHON_OPTIONS__',
+            "--python.CoreHome='%s' --python.StdLibHome='%s' --python.ExecutablePath='%s'" % (
+                sys.graal_python_core_home,
+                sys.graal_python_stdlib_home,
+                context.env_exe,
+            )
+        )
+        # End truffle change
         return text
 
     def install_scripts(self, context, path):
diff --git a/graalpython/lib-python/3/venv/scripts/common/activate b/graalpython/lib-python/3/venv/scripts/common/activate
@@ -14,6 +14,14 @@ deactivate () {
         unset _OLD_VIRTUAL_PYTHONHOME
     fi
 
+    if [ -n "${_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS:-}" ] ; then
+        GRAAL_PYTHON_OPTIONS="${_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS:-}"
+        export GRAAL_PYTHON_OPTIONS
+        unset _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
+    else
+        unset GRAAL_PYTHON_OPTIONS
+    fi
+
     # This should detect bash and zsh, which have a hash command that must
     # be called to get it to forget past commands.  Without forgetting
     # past commands the $PATH changes we made may not be respected
@@ -44,6 +52,10 @@ _OLD_VIRTUAL_PATH="$PATH"
 PATH="$VIRTUAL_ENV/__VENV_BIN_NAME__:$PATH"
 export PATH
 
+_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS="$GRAAL_PYTHON_OPTIONS"
+GRAAL_PYTHON_OPTIONS="__VENV_GRAAL_PYTHON_OPTIONS__ $GRAAL_PYTHON_OPTIONS"
+export GRAAL_PYTHON_OPTIONS
+
 # unset PYTHONHOME if set
 # this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
 # could use `if (set -u; : $PYTHONHOME) ;` in bash
diff --git a/graalpython/lib-python/3/venv/scripts/nt/Activate.ps1 b/graalpython/lib-python/3/venv/scripts/nt/Activate.ps1
@@ -15,6 +15,12 @@ function global:deactivate ([switch]$NonDestructive) {
         remove-item env:_OLD_VIRTUAL_PATH
     }
 
+    remove-item env:GRAAL_PYTHON_OPTIONS
+    if (Test-Path env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS) {
+        copy-item env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS env:GRAAL_PYTHON_OPTIONS
+        remove-item env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
+    }
+
     if (Test-Path env:VIRTUAL_ENV) {
         remove-item env:VIRTUAL_ENV
     }
@@ -49,3 +55,6 @@ if (Test-Path env:PYTHONHOME) {
 # Add the venv to the PATH
 copy-item env:PATH env:_OLD_VIRTUAL_PATH
 $env:PATH = "$env:VIRTUAL_ENV\__VENV_BIN_NAME__;$env:PATH"
+
+copy-item env:GRAAL_PYTHON_OPTIONS env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
+$env:GRAAL_PYTHON_OPTIONS = "$env:__VENV_GRAAL_PYTHON_OPTIONS__ $env:GRAAL_PYTHON_OPTIONS"
diff --git a/graalpython/lib-python/3/venv/scripts/nt/activate.bat b/graalpython/lib-python/3/venv/scripts/nt/activate.bat
@@ -38,6 +38,14 @@ if defined _OLD_VIRTUAL_PATH (
 
 set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"
 
+if defined _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS (
+    set "GRAAL_PYTHON_OPTIONS=%_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS%"
+) else (
+    set "_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS=%GRAAL_PYTHON_OPTIONS%"
+)
+
+set "GRAAL_PYTHON_OPTIONS=__VENV_GRAAL_PYTHON_OPTIONS__ %GRAAL_PYTHON_OPTIONS%"
+
 :END
 if defined _OLD_CODEPAGE (
     "%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
diff --git a/graalpython/lib-python/3/venv/scripts/nt/deactivate.bat b/graalpython/lib-python/3/venv/scripts/nt/deactivate.bat
@@ -16,6 +16,13 @@ if defined _OLD_VIRTUAL_PATH (
 
 set _OLD_VIRTUAL_PATH=
 
+set GRAAL_PYTHON_OPTIONS=
+if defined _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS (
+    set "GRAAL_PYTHON_OPTIONS=%_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS%"
+)
+
+set _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS=
+
 set VIRTUAL_ENV=
 
 :END
diff --git a/graalpython/lib-python/3/venv/scripts/posix/activate.csh b/graalpython/lib-python/3/venv/scripts/posix/activate.csh
@@ -3,7 +3,7 @@
 # Created by Davide Di Blasi <davidedb@gmail.com>.
 # Ported to Python 3.3 venv by Andrew Svetlov <andrew.svetlov@gmail.com>
 
-alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate'
+alias deactivate 'unset GRAAL_PYTHON_OPTIONS; test $?_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS != 0 && setenv GRAAL_PYTHON_OPTIONS "$_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS" && unset _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS; test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate'
 
 # Unset irrelevant variables.
 deactivate nondestructive
@@ -13,6 +13,8 @@ setenv VIRTUAL_ENV "__VENV_DIR__"
 set _OLD_VIRTUAL_PATH="$PATH"
 setenv PATH "$VIRTUAL_ENV/__VENV_BIN_NAME__:$PATH"
 
+set _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS="$GRAAL_PYTHON_OPTIONS"
+setenv GRAAL_PYTHON_OPTIONS "__VENV_GRAAL_PYTHON_OPTIONS__ $GRAAL_PYTHON_OPTIONS"
 
 set _OLD_VIRTUAL_PROMPT="$prompt"
 
diff --git a/graalpython/lib-python/3/venv/scripts/posix/activate.fish b/graalpython/lib-python/3/venv/scripts/posix/activate.fish
@@ -7,6 +7,11 @@ function deactivate  -d "Exit virtualenv and return to normal shell environment"
         set -gx PATH $_OLD_VIRTUAL_PATH
         set -e _OLD_VIRTUAL_PATH
     end
+    set -e GRAAL_PYTHON_OPTIONS
+    if test -n "$_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS"
+        set -gx GRAAL_PYTHON_OPTIONS $_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
+        set -e _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
+    end
     if test -n "$_OLD_VIRTUAL_PYTHONHOME"
         set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME
         set -e _OLD_VIRTUAL_PYTHONHOME
@@ -34,6 +39,9 @@ set -gx VIRTUAL_ENV "__VENV_DIR__"
 set -gx _OLD_VIRTUAL_PATH $PATH
 set -gx PATH "$VIRTUAL_ENV/__VENV_BIN_NAME__" $PATH
 
+set -gx _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS $GRAAL_PYTHON_OPTIONS
+set -gx GRAAL_PYTHON_OPTIONS "__VENV_GRAAL_PYTHON_OPTIONS__ " $GRAAL_PYTHON_OPTIONS
+
 # unset PYTHONHOME if set
 if set -q PYTHONHOME
     set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME
