[GR-44803] Avoid repackaging jars in truffleruby.jar

PullRequest: truffleruby/3709

Author: eregon

mx.truffleruby/mx_truffleruby.py

@@ -245,7 +245,10 @@ def verify_ci(args):
     truffle_jars=[
         'truffleruby:TRUFFLERUBY',
         'truffleruby:TRUFFLERUBY-SHARED',
-        'truffleruby:TRUFFLERUBY-ANNOTATIONS'
+        'truffleruby:TRUFFLERUBY-ANNOTATIONS',
+        'sdk:JLINE3',
+        'truffleruby:JCODINGS',
+        'truffleruby:JONI',
     ],
     boot_jars=[
         'truffleruby:TRUFFLERUBY-SERVICES'

mx.truffleruby/suite.py

@@ -204,16 +204,18 @@
                 "jdk.management",
                 "jdk.unsupported", # sun.misc.Signal
             ],
-            "dependencies": [
+            "dependencies": [ # Keep in sync with TRUFFLERUBY distDependencies and exclude
+                # Distributions
                 "truffleruby:TRUFFLERUBY-ANNOTATIONS",
                 "truffleruby:TRUFFLERUBY-SHARED",
                 "truffle:TRUFFLE_API",
                 "truffle:TRUFFLE_NFI",
-                "sdk:JLINE3",
                 "regex:TREGEX",
                 "sulong:SULONG_API",
-                "JONI",
-                "JCODINGS",
+                # Libraries
+                "sdk:JLINE3",
+                "truffleruby:JCODINGS",
+                "truffleruby:JONI",
             ],
             "annotationProcessors": [
                 "truffle:TRUFFLE_DSL_PROCESSOR",
@@ -275,7 +277,7 @@
                 "org.truffleruby",
                 "org.truffleruby.services",
                 "mx:JUNIT",
-                "NETBEANS-LIB-PROFILER",
+                "truffleruby:NETBEANS-LIB-PROFILER",
                 "sdk:LAUNCHER_COMMON"
             ],
             "javaCompliance": "17+",
@@ -394,18 +396,22 @@
         },
 
         "TRUFFLERUBY": {
-            "mainClass": "org.truffleruby.launcher.RubyLauncher",
             "dependencies": [
                 "org.truffleruby",
                 "org.truffleruby.ruby",
             ],
-            "distDependencies": [
-                "regex:TREGEX",
+            "distDependencies": [ # Keep in sync with org.truffleruby dependencies
+                "truffleruby:TRUFFLERUBY-ANNOTATIONS",
+                "truffleruby:TRUFFLERUBY-SHARED",
                 "truffle:TRUFFLE_API",
                 "truffle:TRUFFLE_NFI",
+                "regex:TREGEX",
                 "sulong:SULONG_API",
-                "truffleruby:TRUFFLERUBY-ANNOTATIONS",
-                "truffleruby:TRUFFLERUBY-SHARED",
+            ],
+            "exclude": [ # Keep in sync with org.truffleruby dependencies and truffle_jars in mx_truffleruby.py
+                "sdk:JLINE3",
+                "truffleruby:JCODINGS",
+                "truffleruby:JONI",
             ],
             "description": "TruffleRuby",
             "license": [
@@ -556,10 +562,10 @@
             ],
             "exclude": [
                 "mx:HAMCREST",
-                "mx:JUNIT"
+                "mx:JUNIT",
+                "truffleruby:NETBEANS-LIB-PROFILER",
             ],
             "distDependencies": [
-                "NETBEANS-LIB-PROFILER",
                 "sdk:LAUNCHER_COMMON",
                 "TRUFFLERUBY",
                 "TRUFFLERUBY-SERVICES",