[GR-45794] The Python EE standalone includes LLVM EE.

PullRequest: graalpython/2812

Author: ansalond

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "d5b4064ebdf5a27a1fd07e706a5e5c52016b5c70" }
+{ "overlay": "b676f3e9a8ed96de8f3df5b9f20677e5d15586a9" }

mx.graalpython/mx_graalpython.py

@@ -1970,6 +1970,12 @@ def verify_ci(dest_suite, common_ci_dir="ci_common", args=None, ext=('.jsonnet',
 ))
 
 
+standalone_dependencies_common = {
+    'LLVM Runtime Core': ('lib/sulong', []),
+    'LLVM Runtime Native': ('lib/sulong', []),
+    'LLVM.org toolchain': ('lib/llvm-toolchain', []),
+}
+
 mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
     suite=SUITE,
     name='GraalVM Python',
@@ -1987,12 +1993,15 @@ def verify_ci(dest_suite, common_ci_dir="ci_common", args=None, ext=('.jsonnet',
         'TRegex',
         'ICU4J',
     ],
-    standalone_dependencies={
-        'LLVM Runtime Core': ('lib/sulong', []),
-        'LLVM Runtime Native': ('lib/sulong', []),
-        'LLVM.org toolchain': ('lib/llvm-toolchain', []),
+    standalone_dependencies={**standalone_dependencies_common, **{
         'GraalVM Python license files': ('', []),
-    },
+    }},
+    standalone_dependencies_enterprise={**standalone_dependencies_common, **{
+        'LLVM Runtime Enterprise': ('lib/sulong', []),
+        'LLVM Runtime Native Enterprise': ('lib/sulong', []),
+        'GraalVM Python license files EE': ('', []),
+        'GraalVM enterprise license files': ('', ['LICENSE.txt', 'GRAALVM-README.md']),
+    }},
     truffle_jars=[
         'graalpython:GRAALPYTHON',
         'graalpython:BOUNCYCASTLE-PROVIDER',

mx.graalpython/suite.py

@@ -44,31 +44,31 @@
             },
             {
                 "name": "sdk",
-                "version": "1278cae8aab28d43939aefaf699e1c09d529715b",
+                "version": "27509a3069b251692a860ef13a577832d8260f9f",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "1278cae8aab28d43939aefaf699e1c09d529715b",
+                "version": "27509a3069b251692a860ef13a577832d8260f9f",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "1278cae8aab28d43939aefaf699e1c09d529715b",
+                "version": "27509a3069b251692a860ef13a577832d8260f9f",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "1278cae8aab28d43939aefaf699e1c09d529715b",
+                "version": "27509a3069b251692a860ef13a577832d8260f9f",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},