Skip to content

Commit e411cd5

Browse files
ansalondgilles-duboscq
authored andcommitted
Fix component registration.
1 parent 643733f commit e411cd5

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
@@ -118,14 +118,28 @@ def ruby_testdownstream_sulong(args):
118118
jt('test', 'cexts')
119119
jt('test', 'bundle')
120120

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

mx.truffleruby/suite.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,6 @@
382382
"file:README.md",
383383
"file:mx.truffleruby/native-image.properties",
384384
],
385-
"LICENSE_TRUFFLERUBY.md": "file:LICENCE.md",
386-
"3rd_party_licenses_truffleruby.txt": "file:3rd_party_licenses.txt",
387385
"bin/": [
388386
"file:bin/bundle",
389387
"file:bin/bundler",
@@ -483,6 +481,16 @@
483481
],
484482
},
485483

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

0 commit comments

Comments
 (0)