[GR-29778] [GR-37687] Fix stability labels.

PullRequest: graal/11438

Author: gilles-duboscq

espresso/mx.espresso/mx_espresso.py

@@ -183,6 +183,13 @@ def _espresso_gate_runner(args, tasks):
     ],
 )
 
+if mx_sdk_vm.base_jdk_version() not in (11, 17):
+    _espresso_stability = "experimental"
+elif mx.get_os() != "linux" or mx.get_arch() != "amd64":
+    _espresso_stability = "experimental"
+else:
+    _espresso_stability = "supported"
+
 mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVmLanguage(
     suite=_suite,
     name='Java on Truffle',
@@ -208,7 +215,7 @@ def _espresso_gate_runner(args, tasks):
 
 To rebuild the polyglot library:
     gu rebuild-images libpolyglot -cp """ + lib_javavm_cp,
-    stability="supported",
+    stability=_espresso_stability,
 ))
 
 if LLVM_JAVA_HOME:
@@ -238,7 +245,7 @@ def _espresso_gate_runner(args, tasks):
         dependencies=['Java on Truffle', 'LLVM Runtime Native'],
         support_distributions=['espresso:ESPRESSO_LLVM_SUPPORT'],
         priority=2,
-        stability="supported",
+        stability=_espresso_stability,
     ))
 
 
@@ -271,7 +278,7 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
     dependencies=['Java on Truffle'],
     support_libraries_distributions=['espresso:ESPRESSO_JVM_SUPPORT'],
     priority=2,
-    stability="supported",
+    stability=_espresso_stability,
 ))
 
 mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVmLanguage(

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -763,6 +763,14 @@ def _find_escaping_links(root_dir):
                 main_component = _get_main_component(installable_components)
                 mx.logv("Adding gu metadata for{}installable '{}'".format(' disabled ' if _disable_installable(main_component) else ' ', main_component.installable_id))
                 _add(layout, components_dir + 'org.graalvm.' + main_component.installable_id + '.component', "string:" + manifest_str)
+            # Register Core
+            manifest_str = _format_properties({
+                "Bundle-Name": "GraalVM Core",
+                "Bundle-Symbolic-Name": "org.graalvm",
+                "Bundle-Version": _suite.release_version(),
+                "x-GraalVM-Stability-Level": _get_core_stability(),
+            })
+            _add(layout, components_dir + 'org.graalvm.component', "string:" + manifest_str)
 
         for _base, _suites in component_suites.items():
             _metadata = self._get_metadata(_suites)
@@ -2205,6 +2213,22 @@ def _format_properties(data):
     ) + "\n"
 
 
+def _get_component_stability(component):
+    if _src_jdk_version not in (11, 17):
+        return "experimental"
+    if mx.is_darwin() and mx.get_arch() == 'aarch64':
+        return "experimental"
+    return component.stability
+
+
+def _get_core_stability():
+    if _src_jdk_version not in (11, 17):
+        return "experimental"
+    if mx.is_darwin() and mx.get_arch() == 'aarch64':
+        return "experimental"
+    return "supported"
+
+
 def _gen_gu_manifest(components, formatter, bundled=False):
     main_component = _get_main_component(components)
     version = _suite.release_version()
@@ -2221,9 +2245,7 @@ def _gen_gu_manifest(components, formatter, bundled=False):
                                               and (not isinstance(main_component, mx_sdk.GraalVmTool) or main_component.include_by_default))
 
     if main_component.stability is not None:
-        stability = main_component.stability
-        if _src_jdk_version > 11:
-            stability = "experimental"
+        stability = _get_component_stability(main_component)
         manifest["x-GraalVM-Stability-Level"] = stability
         if stability in ("experimental", "earlyadopter", "supported"):
             # set x-GraalVM-Stability for backward compatibility when possible
@@ -3157,7 +3179,7 @@ def graalvm_show(args, forced_graalvm_dist=None):
     print("Config name: {}".format(graalvm_dist.vm_config_name))
     print("Components:")
     for component in graalvm_dist.components:
-        print(" - {} ('{}', /{})".format(component.name, component.short_name, component.dir_name))
+        print(" - {} ('{}', /{}, {})".format(component.name, component.short_name, component.dir_name, _get_component_stability(component)))
 
     if forced_graalvm_dist is None:
         # Custom GraalVM distributions with a forced component list do not yet support launchers and libraries.