fix include file location of resources

Author: timfel

graalpython/com.oracle.graal.python.resources/src/com/oracle/graal/python/resources/PythonResource.java

@@ -77,13 +77,16 @@ public final class PythonResource implements InternalResource {
     private static final Path BASE_PATH = Path.of("META-INF", "resources");
     private static final String LIBGRAALPY = "libgraalpy";
     private static final String LIBPYTHON = "libpython";
+    private static final String INCLUDE = "include";
     private static final String LIBGRAALPY_FILES = LIBGRAALPY + ".files";
     private static final String LIBPYTHON_FILES = LIBPYTHON + ".files";
     private static final String INCLUDE_FILES = "include.files";
+    private static final String NI_FILES = "ni.files";
     private static final String NATIVE_FILES = "native.files";
     private static final Path LIBGRAALPY_SHA256 = Path.of(LIBGRAALPY + ".sha256");
     private static final Path LIBPYTHON_SHA256 = Path.of(LIBPYTHON + ".sha256");
     private static final Path INCLUDE_SHA256 = Path.of("include.sha256");
+    private static final Path NI_SHA256 = Path.of("ni.sha256");
     private static final Path NATIVE_SHA256 = Path.of("native.sha256");
 
     @Override
@@ -93,20 +96,23 @@ public void unpackFiles(Env env, Path targetDirectory) throws IOException {
         if (os.equals(OS.WINDOWS)) {
             env.unpackResourceFiles(BASE_PATH.resolve(LIBPYTHON_FILES), targetDirectory.resolve("Lib"), BASE_PATH.resolve(LIBPYTHON));
             env.unpackResourceFiles(BASE_PATH.resolve(LIBGRAALPY_FILES), targetDirectory.resolve("lib-graalpython"), BASE_PATH.resolve(LIBGRAALPY));
+            env.unpackResourceFiles(BASE_PATH.resolve(INCLUDE_FILES), targetDirectory.resolve("Include"), BASE_PATH.resolve(INCLUDE));
         } else {
-            env.unpackResourceFiles(BASE_PATH.resolve(LIBPYTHON_FILES), targetDirectory.resolve("lib").resolve("python" + PYTHON_MAJOR + "." + PYTHON_MINOR), BASE_PATH.resolve(LIBPYTHON));
+            String pythonMajMin = "python" + PYTHON_MAJOR + "." + PYTHON_MINOR;
+            env.unpackResourceFiles(BASE_PATH.resolve(LIBPYTHON_FILES), targetDirectory.resolve("lib").resolve(pythonMajMin), BASE_PATH.resolve(LIBPYTHON));
             env.unpackResourceFiles(BASE_PATH.resolve(LIBGRAALPY_FILES), targetDirectory.resolve("lib").resolve("graalpy" + GRAALVM_MAJOR + "." + GRAALVM_MINOR), BASE_PATH.resolve(LIBGRAALPY));
+            env.unpackResourceFiles(BASE_PATH.resolve(INCLUDE_FILES), targetDirectory.resolve("include").resolve(pythonMajMin), BASE_PATH.resolve(INCLUDE));
         }
-        // include files are in the same place on all platforms
-        env.unpackResourceFiles(BASE_PATH.resolve(INCLUDE_FILES), targetDirectory, BASE_PATH);
+        // ni files are in the same place on all platforms
+        env.unpackResourceFiles(BASE_PATH.resolve(NI_FILES), targetDirectory, BASE_PATH);
         // native files already have the correct structure
         env.unpackResourceFiles(BASE_PATH.resolve(osArch).resolve(NATIVE_FILES), targetDirectory, BASE_PATH.resolve(osArch));
     }
 
     @Override
     public String versionHash(Env env) {
         StringBuilder sb = new StringBuilder();
-        for (var s : List.of(LIBGRAALPY_SHA256, LIBPYTHON_SHA256, INCLUDE_SHA256, Path.of(env.getOS().toString()).resolve(env.getCPUArchitecture().toString()).resolve(NATIVE_SHA256))) {
+        for (var s : List.of(LIBGRAALPY_SHA256, LIBPYTHON_SHA256, NI_SHA256, INCLUDE_SHA256, Path.of(env.getOS().toString()).resolve(env.getCPUArchitecture().toString()).resolve(NATIVE_SHA256))) {
             try {
                 sb.append(env.readResourceLines(BASE_PATH.resolve(s)).get(0).substring(0, 8));
             } catch (IOException | IndexOutOfBoundsException | InvalidPathException e) {

mx.graalpython/suite.py

@@ -886,6 +886,7 @@
             "dependencies": [
                 "com.oracle.graal.python.resources",
                 "GRAALPYTHON_VERSIONS_RES",
+                "GRAALPYTHON_NI_RESOURCES",
                 "GRAALPYTHON_LIBPYTHON_RESOURCES",
                 "GRAALPYTHON_LIBGRAALPY_RESOURCES",
                 "GRAALPYTHON_INCLUDE_RESOURCES",
@@ -1059,7 +1060,23 @@
             "maven": False,
         },
 
-        # The Python and HPy headers. These go to "/include" on all platforms.
+        "GRAALPYTHON_NI_RESOURCES": {
+            "native": False,
+            "platformDependent": False,
+            "hashEntry":  "META-INF/resources/ni.sha256",
+            "fileListEntry": "META-INF/resources/ni.files",
+            "type": "dir",
+            "description": "GraalVM Python native image resources",
+            "layout": {
+                "./META-INF/resources/": [
+                    "file:mx.graalpython/native-image.properties",
+                ],
+            },
+            "maven": False,
+        },
+
+        # The Python and HPy headers. These go to "/include" on windows and
+        # "/include/python<py_ver:major_minor>" on unix
         "GRAALPYTHON_INCLUDE_RESOURCES": {
             "native": False,
             "platformDependent": False,
@@ -1073,9 +1090,6 @@
                 "com.oracle.graal.python.hpy.llvm",
             ],
             "layout": {
-                "./META-INF/resources/": [
-                    "file:mx.graalpython/native-image.properties",
-                ],
                 "./META-INF/resources/include/": [
                     "file:graalpython/com.oracle.graal.python.cext/include/*",
                     "file:graalpython/com.oracle.graal.python.hpy.llvm/include/*",
@@ -1150,6 +1164,7 @@
             "buildDependencies": [
                 "GRAALPYTHON_LIBPYTHON_RESOURCES",
                 "GRAALPYTHON_LIBGRAALPY_RESOURCES",
+                "GRAALPYTHON_NI_RESOURCES",
                 "GRAALPYTHON_INCLUDE_RESOURCES",
                 "GRAALPYTHON_NATIVE_RESOURCES",
             ],
@@ -1163,8 +1178,11 @@
                             "./lib-graalpython/": [
                                 "dependency:GRAALPYTHON_LIBGRAALPY_RESOURCES/META-INF/resources/libgraalpy/*",
                             ],
+                            "./include/": [
+                                "dependency:GRAALPYTHON_INCLUDE_RESOURCES/META-INF/resources/include/*",
+                            ],
                             "./": [
-                                "dependency:GRAALPYTHON_INCLUDE_RESOURCES/META-INF/resources/*",
+                                "dependency:GRAALPYTHON_NI_RESOURCES/META-INF/resources/*",
                                 "dependency:GRAALPYTHON_NATIVE_RESOURCES/META-INF/resources/<os>/<arch>/*",
                             ],
                         },
@@ -1179,8 +1197,11 @@
                             "./lib/graalpy<graal_ver:major_minor>/": [
                                 "dependency:GRAALPYTHON_LIBGRAALPY_RESOURCES/META-INF/resources/libgraalpy/*",
                             ],
+                            "./include/python<py_ver:major_minor>/": [
+                                "dependency:GRAALPYTHON_INCLUDE_RESOURCES/META-INF/resources/include/*",
+                            ],
                             "./": [
-                                "dependency:GRAALPYTHON_INCLUDE_RESOURCES/META-INF/resources/*",
+                                "dependency:GRAALPYTHON_NI_RESOURCES/META-INF/resources/*",
                                 "dependency:GRAALPYTHON_NATIVE_RESOURCES/META-INF/resources/<os>/<arch>/*",
                             ],
                         },
@@ -1193,7 +1214,6 @@
         "GRAALPY_VIRTUALENV": {
             "native": True, # so it produces a tar, not a jar file
             "platformDependent": False,
-            "maven": False,
             "description": "graalpy-virtualenv plugin sources usable to be installed into other interpreters",
             "layout": {
                 "graalpy_virtualenv": "file:graalpy_virtualenv",