Fix Native Image search path on Windows (#12356)

Fallback mechanism had a hardcoded `enso` executable name instead of using an OS-specific one. Hence, lack of NI support on Windows. # Important Notes Follow up on #12287.
enso-org · Feb 25, 2025 · 7b68882 · 7b68882
1 parent 6790780
commit 7b68882
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala b/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala
@@ -317,9 +317,9 @@ class MainModule(serverConfig: LanguageServerConfig, logLevel: Level) {
   )
 
   if (java.lang.Boolean.getBoolean("com.oracle.graalvm.isaot")) {
-    log.trace("Running Language Server in AOT mode")
+    log.info("Running Language Server in AOT mode")
   } else {
-    log.trace("Running Language Server in non-AOT mode")
+    log.info("Running Language Server in JVM mode")
   }
 
   private val builder = ContextFactory

diff --git a/lib/scala/project-manager/src/main/resources/application.conf b/lib/scala/project-manager/src/main/resources/application.conf
@@ -38,6 +38,9 @@ logging-service {
       },
       {
         name = "file"
+      },
+      {
+        name = "console"
       }
   ]
   default-appender = file

diff --git a/...sion-manager/src/main/scala/org/enso/runtimeversionmanager/runner/NativeExecCommand.scala b/...sion-manager/src/main/scala/org/enso/runtimeversionmanager/runner/NativeExecCommand.scala
@@ -41,7 +41,7 @@ object NativeExecCommand {
     } else if (ensoLauncher.map(_.equals("native")).getOrElse(false)) {
       val component =
         engine.componentDirPath.resolve("..").toAbsolutePath.normalize
-      val fallbackExecPath = component.resolve("bin").resolve("enso")
+      val fallbackExecPath = component.resolve("bin").resolve(execName)
       if (
         fallbackExecPath.toFile.exists() && isBinary(fallbackExecPath, logger)
       ) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,9 @@ logging-service { @@
           },
           {
             name = "file"
+          },
+          {
+            name = "console"
           }
       ]
       default-appender = file
@@ Expand Down @@