[GR-48161] Add supported platforms to multi-platform dir layout distributions.

PullRequest: graalpython/2945

Author: ansalond

mx.graalpython/mx_graalpython.py

@@ -158,8 +158,8 @@ def _get_stdlib_home():
     return os.path.join(SUITE.dir, "graalpython", "lib-python", "3")
 
 
-def _get_capi_home():
-    return mx.distribution("GRAALPYTHON_NATIVE_LIBS").get_output()
+def _get_capi_home(args=None):
+    return os.path.join(mx.distribution("GRAALPYTHON_NATIVE_LIBS").get_output(), mx.get_os(), mx.get_arch())
 
 
 _get_jni_home = _get_capi_home

mx.graalpython/suite.py

@@ -868,13 +868,8 @@
             "os_arch": {
                 "windows": {
                     "<others>": {
-                        "buildDependencies": [
-                            "com.oracle.graal.python.cext",
-                            "com.oracle.graal.python.jni",
-                            "com.oracle.graal.python.hpy.llvm"
-                        ],
                         "layout": {
-                            "./": [
+                            "<os>/<arch>/": [
                                 "dependency:com.oracle.graal.python.jni/*",
                                 "dependency:com.oracle.graal.python.cext/bin/*",
                                 "dependency:com.oracle.graal.python.hpy.llvm/bin/*",
@@ -884,17 +879,8 @@
                 },
                 "<others>": {
                     "<others>": {
-                        "buildDependencies": [
-                            "com.oracle.graal.python.cext",
-                            "com.oracle.graal.python.jni",
-                            "python-libzsupport",
-                            "python-libposix",
-                            "python-libbz2",
-                            "python-liblzma",
-                            "com.oracle.graal.python.hpy.llvm"
-                        ],
                         "layout": {
-                            "./": [
+                            "<os>/<arch>/": [
                                 "dependency:com.oracle.graal.python.jni/*",
                                 "dependency:com.oracle.graal.python.cext/bin/*",
                                 "dependency:python-libzsupport/*",
@@ -907,6 +893,13 @@
                     },
                 },
             },
+            "platforms": [
+                "linux-amd64",
+                "linux-aarch64",
+                "darwin-amd64",
+                "darwin-aarch64",
+                "windows-amd64",
+            ],
             "description": "Contains the JNI native lib, the C API and support libs.",
             "maven": False,
         },
@@ -1147,11 +1140,6 @@
             "fileListEntry": "META-INF/resources/include.files",
             "type": "dir",
             "description": "GraalVM Python header resources",
-            "buildDependencies": [
-                "GRAALPYTHON_NATIVE_LIBS",
-                "com.oracle.graal.python.cext",
-                "com.oracle.graal.python.hpy.llvm",
-            ],
             "layout": {
                 "./META-INF/resources/include/": [
                     "file:graalpython/com.oracle.graal.python.cext/include/*",
@@ -1171,23 +1159,18 @@
             "fileListEntry": "META-INF/resources/<os>/<arch>/native.files",
             "type": "dir",
             "description": "GraalVM Python platform dependent resources",
-            "buildDependencies": [
-                "GRAALPYTHON_NATIVE_LIBS",
-                "com.oracle.graal.python.cext",
-                "com.oracle.graal.python.hpy.llvm"
-            ],
             "os_arch": {
                 "windows": {
                     "<others>": {
                         "layout": {
                             "./META-INF/resources/<os>/<arch>/libs/": [
-                                "dependency:GRAALPYTHON_NATIVE_LIBS/python-native.lib",
+                                "dependency:GRAALPYTHON_NATIVE_LIBS/<os>/<arch>/python-native.lib",
                             ],
                             "./META-INF/resources/<os>/<arch>/lib-graalpython/": [
                                 {
                                     "source_type": "dependency",
                                     "dependency": "GRAALPYTHON_NATIVE_LIBS",
-                                    "path": "*",
+                                    "path": "<os>/<arch>/*",
                                     "exclude": ["python-native.lib"],
                                 },
                             ],
@@ -1198,12 +1181,19 @@
                     "<others>": {
                         "layout": {
                             "./META-INF/resources/<os>/<arch>/lib/graalpy<graal_ver:major_minor>/": [
-                                "dependency:GRAALPYTHON_NATIVE_LIBS/*",
+                                "dependency:GRAALPYTHON_NATIVE_LIBS/<os>/<arch>/*",
                             ],
                         },
                     },
                 },
             },
+            "platforms": [
+                "linux-amd64",
+                "linux-aarch64",
+                "darwin-amd64",
+                "darwin-aarch64",
+                "windows-amd64",
+            ],
             "maven": False,
         },
 
@@ -1223,13 +1213,6 @@
                 "darwin-aarch64",
                 "windows-amd64",
             ],
-            "buildDependencies": [
-                "GRAALPYTHON_LIBPYTHON_RESOURCES",
-                "GRAALPYTHON_LIBGRAALPY_RESOURCES",
-                "GRAALPYTHON_NI_RESOURCES",
-                "GRAALPYTHON_INCLUDE_RESOURCES",
-                "GRAALPYTHON_NATIVE_RESOURCES",
-            ],
             "os_arch": {
                 "windows": {
                     "<others>": {