Update graalvm component lists to include xz.

oracle · Jul 10, 2024 · 7f4a285 · 7f4a285
1 parent 5cee501
commit 7f4a285
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/espresso/mx.espresso/mx_espresso.py b/espresso/mx.espresso/mx_espresso.py
@@ -740,7 +740,7 @@ def register_espresso_envs(suite):
     # pylint: disable=bad-whitespace
     # pylint: disable=line-too-long
     tools = ['cov', 'dap', 'ins', 'insight', 'insightheap', 'lsp', 'pro', 'truffle-json']
-    tregex = ['icu4j', 'rgx']
+    tregex = ['icu4j', 'rgx', 'xz']
     _llvm_toolchain_wrappers = ['bgraalvm-native-clang', 'bgraalvm-native-clang-cl', 'bgraalvm-native-clang++', 'bgraalvm-native-flang', 'bgraalvm-native-ld', 'bgraalvm-native-binutil']
     if espresso_llvm_java_home:
         mx_sdk_vm.register_vm_config('espresso-jvm',       ['java', 'ejvm'       , 'ellvm', 'libpoly', 'nfi-libffi', 'nfi', 'sdk', 'sdkni', 'sdkc', 'sdkl', 'tfl', 'tfla', 'tflc'        , 'cmp', 'antlr4', 'llrc', 'llrlf', 'llrn'                                                    , 'elau'                                                                                                                                                ] + tools + tregex, suite, env_file='jvm-llvm')

diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
@@ -152,10 +152,10 @@ def local_path_to_url(args):
 mx_sdk_vm.register_vm_config('community', ce_unchained_components, _suite, env_file='ce-darwin-aarch64')
 mx_sdk_vm.register_vm_config('community', ce_unchained_components, _suite, env_file='ce')
 # Other GraalVMs
-mx_sdk_vm.register_vm_config('espresso-community', ['antlr4', 'cov', 'dap', 'ejc', 'ejvm', 'ellvm', 'gvm', 'icu4j', 'ins', 'insight', 'insightheap', 'java', 'llp', 'llrc', 'llrlf', 'llrn', 'lsp', 'nfi', 'nfi-libffi', 'nr_lib_javavm', 'pro', 'rgx', 'sdk', 'sdkc', 'sdkl', 'sdkni', 'tfl', 'tfla', 'tflc', 'tflm', 'truffle-json'], _suite, env_file='ce-llvm-espresso')
-mx_sdk_vm.register_vm_config('espresso-community', ['cov', 'dap', 'ejc', 'ejvm', 'gvm', 'icu4j', 'ins', 'insight', 'insightheap', 'java', 'lsp', 'nfi', 'nfi-libffi', 'nr_lib_javavm', 'pro', 'rgx', 'sdk', 'sdkc', 'sdkl', 'sdkni', 'tfl', 'tfla', 'tflc', 'tflm', 'truffle-json'], _suite, env_file='ce-espresso')
-mx_sdk_vm.register_vm_config('ce', ce_components + ['icu4j', 'js', 'jsl', 'jss', 'rgx', 'bnative-image', 'snative-image-agent', 'snative-image-diagnostics-agent'], _suite, dist_name='ce-js', env_file='ce-js')
-mx_sdk_vm.register_vm_config('ce', ce_components + ['icu4j', 'js', 'jsl', 'jss', 'njs', 'njsl', 'rgx', 'sjsvm'], _suite, dist_name='ce', env_file='ce-nodejs')
+mx_sdk_vm.register_vm_config('espresso-community', ['antlr4', 'cov', 'dap', 'ejc', 'ejvm', 'ellvm', 'gvm', 'icu4j', 'xz', 'ins', 'insight', 'insightheap', 'java', 'llp', 'llrc', 'llrlf', 'llrn', 'lsp', 'nfi', 'nfi-libffi', 'nr_lib_javavm', 'pro', 'rgx', 'sdk', 'sdkc', 'sdkl', 'sdkni', 'tfl', 'tfla', 'tflc', 'tflm', 'truffle-json'], _suite, env_file='ce-llvm-espresso')
+mx_sdk_vm.register_vm_config('espresso-community', ['cov', 'dap', 'ejc', 'ejvm', 'gvm', 'icu4j', 'xz', 'ins', 'insight', 'insightheap', 'java', 'lsp', 'nfi', 'nfi-libffi', 'nr_lib_javavm', 'pro', 'rgx', 'sdk', 'sdkc', 'sdkl', 'sdkni', 'tfl', 'tfla', 'tflc', 'tflm', 'truffle-json'], _suite, env_file='ce-espresso')
+mx_sdk_vm.register_vm_config('ce', ce_components + ['icu4j', 'xz', 'js', 'jsl', 'jss', 'rgx', 'bnative-image', 'snative-image-agent', 'snative-image-diagnostics-agent'], _suite, dist_name='ce-js', env_file='ce-js')
+mx_sdk_vm.register_vm_config('ce', ce_components + ['icu4j', 'xz', 'js', 'jsl', 'jss', 'njs', 'njsl', 'rgx', 'sjsvm'], _suite, dist_name='ce', env_file='ce-nodejs')
 mx_sdk_vm.register_vm_config('ce', ce_components_minimal + ['antlr4', 'llrn', 'llp', 'llrc', 'llrl', 'llrlf'], _suite, env_file='ce-llvm')
 mx_sdk_vm.register_vm_config('ce-python', ce_python_components, _suite)
 mx_sdk_vm.register_vm_config('ce-fastr', ce_fastr_components, _suite)