Gradle run task 应使用 HMCL_JAVA_HOME 所指向的 Java (#3804)

This commit is contained in:
Glavo 2025-04-08 12:29:14 +08:00 committed by GitHub
parent f97b9b9382
commit 99a031cea4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -251,8 +251,15 @@ tasks.create<JavaExec>("run") {
val vmOptions = parseToolOptions(System.getenv("HMCL_JAVA_OPTS"))
jvmArgs(vmOptions)
val hmclJavaHome = System.getenv("HMCL_JAVA_HOME")
if (hmclJavaHome != null) {
this.executable(file(hmclJavaHome).resolve("bin")
.resolve(if (System.getProperty("os.name").lowercase().startsWith("windows")) "java.exe" else "java"))
}
doFirst {
logger.quiet("HMCL_JAVA_OPTS: $vmOptions")
logger.quiet("HMCL_JAVA_OPTS: {}", vmOptions)
logger.quiet("HMCL_JAVA_HOME: {}", hmclJavaHome ?: System.getProperty("java.home"))
}
}