Add tools to espresso standalone

pengxiaolong · May 29, 2024 · 168281f · 168281f
1 parent fa75c0d
commit 168281f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/vm/mx.vm/ce-espresso b/vm/mx.vm/ce-espresso
@@ -1,6 +1,6 @@
-# mx --dy /espresso,/substratevm,/regex --components="Espresso libjvm,Espresso Standalone jvm.cfg,Java on Truffle,Truffle Macro,GraalVM license files,TRegex" --disable-libpolyglot --non-rebuildable-images=lib:javavm --disable-installables=true graalvm-show --print-env
-DYNAMIC_IMPORTS=/espresso,/regex,/sdk,/substratevm,/truffle,/vm
-COMPONENTS=ejc,ejvm,gvm,icu4j,java,nfi,nfi-libffi,rgx,sdk,sdkc,sdkl,sdkni,tfl,tfla,tflc,tflm
+# mx --dy /espresso,/substratevm,/regex,/tools --components="Espresso libjvm,Espresso Standalone jvm.cfg,Java on Truffle,Truffle Macro,GraalVM license files,TRegex,suite:tools" --disable-libpolyglot --non-rebuildable-images=lib:javavm --disable-installables=true graalvm-show --print-env
+DYNAMIC_IMPORTS=/espresso,/regex,/sdk,/substratevm,/tools,/truffle,/vm
+COMPONENTS=cov,dap,ejc,ejvm,gvm,icu4j,ins,insight,insightheap,java,lsp,nfi,nfi-libffi,pro,rgx,sdk,sdkc,sdkl,sdkni,tfl,tfla,tflc,tflm,truffle-json
 EXCLUDE_COMPONENTS=libpoly
 NATIVE_IMAGES=lib:javavm
 DISABLE_INSTALLABLES=True

diff --git a/vm/mx.vm/ce-llvm-espresso b/vm/mx.vm/ce-llvm-espresso
@@ -1,6 +1,6 @@
-# mx --dy /espresso,/substratevm,/sulong,/regex --components="Espresso libjvm,Espresso Standalone jvm.cfg,Java on Truffle LLVM Java libraries,Java on Truffle,LLVM Runtime Native,LLVM.org toolchain,Truffle Macro,GraalVM license files,TRegex" --disable-libpolyglot --non-rebuildable-images=lib:javavm --disable-installables=true graalvm-show --print-env
-DYNAMIC_IMPORTS=/espresso,/regex,/sdk,/substratevm,/sulong,/truffle,/vm
-COMPONENTS=antlr4,ejc,ejvm,ellvm,gvm,icu4j,java,llp,llrc,llrlf,llrn,nfi,nfi-libffi,rgx,sdk,sdkc,sdkl,sdkni,tfl,tfla,tflc,tflm
+# mx --dy /espresso,/substratevm,/sulong,/regex,/tools --components="Espresso libjvm,Espresso Standalone jvm.cfg,Java on Truffle LLVM Java libraries,Java on Truffle,LLVM Runtime Native,LLVM.org toolchain,Truffle Macro,GraalVM license files,TRegex,suite:tools" --disable-libpolyglot --non-rebuildable-images=lib:javavm --disable-installables=true graalvm-show --print-env
+DYNAMIC_IMPORTS=/espresso,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+COMPONENTS=antlr4,cov,dap,ejc,ejvm,ellvm,gvm,icu4j,ins,insight,insightheap,java,llp,llrc,llrlf,llrn,lsp,nfi,nfi-libffi,pro,rgx,sdk,sdkc,sdkl,sdkni,tfl,tfla,tflc,tflm,truffle-json
 EXCLUDE_COMPONENTS=libpoly
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-clang-cl,graalvm-native-flang,graalvm-native-ld,lib:javavm
 DISABLE_INSTALLABLES=True

diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
@@ -152,8 +152,8 @@ 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', 'ejc', 'ejvm', 'ellvm', 'gvm', 'icu4j', 'java', 'llp', 'llrc', 'llrlf', 'llrn', 'nfi', 'nfi-libffi', 'nr_lib_javavm', 'rgx', 'sdk', 'sdkc', 'sdkl', 'sdkni', 'tfl', 'tfla', 'tflc', 'tflm'], _suite, env_file='ce-llvm-espresso')
-mx_sdk_vm.register_vm_config('espresso-community', ['ejc', 'ejvm', 'gvm', 'icu4j', 'java', 'nfi', 'nfi-libffi', 'nr_lib_javavm', 'rgx', 'sdk', 'sdkc', 'sdkl', 'sdkni', 'tfl', 'tfla', 'tflc', 'tflm'], _suite, env_file='ce-espresso')
+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('ce', ce_components_minimal + ['antlr4', 'llrn', 'llp', 'llrc', 'llrl', 'llrlf'], _suite, env_file='ce-llvm')