[GR-45794] TruffleRuby EE standalone includes Sulong Enterprise.

PullRequest: truffleruby/3854

Author: ansalond

common.json

@@ -35,12 +35,12 @@
     "labsjdk-ee-20-llvm": {"name": "labsjdk",   "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true },
 
     "oraclejdk21":        {"name": "jpg-jdk",   "version": "21",      "build_id": "23", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ce-21+23-jvmci-23.1-b04", "platformspecific": true },
-    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ce-21+23-jvmci-23.1-b04-debug", "platformspecific": true },
-    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21+23-jvmci-23.1-b04-sulong", "platformspecific": true },
-    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21+23-jvmci-23.1-b04", "platformspecific": true },
-    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21+23-jvmci-23.1-b04-debug", "platformspecific": true },
-    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21+23-jvmci-23.1-b04-sulong", "platformspecific": true }
+    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ce-21+24-jvmci-23.1-b05", "platformspecific": true },
+    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ce-21+24-jvmci-23.1-b05-debug", "platformspecific": true },
+    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21+24-jvmci-23.1-b05-sulong", "platformspecific": true },
+    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21+24-jvmci-23.1-b05", "platformspecific": true },
+    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21+24-jvmci-23.1-b05-debug", "platformspecific": true },
+    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21+24-jvmci-23.1-b05-sulong", "platformspecific": true }
 
   },
 

mx.truffleruby/mx_truffleruby.py

@@ -227,6 +227,12 @@ def verify_ci(args):
     stability="experimental",
 ))
 
+standalone_dependencies_common = {
+    'LLVM Runtime Core': ('lib/sulong', []),
+    'LLVM Runtime Native': ('lib/sulong', []),
+    'LLVM.org toolchain': ('lib/llvm-toolchain', []),
+}
+
 mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVmLanguage(
     suite=_suite,
     name='TruffleRuby',
@@ -235,13 +241,15 @@ def verify_ci(args):
     standalone_dir_name='truffleruby-<version>-<graalvm_os>-<arch>',
     license_files=[],
     third_party_license_files=[],
-    dependencies=['rbyl', 'Truffle', 'Truffle NFI', 'LLVM Runtime Native', 'LLVM.org toolchain', 'TRegex'],
-    standalone_dependencies={
-        'LLVM Runtime Core': ('lib/sulong', []),
-        'LLVM Runtime Native': ('lib/sulong', []),
-        'LLVM.org toolchain': ('lib/llvm-toolchain', []),
-        'rbyl': ('', []), # Use short name for license to select by priority
-    },
+    dependencies=['rbyl', 'Truffle', 'Truffle NFI', 'LLVM Runtime Native', 'LLVM.org toolchain', 'TRegex'],  # Use short name for license to select by priority
+    standalone_dependencies={**standalone_dependencies_common, **{
+        'TruffleRuby license files': ('', []),
+    }},
+    standalone_dependencies_enterprise={**standalone_dependencies_common, **{
+        'LLVM Runtime Enterprise': ('lib/sulong', []),
+        'LLVM Runtime Native Enterprise': ('lib/sulong', []),
+        'TruffleRuby license files EE': ('', []),
+    }},
     truffle_jars=[
         # Distributions
         'truffleruby:TRUFFLERUBY',

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "faff236da4ee3085721970fcd6de0d187e4fe611",
+                "version": "8e346652d0b2022a8416076c6e6c90a9acee7830",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "faff236da4ee3085721970fcd6de0d187e4fe611",
+                "version": "8e346652d0b2022a8416076c6e6c90a9acee7830",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},