Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Native Image search path on Windows #12356

Merged
merged 2 commits into from
Feb 25, 2025
+6 −3
Merged

Fix Native Image search path on Windows #12356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b57508
Fix Native Image search path on Windows
hubertp Feb 25, 2025
5be5014
Update engine/language-server/src/main/scala/org/enso/languageserver/…
hubertp Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions lib/scala/project-manager/src/main/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ logging-service {
},
{
name = "file"
},
{
name = "console"
}
]
default-appender = file
Expand Down
2 changes: 1 addition & 1 deletion ...sion-manager/src/main/scala/org/enso/runtimeversionmanager/runner/NativeExecCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
) {
Expand Down
Loading