Skip to content

Commit c1d8453

Browse files
committed
[GR-47429] Proper exports now that truffleruby launcher and language are on module path
PullRequest: truffleruby/3943
2 parents 14e0cc5 + 8f66c49 commit c1d8453

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

common.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true },
3636

3737
"oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "33", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
38-
"labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+33-jvmci-23.1-b11", "platformspecific": true },
39-
"labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+33-jvmci-23.1-b11-debug", "platformspecific": true },
40-
"labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+33-jvmci-23.1-b11-sulong", "platformspecific": true },
41-
"labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+33-jvmci-23.1-b11", "platformspecific": true },
42-
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+33-jvmci-23.1-b11-debug", "platformspecific": true },
43-
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+33-jvmci-23.1-b11-sulong", "platformspecific": true },
38+
"labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+34-jvmci-23.1-b12", "platformspecific": true },
39+
"labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+34-jvmci-23.1-b12-debug", "platformspecific": true },
40+
"labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+34-jvmci-23.1-b12-sulong", "platformspecific": true },
41+
"labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+34-jvmci-23.1-b12", "platformspecific": true },
42+
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+34-jvmci-23.1-b12-debug", "platformspecific": true },
43+
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+34-jvmci-23.1-b12-sulong", "platformspecific": true },
4444

4545
"oraclejdk22": {"name": "jpg-jdk", "version": "22", "build_id": "2", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}
4646
},

mx.truffleruby/jvm-py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
GRAALVM_SKIP_ARCHIVE=true
22
DYNAMIC_IMPORTS=/tools,graalpython
3-
COMPONENTS=TruffleRuby,suite:tools,Graal.Python
3+
COMPONENTS=TruffleRuby,suite:tools,GraalVM Python

mx.truffleruby/mx_truffleruby.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ def verify_ci(args):
267267
'truffleruby:TRUFFLERUBY',
268268
'truffleruby:TRUFFLERUBY-SHARED',
269269
'truffleruby:TRUFFLERUBY-ANNOTATIONS',
270-
# Libraries
271270
'sdk:JLINE3',
271+
# Libraries
272272
'truffleruby:JCODINGS',
273273
'truffleruby:JONI',
274274
],

mx.truffleruby/suite.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{
2121
"name": "regex",
2222
"subdir": True,
23-
"version": "80dd3d3b90b44a4e5050046783bc904b02eb3669",
23+
"version": "5d3f38217ee7bc80f1287640bf1e7499db37ae98",
2424
"urls": [
2525
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2626
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
2929
{
3030
"name": "sulong",
3131
"subdir": True,
32-
"version": "80dd3d3b90b44a4e5050046783bc904b02eb3669",
32+
"version": "5d3f38217ee7bc80f1287640bf1e7499db37ae98",
3333
"urls": [
3434
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
3535
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -262,8 +262,8 @@
262262
"regex:TREGEX",
263263
"sulong:SULONG_API",
264264
"sulong:SULONG_NFI",
265-
# Libraries, keep in sync with TRUFFLERUBY.exclude and truffle_jars (in mx_truffleruby.py)
266265
"sdk:JLINE3",
266+
# Libraries, keep in sync with TRUFFLERUBY.exclude and truffle_jars (in mx_truffleruby.py)
267267
"truffleruby:JCODINGS",
268268
"truffleruby:JONI",
269269
],
@@ -423,8 +423,8 @@
423423
"moduleInfo": {
424424
"name": "org.graalvm.ruby.shared",
425425
"exports": [
426-
"org.truffleruby.shared",
427-
"org.truffleruby.shared.options",
426+
"org.truffleruby.shared to org.graalvm.ruby, org.graalvm.ruby.launcher",
427+
"org.truffleruby.shared.options to org.graalvm.ruby, org.graalvm.ruby.launcher",
428428
],
429429
},
430430
"dependencies": [
@@ -489,9 +489,9 @@
489489
"regex:TREGEX",
490490
"sulong:SULONG_API",
491491
"sulong:SULONG_NFI",
492+
"sdk:JLINE3",
492493
],
493494
"exclude": [ # Keep in sync with org.truffleruby dependencies and truffle_jars in mx_truffleruby.py
494-
"sdk:JLINE3",
495495
"truffleruby:JCODINGS",
496496
"truffleruby:JONI",
497497
],

tool/make-standalone-distribution.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -e
1010
set -x
1111

1212
# Build
13-
bin/jt build --env native
13+
bin/jt build --env native -- --targets=GRAALVM_STANDALONES
1414

1515
standalone=$(bin/jt mx --env native standalone-home ruby)
1616
release_home="$PWD/mxbuild/truffleruby-standalone"

0 commit comments

Comments
 (0)