Native Image Resources Configuration

thermofisher-jch · Aug 16, 2023 · 6d135e6 · 6d135e6
1 parent 0e8c351
commit 6d135e6
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 25 deletions.
diff --git a/mx.truffleruby/mx_truffleruby.py b/mx.truffleruby/mx_truffleruby.py
@@ -253,6 +253,7 @@ def verify_ci(args):
     ],
     support_distributions=[
         'truffleruby:TRUFFLERUBY_GRAALVM_SUPPORT',
+        'truffleruby:TRUFFLERUBY_GRAALVM_SUPPORT_NO_NI_RESOURCES',
     ],
     provided_executables=[
         'bin/bundle',

diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -440,29 +440,11 @@
         },
 
         "TRUFFLERUBY_GRAALVM_SUPPORT": {
+            "fileListPurpose": 'native-image-resources',
             "native": True,
             "platformDependent": True,
             "description": "TruffleRuby support distribution for the GraalVM",
             "layout": {
-                "./": [
-                    "file:CHANGELOG.md",
-                    "file:README.md",
-                    "file:mx.truffleruby/native-image.properties",
-                ],
-                "bin/": [
-                    "file:exe/*",
-                ],
-                "doc/": [
-                    "file:doc/user",
-                    "file:doc/legal",
-                ],
-                "logo/": [
-                    "file:logo/ATTRIBUTION.md",
-                    "file:logo/LICENSE.txt",
-                ],
-                "logo/png/": [
-                    "file:logo/png/truffleruby_logo_horizontal_medium.png",
-                ],
                 "lib/": [
                     "file:lib/json",
                     "file:lib/mri",
@@ -509,6 +491,39 @@
                 "lib/truffle/": [
                     "dependency:org.truffleruby.cext/src/main/c/spawn-helper/spawn-helper",
                 ],
+            },
+            "license": [
+                "EPL-2.0",          # JRuby (we're choosing EPL out of EPL,GPL,LGPL)
+                "MIT",              # minitest, did_you_mean, rake
+                "BSD-simplified",   # MRI
+                "BSD-new",          # Rubinius, FFI
+            ],
+        },
+
+        "TRUFFLERUBY_GRAALVM_SUPPORT_NO_NI_RESOURCES": {
+            "native": True,
+            "platformDependent": True,
+            "description": "TruffleRuby support distribution for the GraalVM, the contents is not included as native image resources.",
+            "layout": {
+                "./": [
+                    "file:CHANGELOG.md",
+                    "file:README.md",
+                    "file:mx.truffleruby/native-image.properties",
+                ],
+                "bin/": [
+                    "file:exe/*",
+                ],
+                "doc/": [
+                    "file:doc/user",
+                    "file:doc/legal",
+                ],
+                "logo/": [
+                    "file:logo/ATTRIBUTION.md",
+                    "file:logo/LICENSE.txt",
+                ],
+                "logo/png/": [
+                    "file:logo/png/truffleruby_logo_horizontal_medium.png",
+                ],
                 "src/main/c/openssl/": [
                     "file:src/main/c/openssl/extconf.rb",
                     "file:src/main/c/openssl/*.c",
@@ -519,15 +534,10 @@
                     },
                 ],
             },
-            "license": [
-                "EPL-2.0",          # JRuby (we're choosing EPL out of EPL,GPL,LGPL)
-                "MIT",              # minitest, did_you_mean, rake
-                "BSD-simplified",   # MRI
-                "BSD-new",          # Rubinius, FFI
-            ],
         },
 
         "TRUFFLERUBY_GRAALVM_LICENSES": {
+            "fileListPurpose": 'native-image-resources',
             "native": True,
             "platformDependent": True,
             "description": "TruffleRuby support distribution for the GraalVM license files",