Skip to content

Commit c1b7c52

Browse files
committed
Fix component registration.
1 parent fc03503 commit c1b7c52

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

mx.truffleruby/mx_truffleruby.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,28 @@ def ruby_testdownstream_sulong(args):
117117
jt('test', 'cexts')
118118
jt('test', 'bundle')
119119

120+
mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
121+
suite=_suite,
122+
name='TruffleRuby license files',
123+
short_name='rbyl',
124+
dir_name='ruby',
125+
license_files=['LICENSE_TRUFFLERUBY.md'],
126+
third_party_license_files=['3rd_party_licenses_truffleruby.txt'],
127+
truffle_jars=[],
128+
support_distributions=[
129+
'truffleruby:TRUFFLERUBY_GRAALVM_LICENSES',
130+
],
131+
priority=5,
132+
))
133+
120134
mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
121135
suite=_suite,
122136
name='TruffleRuby',
123137
short_name='rby',
124138
dir_name='ruby',
125139
standalone_dir_name='truffleruby-<version>-<graalvm_os>-<arch>',
126-
license_files=['LICENSE_TRUFFLERUBY.md'],
127-
third_party_license_files=['3rd_party_licenses_truffleruby.txt'],
140+
license_files=[],
141+
third_party_license_files=[],
128142
truffle_jars=[
129143
'truffleruby:TRUFFLERUBY',
130144
'truffleruby:TRUFFLERUBY-SHARED',

mx.truffleruby/suite.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,6 @@
383383
"file:README.md",
384384
"file:mx.truffleruby/native-image.properties",
385385
],
386-
"LICENSE_TRUFFLERUBY.md": "file:LICENCE.md",
387-
"3rd_party_licenses_truffleruby.txt": "file:3rd_party_licenses.txt",
388386
"bin/": [
389387
"file:bin/bundle",
390388
"file:bin/bundler",
@@ -484,6 +482,16 @@
484482
],
485483
},
486484

485+
"TRUFFLERUBY_GRAALVM_LICENSES": {
486+
"native": True,
487+
"platformDependent": True,
488+
"description": "TruffleRuby support distribution for the GraalVM license files",
489+
"layout": {
490+
"LICENSE_TRUFFLERUBY.md": "file:LICENCE.md",
491+
"3rd_party_licenses_truffleruby.txt": "file:3rd_party_licenses.txt",
492+
},
493+
},
494+
487495
"TRUFFLERUBY-TEST": {
488496
"dependencies": [
489497
"org.truffleruby.test",

0 commit comments

Comments
 (0)