[GR-47432] Use the Maven Downloader as a jar

eregon · andrykonchin · commit 6738e1d9fe6b · 2023-09-11T12:46:09.000+03:00
PullRequest: truffleruby/3993 (cherry picked from commit 260d07b)
diff --git a/mx.truffleruby/env_files.md b/mx.truffleruby/env_files.md
@@ -1,12 +1,12 @@
 Here is how the various env files relate to each other:
 * `jvm`
   * `jvm-ce`: + GraalVM Community Compiler
-    * `jvm-ce-ntl`: + native toolchain launchers + `truffleruby-polyglot-get`
+    * `jvm-ce-ntl`: + native toolchain launchers
       * `jvm-ce-libgraal`: + libgraal
       * `native`: + librubyvm + `Truffle Macro`
         * `native-host-inlining`: + `TruffleHostInliningPrintExplored`, - native toolchain launchers
   * `jvm-ee`: + Oracle GraalVM Compiler + `Truffle enterprise`
-    * `jvm-ee-ntl`: + native toolchain launchers + `truffleruby-polyglot-get`
+    * `jvm-ee-ntl`: + native toolchain launchers
       * `jvm-ee-libgraal`: + libgraal
       * `native-ee`: + librubyvm + `Truffle Macro Enterprise` + Native Image G1
         * `native-ee-aux`: + `AuxiliaryEngineCache`, - Native Image G1 (currently incompatible)
diff --git a/mx.truffleruby/jvm-ce-libgraal b/mx.truffleruby/jvm-ce-libgraal
@@ -1,7 +1,7 @@
 GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM,LibGraal
-NATIVE_IMAGES=suite:sulong,truffleruby-polyglot-get,lib:jvmcicompiler
+NATIVE_IMAGES=suite:sulong,lib:jvmcicompiler
 # To also create the standalone
 INSTALLABLES=TruffleRuby
 BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/jvm-ce-ntl b/mx.truffleruby/jvm-ce-ntl
@@ -1,7 +1,7 @@
 GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM
-NATIVE_IMAGES=suite:sulong,truffleruby-polyglot-get
+NATIVE_IMAGES=suite:sulong
 # To also create the standalone
 INSTALLABLES=TruffleRuby
 BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/jvm-ee-libgraal b/mx.truffleruby/jvm-ee-libgraal
@@ -1,7 +1,7 @@
 GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/truffleruby-enterprise,/graal-enterprise,/substratevm-enterprise
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,Truffle enterprise,SubstrateVM Enterprise,LibGraal Enterprise
-NATIVE_IMAGES=suite:sulong,truffleruby-polyglot-get,lib:jvmcicompiler
+NATIVE_IMAGES=suite:sulong,lib:jvmcicompiler
 # To also create the standalone
 INSTALLABLES=TruffleRuby
 BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/jvm-ee-ntl b/mx.truffleruby/jvm-ee-ntl
@@ -1,7 +1,7 @@
 GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/truffleruby-enterprise,/graal-enterprise,/substratevm-enterprise
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,Truffle enterprise,SubstrateVM Enterprise
-NATIVE_IMAGES=suite:sulong,truffleruby-polyglot-get
+NATIVE_IMAGES=suite:sulong
 # To also create the standalone
 INSTALLABLES=TruffleRuby
 BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
diff --git a/mx.truffleruby/mx_truffleruby.py b/mx.truffleruby/mx_truffleruby.py
@@ -299,8 +299,8 @@ def ruby_maven_deploy_public(args):
     library_configs=[
         mx_sdk_vm.LanguageLibraryConfig(
             destination='lib/<lib:rubyvm>',
-            launchers=['bin/<exe:ruby>', 'bin/<exe:truffleruby>'],
-            jar_distributions=['truffleruby:TRUFFLERUBY-LAUNCHER'],
+            launchers=['bin/<exe:ruby>', 'bin/<exe:truffleruby>', 'bin/<exe:truffleruby-polyglot-get>'],
+            jar_distributions=['truffleruby:TRUFFLERUBY-LAUNCHER', 'sdk:MAVEN_DOWNLOADER'],
             main_class='org.truffleruby.launcher.RubyLauncher',
             build_args=[
                 '-H:+DetectUserDirectoriesInImageHeap',
@@ -314,17 +314,6 @@ def ruby_maven_deploy_public(args):
             ]
         )
     ],
-    launcher_configs=[
-        mx_sdk_vm.LauncherConfig(
-            destination='bin/<exe:truffleruby-polyglot-get>',
-            jar_distributions=['sdk:MAVEN_DOWNLOADER'],
-            main_class='org.graalvm.maven.downloader.Main',
-            build_args=[
-               '-Dorg.graalvm.maven.downloader.relative_output_dir=../modules',
-               f'-Dorg.graalvm.maven.downloader.default_version={mx.suite("sdk").release_version()}',
-           ],
-        ),
-    ],
     stability="experimental",
     post_install_msg="""
 IMPORTANT NOTE:
diff --git a/mx.truffleruby/native b/mx.truffleruby/native
@@ -1,7 +1,7 @@
 GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM,Truffle Macro
-NATIVE_IMAGES=suite:sulong,truffleruby-polyglot-get,lib:rubyvm
+NATIVE_IMAGES=suite:sulong,lib:rubyvm
 EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UnlockExperimentalVMOptions rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:-UnlockExperimentalVMOptions
 GENERATE_DEBUGINFO=false
 # To also create the standalone
diff --git a/mx.truffleruby/native-ee b/mx.truffleruby/native-ee
@@ -1,7 +1,7 @@
 GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/truffleruby-enterprise,/graal-enterprise,/substratevm-enterprise,substratevm-enterprise-gcs
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,Truffle enterprise,SubstrateVM Enterprise,Truffle Macro Enterprise,suite:substratevm-enterprise-gcs
-NATIVE_IMAGES=suite:sulong,truffleruby-polyglot-get,lib:rubyvm
+NATIVE_IMAGES=suite:sulong,lib:rubyvm
 EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UnlockExperimentalVMOptions rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:-UnlockExperimentalVMOptions
 GENERATE_DEBUGINFO=false
 # To also create the standalone
diff --git a/mx.truffleruby/native-ee-aux b/mx.truffleruby/native-ee-aux
@@ -1,7 +1,7 @@
 GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/truffleruby-enterprise,/graal-enterprise,/substratevm-enterprise
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,Truffle enterprise,SubstrateVM Enterprise,Truffle Macro Enterprise
-NATIVE_IMAGES=suite:sulong,truffleruby-polyglot-get,lib:rubyvm
+NATIVE_IMAGES=suite:sulong,lib:rubyvm
 EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UnlockExperimentalVMOptions rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:-UnlockExperimentalVMOptions rubyvm:-H:+AuxiliaryEngineCache rubyvm:-H:ReservedAuxiliaryImageBytes=1073741824
 GENERATE_DEBUGINFO=false
 NATIVE_IMAGE_AUXILIARY_ENGINE_CACHE=true
diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -307,12 +307,13 @@
         "org.truffleruby.launcher": {
             "dir": "src/launcher",
             "sourceDirs": ["java"],
-            "requires": ["java.logging"],
+            "requires": ["java.logging", "java.xml"],
             "dependencies": [
                 "truffleruby:TRUFFLERUBY-ANNOTATIONS",
                 "truffleruby:TRUFFLERUBY-SHARED",
                 "sdk:POLYGLOT",
                 "sdk:LAUNCHER_COMMON",
+                "sdk:MAVEN_DOWNLOADER",
             ],
             "jacoco": "include",
             "javaCompliance": "17+",
@@ -566,6 +567,7 @@
                 "truffleruby:TRUFFLERUBY-SHARED",
                 "sdk:POLYGLOT",
                 "sdk:LAUNCHER_COMMON",
+                "sdk:MAVEN_DOWNLOADER",
             ],
             "description": "TruffleRuby Launcher",
             "license": ["EPL-2.0"],
diff --git a/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java b/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java
@@ -21,6 +21,7 @@
 import java.lang.ProcessBuilder.Redirect;
 
 import org.graalvm.launcher.AbstractLanguageLauncher;
+import org.graalvm.maven.downloader.Main;
 import org.graalvm.nativeimage.ProcessProperties;
 import org.graalvm.options.OptionCategory;
 import org.graalvm.polyglot.Context;
@@ -38,10 +39,40 @@ public class RubyLauncher extends AbstractLanguageLauncher {
     private String implementationName = null;
     private boolean helpOptionUsed = false; // Any --help* option
 
+    /** NOTE: not actually used by thin launchers. The first method called with the arguments is
+     * {@link #preprocessArguments}. */
     public static void main(String[] args) {
         new RubyLauncher().launch(args);
     }
 
+    private static void trufflerubyPolyglotGet(List<String> originalArgs) {
+        String rubyHome = getPropertyOrFail("org.graalvm.language.ruby.home");
+        String outputDir = rubyHome + "/modules";
+        List<String> args = new ArrayList<>();
+        args.add("-o");
+        args.add(outputDir);
+        args.add("-v");
+        args.add(getPropertyOrFail("org.graalvm.version"));
+        if (originalArgs.size() == 1 && !originalArgs.get(0).startsWith("-")) {
+            args.add("-a");
+        }
+        args.addAll(originalArgs);
+        try {
+            Main.main(args.toArray(CommandLineOptions.EMPTY_STRING_ARRAY));
+        } catch (Exception e) {
+            throw new Error(e);
+        }
+        System.exit(0);
+    }
+
+    private static String getPropertyOrFail(String property) {
+        String value = System.getProperty(property);
+        if (value == null) {
+            throw new UnsupportedOperationException("Expected system property " + property + " to be set");
+        }
+        return value;
+    }
+
     @Override
     protected String getLanguageId() {
         return TruffleRuby.LANGUAGE_ID;
@@ -65,6 +96,15 @@ protected void printVersion() {
 
     @Override
     protected List<String> preprocessArguments(List<String> args, Map<String, String> polyglotOptions) {
+        String launcherName = System.getProperty("org.graalvm.launcher.executablename", "miniruby");
+        if (launcherName.endsWith("truffleruby-polyglot-get")) {
+            if (isAOT()) {
+                throw abort("truffleruby-polyglot-get is not available for the native standalone");
+            } else {
+                trufflerubyPolyglotGet(args);
+            }
+        }
+
         // Set default options for the launcher which don't match the OptionKey's default.
         // These options can still be overridden if set explicitly.
         polyglotOptions.put(OptionsCatalog.EMBEDDED.getName(), "false");
diff --git a/test/truffle/ecosystem/truffleruby-polyglot-get-test.sh b/test/truffle/ecosystem/truffleruby-polyglot-get-test.sh
@@ -12,9 +12,9 @@ if [ ! -d "$maven_repo" ]; then
     exit 2
 fi
 
-jt build --env jvm-ce-ntl
+jt build --env jvm-ce
 
-standalone=$(jt -q mx --quiet --env jvm-ce-ntl standalone-home --type=jvm ruby)
+standalone=$(jt -q mx --quiet --env jvm-ce standalone-home --type=jvm ruby)
 
 export PATH="$standalone/bin:$PATH"
 
