Right now my favorite way to implement this is:

diff --git lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/NativeExecCommand.scala lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/NativeExecCommand.scala
index 96a9884cf0..8c4f919821 100644
--- lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/NativeExecCommand.scala
+++ lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/NativeExecCommand.scala
@@ -21,10 +21,8 @@ case class NativeExecCommand(executablePath: Path) extends ExecCommand {
 }
 
 object NativeExecCommand {
-
-  private val LAUNCHER_ENV_NAME = "ENSO_LAUNCHER"
-
   def apply(
+    jvmArguments: Option[String],
     version: String,
     engine: Engine,
     logger: Logger
@@ -34,11 +32,11 @@ object NativeExecCommand {
     val execName = OS.executableName("enso")
     val fullExecPath =
       dm.paths.engines.resolve(version).resolve("bin").resolve(execName)
-    val ensoLauncher = Option(System.getenv(LAUNCHER_ENV_NAME))
-
-    if (fullExecPath.toFile.exists() && isBinary(fullExecPath, logger)) {
+    if (jvmArguments.isDefined) {
+      None
+    } else if (fullExecPath.toFile.exists() && isBinary(fullExecPath, logger)) {
       Some(NativeExecCommand(fullExecPath))
-    } else if (ensoLauncher.map(_.equals("native")).getOrElse(false)) {
+    } else {
       val component =
         engine.componentDirPath.resolve("..").toAbsolutePath.normalize
       val fallbackExecPath = component.resolve("bin").resolve(execName)
@@ -53,7 +51,6 @@ object NativeExecCommand {
         )
         None
       }
-    } else {
       None
     }
   }
diff --git lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/Runner.scala lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/Runner.scala
index 0ffbd9c59b..9ea3260564 100644
--- lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/Runner.scala
+++ lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/Runner.scala
@@ -164,8 +164,8 @@ class Runner(
   def withCommand[R](runSettings: RunSettings, jvmSettings: JVMSettings)(
     action: RawCommand => R
   ): R = {
+    val jvmOptsFromEnvironment = environment.getEnvVar(JVM_OPTIONS_ENV_VAR)
     def prepareAndRunCommand(engine: Engine, cmd: ExecCommand): R = {
-      val jvmOptsFromEnvironment = environment.getEnvVar(JVM_OPTIONS_ENV_VAR)
       jvmOptsFromEnvironment.foreach { opts =>
         logger.debug(
           "Picking up additional JVM options [{}] from the " +
@@ -225,6 +225,7 @@ class Runner(
         runtimeVersionManager.withEngineAndRuntime(engineVersion) {
           (engine, runtime) =>
             NativeExecCommand.apply(
+              jvmOptsFromEnvironment,
               engineVersion.toString,
               engine,
               logger

it comes with several benefits:

doesn't introduce any new switch
allows to opt-out by defining ENSO_JVM_OPTS
works well with existing tutorials like Execute yjs from insight script #11965
seems logical - clearly we cannot pass JVM arguments without turning on the --jvm mode

Make Native Image opt-out #12483

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions