set graalpy paths depending on platform

Author: tomasstupka

graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/utils/test/VirtualFileSystemTest.java

@@ -82,6 +82,7 @@
 import org.graalvm.polyglot.Context.Builder;
 import org.graalvm.polyglot.HostAccess;
 import org.graalvm.polyglot.PolyglotException;
+import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.io.FileSystem;
 import org.graalvm.polyglot.io.IOAccess;
 import org.graalvm.python.embedding.utils.GraalPyResources;
@@ -886,6 +887,62 @@ public void vfsMountPointTest() {
         }
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    public void pythonPathsTest() throws IOException {
+        Context ctx = GraalPyResources.createContext();
+        String getPathsSource = "import sys; [__graalpython__.get_python_home_paths(), sys.path, sys.executable]";
+
+        Value paths = ctx.eval("python", getPathsSource);
+        String defaultMountPoint = VirtualFileSystem.newBuilder().build().getMountPoint();
+        assertEquals(IS_WINDOWS ? "X:\\graalpy_vfs" : "/graalpy_vfs", defaultMountPoint);
+        checkPaths(paths.as(List.class), defaultMountPoint);
+
+        ctx = GraalPyResources.contextBuilder().build();
+        paths = ctx.eval("python", getPathsSource);
+        checkPaths(paths.as(List.class), defaultMountPoint);
+
+        VirtualFileSystem vfs = VirtualFileSystem.newBuilder().//
+                        unixMountPoint(VFS_UNIX_MOUNT_POINT).//
+                        windowsMountPoint(VFS_WIN_MOUNT_POINT).build();
+        assertEquals(VFS_MOUNT_POINT, vfs.getMountPoint());
+        ctx = GraalPyResources.contextBuilder(vfs).build();
+        paths = ctx.eval("python", getPathsSource);
+        checkPaths(paths.as(List.class), vfs.getMountPoint(), true);
+
+        Path resourcesDir = Files.createTempDirectory("python-resources");
+        ctx = GraalPyResources.contextBuilder(resourcesDir).build();
+        paths = ctx.eval("python", getPathsSource);
+        checkPaths(paths.as(List.class), resourcesDir.toString());
+    }
+
+    private static void checkPaths(List<Object> l, String pathPrefix) {
+        checkPaths(l, pathPrefix, false);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void checkPaths(List<Object> l, String pathPrefix, boolean checkHome) {
+        // python.PythonHome
+        // TODO how to check python.PythonHome?
+        // /org.graalvm.python.vfs/home has to be in fileslist.txt
+        // - if it is in fileslist.txt, than it also has to contain the whole stdlib,
+        // or other tests will fail when trying to load python
+        // - the pythonHome value is implicitly covered in maven and gradle plugin tests
+        // if (checkHome) {
+        // assertTrue(((String) l.get(0)).contains(pathPrefix + File.separator + "home" +
+        // File.separator +
+        // "lib-graalpython"));
+        // assertTrue(((String) l.get(0)).contains(pathPrefix + File.separator + "home" +
+        // File.separator +
+        // "lib-python" + File.separator + "3"));
+        // }
+
+        // option python.PythonPath
+        assertTrue(((List<Object>) l.get(1)).contains(pathPrefix + File.separator + "src"));
+        // option python.Executable
+        assertEquals(l.get(2), pathPrefix + (IS_WINDOWS ? "\\venv\\Scripts\\python.exe" : "/venv/bin/python"));
+    }
+
     private static Builder addTestOptions(Builder builder) {
         return builder.option("engine.WarnInterpreterOnly", "false");
     }

graalpython/com.oracle.graal.python.test/src/tests/standalone/test_standalone.py

@@ -304,7 +304,7 @@ def test_gradle_generated_app_external_resources(self):
                 "package org.example;\nimport java.nio.file.Path;")
             util.replace_in_file(os.path.join(target_dir, "src", "main", "java", "org", "example", "GraalPy.java"),
                 "GraalPyResources.createContext()",
-                "GraalPyResources.contextBuilder(Path.of(\"python-resources\")).build()")
+                "GraalPyResources.contextBuilder(Path.of(\"" + (resources_dir if "win32" != sys.platform else resources_dir.replace("\\", "\\\\")) + "\")).build()")
 
             # patch build.gradle
             append(build_file, self.packages_termcolor_resource_dir(resources_dir))
@@ -756,9 +756,11 @@ def test_generated_app_external_resources(self):
             util.replace_in_file(os.path.join(target_dir, "src", "main", "java", "it", "pkg", "GraalPy.java"),
                 "package it.pkg;",
                 "package it.pkg;\nimport java.nio.file.Path;")
+            if "win32" == sys.platform:
+                resources_dir.replace("\\", "\\\\")
             util.replace_in_file(os.path.join(target_dir, "src", "main", "java", "it", "pkg", "GraalPy.java"),
                 "GraalPyResources.createContext()",
-                "GraalPyResources.contextBuilder(Path.of(\"python-resources\")).build()")
+                "GraalPyResources.contextBuilder(Path.of(\"" + (resources_dir if "win32" != sys.platform else resources_dir.replace("\\", "\\\\")) + "\")).build()")
 
             # patch pom.xml
             util.replace_in_file(os.path.join(target_dir, "pom.xml"),

graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/GraalPyResources.java

@@ -307,7 +307,13 @@ public static Context.Builder contextBuilder(VirtualFileSystem vfs) {
      * @param resourcesDirectory the root directory with GraalPy specific embedding resources
      */
     public static Context.Builder contextBuilder(Path resourcesDirectory) {
-        String execPath = resourcesDirectory.resolve(VirtualFileSystem.VFS_VENV + "/bin/python").toAbsolutePath().toString();
+        String execPath;
+        if (VirtualFileSystem.isWindows()) {
+            execPath = resourcesDirectory.resolve(VirtualFileSystem.VFS_VENV).resolve("Scripts").resolve("python.exe").toAbsolutePath().toString();
+        } else {
+            execPath = resourcesDirectory.resolve(VirtualFileSystem.VFS_VENV).resolve("bin").resolve("python").toAbsolutePath().toString();
+        }
+
         String homePath = resourcesDirectory.resolve(VirtualFileSystem.VFS_HOME).toAbsolutePath().toString();
         String srcPath = resourcesDirectory.resolve(VirtualFileSystem.VFS_SRC).toAbsolutePath().toString();
         return createContextBuilder().

graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/VirtualFileSystem.java

@@ -100,7 +100,7 @@ public synchronized String format(LogRecord lr) {
     /*
      * Root of the virtual filesystem in the resources.
      */
-    static final String VFS_ROOT = "/org.graalvm.python.vfs";
+    private static final String VFS_ROOT = "/org.graalvm.python.vfs";
 
     static final String VFS_HOME = "home";
     static final String VFS_VENV = "venv";