Set DeliverableStandaloneArchive language_id for all languages

Author: eregon

sdk/mx.sdk/mx_sdk_vm_ng.py

@@ -1025,6 +1025,16 @@ def __init__(self, suite, name=None, deps=None, excludedLibs=None, platformDepen
         # required but optional for compatibility and when the default *_dist_name are not good enough
         language_id = kw_args.pop('language_id', None)
 
+        # TODO: remove this when language_id is set in those suites
+        mapping = {
+            'graal-js': 'js',
+            'graal-nodejs': 'nodejs',
+            'truffleruby': 'ruby',
+            'graalpython': 'python',
+        }
+        if not language_id and suite.name in mapping:
+            language_id = mapping[suite.name]
+
         # optional, derived from *_archive_name by default. Best left as default to avoid extra folder when extracting with some GUIs.
         community_dir_name = kw_args.pop('community_dir_name', None)
         enterprise_dir_name = kw_args.pop('enterprise_dir_name', None)

sulong/mx.sulong/suite.py

@@ -2163,17 +2163,21 @@
         "class": "DeliverableStandaloneArchive",
         "platformDependent": True,
         "standalone_dist": "SULONG_NATIVE_STANDALONE",
+        "language_id": "llvm",
         "community_archive_name": "llvm-community",
         "enterprise_archive_name": "llvm-unused", # should not be used as it lacks the managed toolchain
+        "enterprise_dist_name": "SULONG_NATIVE_UNUSED_ENTERPRISE_NATIVE_STANDALONE",
         "defaultBuild": False,
     },
 
     "SULONG_JVM_STANDALONE_RELEASE_ARCHIVE": {
         "class": "DeliverableStandaloneArchive",
         "platformDependent": True,
         "standalone_dist": "SULONG_JVM_STANDALONE",
+        "language_id": "llvm",
         "community_archive_name": "llvm-community-jvm",
         "enterprise_archive_name": "llvm-unused-jvm", # should not be used as it lacks the managed toolchain
+        "enterprise_dist_name": "SULONG_NATIVE_UNUSED_ENTERPRISE_JVM_STANDALONE",
         "defaultBuild": False,
     },
 

wasm/mx.wasm/suite.py

@@ -500,6 +500,7 @@
         "class": "DeliverableStandaloneArchive",
         "platformDependent": True,
         "standalone_dist": "GRAALWASM_NATIVE_STANDALONE",
+        "language_id": "wasm",
         "community_archive_name": "graalwasm-community",
         "enterprise_archive_name": "graalwasm",
     },
@@ -508,6 +509,7 @@
         "class": "DeliverableStandaloneArchive",
         "platformDependent": True,
         "standalone_dist": "GRAALWASM_JVM_STANDALONE",
+        "language_id": "wasm",
         "community_archive_name": "graalwasm-community-jvm",
         "enterprise_archive_name": "graalwasm-jvm",
     },