JaroslavTulach
commented
2 months ago The work on
-
9810
enables this task to be easily prototyped on top of https://github.com/enso-org/enso/pull/9810/commits/ece87469179d10635051dfcbe571a6436548bd26. With following changes:
diff --git build.sbt build.sbt
index 74ce47e86e..4130e1bb12 100644
--- build.sbt
+++ build.sbt
@@ -2092,7 +2092,7 @@ lazy val `runtime-fat-jar` =
.settings(
libraryDependencies ++= {
val graalMods =
- GraalVM.modules.map(_.withConfigurations(Some(Runtime.name)))
+ GraalVM.modules.map(_.withConfigurations(Some(Compile.name)))
val langMods =
GraalVM.langsPkgs.map(_.withConfigurations(Some(Runtime.name)))
val logbackMods =
@@ -2203,6 +2203,7 @@ lazy val `engine-runner` = project
commands += WithDebugCommand.withDebug,
inConfig(Compile)(truffleRunOptionsSettings),
libraryDependencies ++= Seq(
+ "org.graalvm.sdk" % "launcher-common" % graalMavenPackagesVersion,
"org.graalvm.polyglot" % "polyglot" % graalMavenPackagesVersion,
"org.graalvm.sdk" % "polyglot-tck" % graalMavenPackagesVersion % Provided,
"commons-cli" % "commons-cli" % commonsCliVersion,
diff --git engine/runner/src/main/java/org/enso/runner/Main.java engine/runner/src/main/java/org/enso/runner/Main.java
index 2de741a519..81ea7c239c 100644
--- engine/runner/src/main/java/org/enso/runner/Main.java
+++ engine/runner/src/main/java/org/enso/runner/Main.java
@@ -14,6 +14,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
@@ -44,6 +46,8 @@ import org.enso.polyglot.PolyglotContext;
import org.enso.profiling.sampler.NoopSampler;
import org.enso.profiling.sampler.OutputStreamSampler;
import org.enso.version.VersionDescription;
+import org.graalvm.options.OptionCategory;
+import org.graalvm.polyglot.Context;
import org.graalvm.polyglot.PolyglotException;
import org.graalvm.polyglot.PolyglotException.StackFrame;
import org.slf4j.LoggerFactory;
@@ -59,7 +63,7 @@ import scala.util.Right$;
import scala.util.Success;
/** The main CLI entry point class. */
-public final class Main {
+public final class Main extends org.graalvm.launcher.AbstractLanguageLauncher {
private static final String RUN_OPTION = "run";
private static final String INSPECT_OPTION = "inspect";
private static final String DUMP_GRAPHS_OPTION = "dump-graphs";
@@ -1344,20 +1348,10 @@ public final class Main {
}
}
- private void println(String msg) {
- out().println(msg);
- }
-
- private void launch(String[] args) {
- var options = buildOptions();
- var line = preprocessArguments(options, args);
- launch(options, line);
- }
-
- protected CommandLine preprocessArguments(Options options, String[] args) {
+ private CommandLine preprocessCommandLine(Options options, String[] args) {
var parser = new DefaultParser();
try {
- var line = parser.parse(options, args);
+ line = parser.parse(options, args);
return line;
} catch (Exception e) {
printHelp(options);
@@ -1365,7 +1359,7 @@ public final class Main {
}
}
- protected void launch(Options options, CommandLine line) {
+ private void launch(Options options, CommandLine line) {
var logLevel =
scala.Option.apply(line.getOptionValue(LOG_LEVEL))
.map(this::parseLogLevel)
@@ -1401,10 +1395,35 @@ public final class Main {
}
}
+ @Override
protected String getLanguageId() {
return LanguageInfo.ID;
}
+ private final Options options = buildOptions();
+ private CommandLine line;
+
+ @Override
+ protected List<String> preprocessArguments(
+ List<String> arguments, Map<String, String> polyglotOptions) {
+ if (arguments.stream().filter(a -> a.startsWith("--help")).findFirst().isPresent()) {
+ return arguments;
+ }
+ var args = arguments.toArray(new String[0]);
+ line = preprocessCommandLine(options, args);
+ return Collections.emptyList();
+ }
+
+ @Override
+ protected void launch(Context.Builder contextBuilder) {
+ launch(options, line);
+ }
+
+ @Override
+ protected void printHelp(OptionCategory maxCategory) {
+ printHelp(options);
+ }
+
private static final class WrongOption extends Exception {
WrongOption(String msg) {
super(msg);
diff --git engine/runtime-fat-jar/src/main/java/module-info.java engine/runtime-fat-jar/src/main/java/module-info.java
index ca8f410fa4..d1800ab6fc 100644
--- engine/runtime-fat-jar/src/main/java/module-info.java
+++ engine/runtime-fat-jar/src/main/java/module-info.java
@@ -5,6 +5,7 @@ open module org.enso.runtime {
requires java.se;
// Because of akka.util.Unsafe
requires jdk.unsupported;
+ requires org.graalvm.launcher;
requires org.graalvm.polyglot;
requires org.graalvm.truffle;
requires static org.slf4j;
diff --git project/GraalVM.scala project/GraalVM.scala
index 06431bf264..17177e13a5 100644
--- project/GraalVM.scala
+++ project/GraalVM.scala
@@ -16,6 +16,8 @@ object GraalVM {
* When invoking the `java` command, these modules need to be put on the module-path.
*/
val modules: Seq[ModuleID] = Seq(
+ "org.graalvm.sdk" % "launcher-common" % version,
+ "org.graalvm.shadowed" % "jline" % version,
"org.graalvm.sdk" % "nativeimage" % version,
"org.graalvm.sdk" % "word" % version,
"org.graalvm.sdk" % "jniutils" % version,one gets basic integration with Truffle launcher. CCing @Akirathan
This task is automatically imported from the old Task Issue Board and it was originally created by Pavel Marek. Original issue is here.
Truffle launchers provide many useful capabilities, like option categories.
Our
org.enso.runner.Mainshould not useorg.apache.commons.cliat all, but rather truffle options.By using Truffle launcher, we will get these advantages:
--inspect --inspect.Path=...and all the other options for other tools, rather than just somehow forwarding these options to Truffle context builder.org.graalvm.options) has more features thanorg.apache.commons.cli- for examplestability,usageSyntax,category, etc.org.enso.runner.Mainclass could be in Java, instead of Scala.For example,
js --help:Related issues:
Comments:
Btw. just a 'historical' note that keeping the runner Main very simple and rather rudimentary was a conscious decision made in the past - from the beginning this meant to be an internal entry point, not really exposed to the end-users. The end users are supposed to use the Enso Launcher which has a much nicer CLI. I'm not sure why it has not been more widely adopted by our devs.
I'm not at all against integrating this, even on the contrary - it would be great to be able to
gu install ensoat some point! But note that the 'official' launcher is a separate project and I want to ensure we do not duplicate too much stuff between the two - to avoid maintaining two functionalities doing the same thing - unless a decision comes to retire the old launcher. (Radosław Waśko - Jan 24, 2023)