Introduce trufflesqueak-polyglot-get

Fixes #176
hpi-swa · Feb 16, 2024 · 6f38434 · 6f38434
1 parent db1e480
commit 6f38434
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -193,6 +193,11 @@ jobs:
       if: ${{ runner.os == 'Windows' }}
     - name: Run SystemReporter on TruffleSqueak standalone
       run: 'trufflesqueak --code "(String streamContents: [:s | SystemReporter basicNew reportImage: s; reportVM: s; reportVMParameters: s]) withUnixLineEndings" images/test-64bit.image'
+    - name: Run trufflesqueak-polyglot-get on TruffleSqueak JVM standalone
+      run: |
+        trufflesqueak-polyglot-get -v 23.1.0 -a js
+        trufflesqueak --code "Polyglot eval: 'js' string: 'new Object({hello: \"world\"})'" images/test-64bit.image
+      if: ${{ matrix.type == 'jvm' }}
     - name: Upload TruffleSqueak standalone
       uses: actions/upload-artifact@v4
       with:

diff --git a/mx.trufflesqueak/mx_trufflesqueak.py b/mx.trufflesqueak/mx_trufflesqueak.py
@@ -214,14 +214,13 @@ def patched_native_image(self, build_args, output_file, out=None, err=None, find
     library_configs=[
         mx_sdk.LanguageLibraryConfig(
             language=LANGUAGE_ID,
-            jar_distributions=['trufflesqueak:TRUFFLESQUEAK_LAUNCHER'],
+            launchers=['bin/<exe:trufflesqueak>', 'bin/<exe:trufflesqueak-polyglot-get>'],
+            jar_distributions=['trufflesqueak:TRUFFLESQUEAK_LAUNCHER', 'sdk:MAVEN_DOWNLOADER'],
             main_class='%s.launcher.TruffleSqueakLauncher' % PACKAGE_NAME,
             build_args=[
                 '-H:+DumpThreadStacksOnSignal',
                 '-H:+DetectUserDirectoriesInImageHeap',
             ],
-            destination='lib/<lib:%svm>' % LANGUAGE_ID,
-            launchers=['bin/<exe:trufflesqueak>'],
             default_vm_args=[
                 '--vm.Xms512M',
                 '--vm.Xss16M',

diff --git a/mx.trufflesqueak/suite.py b/mx.trufflesqueak/suite.py
@@ -180,6 +180,7 @@
             "dependencies": [
                 "TRUFFLESQUEAK_SHARED",
                 "sdk:LAUNCHER_COMMON",
+                "sdk:MAVEN_DOWNLOADER",
             ],
             "requires": [
                 "java.desktop",
@@ -352,6 +353,7 @@
             "distDependencies": [
                 "TRUFFLESQUEAK_SHARED",
                 "sdk:LAUNCHER_COMMON",
+                "sdk:MAVEN_DOWNLOADER",
             ],
             "maven": {
                 "groupId": "de.hpi.swa.trufflesqueak",

diff --git a/mx.trufflesqueak/trufflesqueak-jvm b/mx.trufflesqueak/trufflesqueak-jvm
@@ -1,6 +1,6 @@
 COMPONENTS=TruffleSqueak,suite:tools,GraalVM compiler,SubstrateVM,LibGraal
 DEFAULT_DYNAMIC_IMPORTS=/compiler,/substratevm,/tools,/vm
 INSTALLABLES=TruffleSqueak
-NATIVE_IMAGES=lib:jvmcicompiler
+NATIVE_IMAGES=lib:jvmcicompiler,trufflesqueak-polyglot-get
 BUILD_TARGETS=GRAALVM,GRAALVM_STANDALONES
 GRAALVM_SKIP_ARCHIVE=true
diff --git a/...a.trufflesqueak.launcher/src/de/hpi/swa/trufflesqueak/launcher/TruffleSqueakLauncher.java b/...a.trufflesqueak.launcher/src/de/hpi/swa/trufflesqueak/launcher/TruffleSqueakLauncher.java
@@ -17,6 +17,7 @@
 import java.util.Set;
 
 import org.graalvm.launcher.AbstractLanguageLauncher;
+import org.graalvm.maven.downloader.Main;
 import org.graalvm.options.OptionCategory;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
@@ -32,6 +33,8 @@ public final class TruffleSqueakLauncher extends AbstractLanguageLauncher {
     private static final String ENGINE_MODE_OPTION = "engine.Mode";
     private static final String ENGINE_MODE_LATENCY = "latency";
 
+    private static final String[] EMPTY_STRING_ARRAY = new String[0];
+
     private boolean headless;
     private boolean printImagePath;
     private boolean quiet;
@@ -47,6 +50,15 @@ public static void main(final String[] arguments) throws RuntimeException {
 
     @Override
     protected List<String> preprocessArguments(final List<String> arguments, final Map<String, String> polyglotOptions) {
+        final String launcherName = System.getProperty("org.graalvm.launcher.executablename", "trufflesqueak");
+        if (launcherName.endsWith("trufflesqueak-polyglot-get")) {
+            if (isAOT()) {
+                throw abort("trufflesqueak-polyglot-get is not available in a native standalone. Please try again with a JVM standalone of TruffleSqueak.");
+            } else {
+                polyglotGet(arguments);
+            }
+        }
+
         final List<String> unrecognized = new ArrayList<>();
         for (int i = 0; i < arguments.size(); i++) {
             final String arg = arguments.get(i);
@@ -165,7 +177,7 @@ protected String getMainClass() {
 
     @Override
     protected String[] getDefaultLanguages() {
-        return new String[0]; // Allow all languages (same effect of `--polyglot`)
+        return EMPTY_STRING_ARRAY; // Allow all languages (same effect of `--polyglot`)
     }
 
     @Override
@@ -198,4 +210,34 @@ private static String getRuntimeName() {
             return engine.getImplementationName();
         }
     }
+
+    /* Maven Downloader support */
+
+    private static void polyglotGet(final List<String> arguments) {
+        final String smalltalkHome = getPropertyOrFail("org.graalvm.language.smalltalk.home");
+        final String outputDir = smalltalkHome + File.separator + "modules";
+        final List<String> args = new ArrayList<>();
+        args.add("-o");
+        args.add(outputDir);
+        args.add("-v");
+        args.add(getPropertyOrFail("org.graalvm.version"));
+        if (arguments.size() == 1 && !arguments.get(0).startsWith("-")) {
+            args.add("-a");
+        }
+        args.addAll(arguments);
+        try {
+            Main.main(args.toArray(EMPTY_STRING_ARRAY));
+        } catch (Exception e) {
+            throw new Error(e);
+        }
+        System.exit(0);
+    }
+
+    private static String getPropertyOrFail(final String property) {
+        final String value = System.getProperty(property);
+        if (value == null) {
+            throw new UnsupportedOperationException("Expected system property '" + property + "' to be set");
+        }
+        return value;
+    }
 }