[GR-47429] Proper exports now that truffleruby launcher and language are on module path

PullRequest: truffleruby/3943

Author: eregon

common.json

@@ -35,12 +35,12 @@
     "labsjdk-ee-20-llvm": {"name": "labsjdk",   "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true },
 
     "oraclejdk21":        {"name": "jpg-jdk",   "version": "21",      "build_id": "33", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ce-21+33-jvmci-23.1-b11", "platformspecific": true },
-    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ce-21+33-jvmci-23.1-b11-debug", "platformspecific": true },
-    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21+33-jvmci-23.1-b11-sulong", "platformspecific": true },
-    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21+33-jvmci-23.1-b11", "platformspecific": true },
-    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21+33-jvmci-23.1-b11-debug", "platformspecific": true },
-    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21+33-jvmci-23.1-b11-sulong", "platformspecific": true },
+    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ce-21+34-jvmci-23.1-b12", "platformspecific": true },
+    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ce-21+34-jvmci-23.1-b12-debug", "platformspecific": true },
+    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21+34-jvmci-23.1-b12-sulong", "platformspecific": true },
+    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21+34-jvmci-23.1-b12", "platformspecific": true },
+    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21+34-jvmci-23.1-b12-debug", "platformspecific": true },
+    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21+34-jvmci-23.1-b12-sulong", "platformspecific": true },
 
     "oraclejdk22":        {"name": "jpg-jdk",   "version": "22",      "build_id": "2", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}
   },

mx.truffleruby/jvm-py

@@ -1,3 +1,3 @@
 GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,graalpython
-COMPONENTS=TruffleRuby,suite:tools,Graal.Python
+COMPONENTS=TruffleRuby,suite:tools,GraalVM Python

mx.truffleruby/mx_truffleruby.py

@@ -267,8 +267,8 @@ def verify_ci(args):
         'truffleruby:TRUFFLERUBY',
         'truffleruby:TRUFFLERUBY-SHARED',
         'truffleruby:TRUFFLERUBY-ANNOTATIONS',
-        # Libraries
         'sdk:JLINE3',
+        # Libraries
         'truffleruby:JCODINGS',
         'truffleruby:JONI',
     ],

mx.truffleruby/suite.py

@@ -20,7 +20,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "80dd3d3b90b44a4e5050046783bc904b02eb3669",
+                "version": "5d3f38217ee7bc80f1287640bf1e7499db37ae98",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "80dd3d3b90b44a4e5050046783bc904b02eb3669",
+                "version": "5d3f38217ee7bc80f1287640bf1e7499db37ae98",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -262,8 +262,8 @@
                 "regex:TREGEX",
                 "sulong:SULONG_API",
                 "sulong:SULONG_NFI",
-                # Libraries, keep in sync with TRUFFLERUBY.exclude and truffle_jars (in mx_truffleruby.py)
                 "sdk:JLINE3",
+                # Libraries, keep in sync with TRUFFLERUBY.exclude and truffle_jars (in mx_truffleruby.py)
                 "truffleruby:JCODINGS",
                 "truffleruby:JONI",
             ],
@@ -423,8 +423,8 @@
             "moduleInfo": {
                 "name": "org.graalvm.ruby.shared",
                 "exports": [
-                    "org.truffleruby.shared",
-                    "org.truffleruby.shared.options",
+                    "org.truffleruby.shared to org.graalvm.ruby, org.graalvm.ruby.launcher",
+                    "org.truffleruby.shared.options to org.graalvm.ruby, org.graalvm.ruby.launcher",
                 ],
             },
             "dependencies": [
@@ -489,9 +489,9 @@
                 "regex:TREGEX",
                 "sulong:SULONG_API",
                 "sulong:SULONG_NFI",
+                "sdk:JLINE3",
             ],
             "exclude": [ # Keep in sync with org.truffleruby dependencies and truffle_jars in mx_truffleruby.py
-                "sdk:JLINE3",
                 "truffleruby:JCODINGS",
                 "truffleruby:JONI",
             ],

tool/make-standalone-distribution.sh

@@ -10,7 +10,7 @@ set -e
 set -x
 
 # Build
-bin/jt build --env native
+bin/jt build --env native -- --targets=GRAALVM_STANDALONES
 
 standalone=$(bin/jt mx --env native standalone-home ruby)
 release_home="$PWD/mxbuild/truffleruby-standalone"