diff --git a/mx.truffleruby/mx_truffleruby.py b/mx.truffleruby/mx_truffleruby.py index 9009ba07ba8a..f3899c5c309b 100644 --- a/mx.truffleruby/mx_truffleruby.py +++ b/mx.truffleruby/mx_truffleruby.py @@ -227,6 +227,12 @@ def verify_ci(args): stability="experimental", )) +standalone_dependencies_common = { + 'LLVM Runtime Core': ('lib/sulong', []), + 'LLVM Runtime Native': ('lib/sulong', []), + 'LLVM.org toolchain': ('lib/llvm-toolchain', []), +} + mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVmLanguage( suite=_suite, name='TruffleRuby', @@ -235,13 +241,16 @@ def verify_ci(args): standalone_dir_name='truffleruby---', license_files=[], third_party_license_files=[], - dependencies=['rbyl', 'Truffle', 'Truffle NFI', 'LLVM Runtime Native', 'LLVM.org toolchain', 'TRegex'], - standalone_dependencies={ - 'LLVM Runtime Core': ('lib/sulong', []), - 'LLVM Runtime Native': ('lib/sulong', []), - 'LLVM.org toolchain': ('lib/llvm-toolchain', []), - 'rbyl': ('', []), # Use short name for license to select by priority - }, + dependencies=['rbyl', 'Truffle', 'Truffle NFI', 'LLVM Runtime Native', 'LLVM.org toolchain', 'TRegex'], # Use short name for license to select by priority + standalone_dependencies={**standalone_dependencies_common, **{ + 'TruffleRuby license files': ('', []), + }}, + standalone_dependencies_enterprise={**standalone_dependencies_common, **{ + 'LLVM Runtime Enterprise': ('lib/sulong', []), + 'LLVM Runtime Native Enterprise': ('lib/sulong', []), + 'TruffleRuby license files EE': ('', []), + 'GraalVM enterprise license files': ('', ['LICENSE.txt', 'GRAALVM-README.md']), + }}, truffle_jars=[ 'truffleruby:TRUFFLERUBY', 'truffleruby:TRUFFLERUBY-SHARED', diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py index 9affafae1e6d..b58698ed6be8 100644 --- a/mx.truffleruby/suite.py +++ b/mx.truffleruby/suite.py @@ -7,7 +7,7 @@ { "name": "regex", "subdir": True, - "version": "fa8a4eb585805b7ee82bcb5c82e7dbc0dd081136", + "version": "bf9b50cc88c919c0858c782a03d1badd6382a8d4", "urls": [ {"url": "https://github.com/oracle/graal.git", "kind": "git"}, {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"}, @@ -16,7 +16,7 @@ { "name": "sulong", "subdir": True, - "version": "fa8a4eb585805b7ee82bcb5c82e7dbc0dd081136", + "version": "bf9b50cc88c919c0858c782a03d1badd6382a8d4", "urls": [ {"url": "https://github.com/oracle/graal.git", "kind": "git"}, {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},