lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 Java 管理页面无法添加 IKVM 的问题 (#3968)

Browse Source
This commit is contained in:
Glavo
2025-06-08 09:45:23 +08:00
committed by GitHub
parent d9d32eab1d
commit d317844b28
6 changed files with 124 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
HMCLCore/src/main/java/org/jackhuang/hmcl/java/JavaInfo.java
View File

@@ -136,108 +136,6 @@ public final class JavaInfo {
}
}
private static final String OS_ARCH = "os.arch = ";
private static final String JAVA_VERSION = "java.version = ";
private static final String JAVA_VENDOR = "java.vendor = ";
private static final String VERSION_PREFIX = "version \"";
public static JavaInfo fromExecutable(Path executable) throws IOException {
return fromExecutable(executable, true);
}
public static JavaInfo fromExecutable(Path executable, boolean tryFindReleaseFile) throws IOException {
assert executable.isAbsolute();
Path parent = executable.getParent();
if (tryFindReleaseFile && parent != null && parent.getFileName() != null && parent.getFileName().toString().equals("bin")) {
Path javaHome = parent.getParent();
if (javaHome != null && javaHome.getFileName() != null) {
Path releaseFile = javaHome.resolve("release");
String javaHomeName = javaHome.getFileName().toString();
if ((javaHomeName.contains("jre") || javaHomeName.contains("jdk") || javaHomeName.contains("openj9")) && Files.isRegularFile(releaseFile)) {
try {
return fromReleaseFile(releaseFile);
} catch (IOException ignored) {
}
}
}
}
String osArch = null;
String version = null;
String vendor = null;
Platform platform = null;
String executablePath = executable.toString();
Process process = new ProcessBuilder(executablePath, "-XshowSettings:properties", "-version").start();
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream(), OperatingSystem.NATIVE_CHARSET))) {
for (String line; (line = reader.readLine()) != null; ) {
int idx = line.indexOf(OS_ARCH);
if (idx >= 0) {
osArch = line.substring(idx + OS_ARCH.length()).trim();
if (version != null && vendor != null)
break;
else
continue;
}
idx = line.indexOf(JAVA_VERSION);
if (idx >= 0) {
version = line.substring(idx + JAVA_VERSION.length()).trim();
if (osArch != null && vendor != null)
break;
else
continue;
}
idx = line.indexOf(JAVA_VENDOR);
if (idx >= 0) {
vendor = line.substring(idx + JAVA_VENDOR.length()).trim();
if (osArch != null && version != null)
break;
else
//noinspection UnnecessaryContinue
continue;
}
}
}
if (osArch != null)
platform = Platform.getPlatform(OperatingSystem.CURRENT_OS, Architecture.parseArchName(osArch));
// Java 6
if (version == null) {
boolean is64Bit = false;
process = new ProcessBuilder(executablePath, "-version").start();
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream(), OperatingSystem.NATIVE_CHARSET))) {
for (String line; (line = reader.readLine()) != null; ) {
if (version == null) {
int idx = line.indexOf(VERSION_PREFIX);
if (idx >= 0) {
int begin = idx + VERSION_PREFIX.length();
int end = line.indexOf('"', begin);
if (end >= 0) {
version = line.substring(begin, end);
}
}
}
if (line.contains("64-Bit"))
is64Bit = true;
}
}
if (platform == null)
platform = Platform.getPlatform(OperatingSystem.CURRENT_OS, is64Bit ? Architecture.X86_64 : Architecture.X86);
if (version == null)
throw new IOException("Cannot determine version");
}
return new JavaInfo(platform, version, vendor);
}
public static final JavaInfo CURRENT_ENVIRONMENT = new JavaInfo(Platform.CURRENT_PLATFORM, System.getProperty("java.version"), System.getProperty("java.vendor"));
private final Platform platform;