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

Merge branch 'yushijinhun-java' into javafx

Browse Source
This commit is contained in:
huanghongxun
2018-08-09 13:54:54 +08:00
parent f16885568e 8e6bcd969e
commit 64092a4bd4
1 changed files with 40 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java
View File

@@ -22,8 +22,8 @@ import java.nio.file.Files;
import java.nio.file.LinkOption; import java.nio.file.LinkOption;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
@@ -38,7 +38,7 @@ import java.util.stream.Stream;
* *
* @author huangyuhui * @author huangyuhui
*/ */
public final class JavaVersion implements Serializable { public final class JavaVersion {
private final File binary; private final File binary;
private final String longVersion; private final String longVersion;
@@ -71,8 +71,6 @@ public final class JavaVersion implements Serializable {
* @see org.jackhuang.hmcl.util.JavaVersion#JAVA_9 * @see org.jackhuang.hmcl.util.JavaVersion#JAVA_9
* @see org.jackhuang.hmcl.util.JavaVersion#JAVA_8 * @see org.jackhuang.hmcl.util.JavaVersion#JAVA_8
* @see org.jackhuang.hmcl.util.JavaVersion#JAVA_7 * @see org.jackhuang.hmcl.util.JavaVersion#JAVA_7
* @see org.jackhuang.hmcl.util.JavaVersion#JAVA_6
* @see org.jackhuang.hmcl.util.JavaVersion#JAVA_5
* @see org.jackhuang.hmcl.util.JavaVersion#UNKNOWN * @see org.jackhuang.hmcl.util.JavaVersion#UNKNOWN
*/ */
public int getParsedVersion() { public int getParsedVersion() {
@@ -82,41 +80,36 @@ public final class JavaVersion implements Serializable {
private static final Pattern REGEX = Pattern.compile("version \"(?<version>(.*?))\""); private static final Pattern REGEX = Pattern.compile("version \"(?<version>(.*?))\"");
public static final int UNKNOWN = -1; public static final int UNKNOWN = -1;
public static final int JAVA_5 = 50;
public static final int JAVA_6 = 60;
public static final int JAVA_7 = 70; public static final int JAVA_7 = 70;
public static final int JAVA_8 = 80; public static final int JAVA_8 = 80;
public static final int JAVA_9 = 90; public static final int JAVA_9 = 90;
public static final int JAVA_X = 100; public static final int JAVA_10 = 100;
public static final int JAVA_11 = 110;
private static int parseVersion(String version) { private static int parseVersion(String version) {
if (version.startsWith("10") || version.startsWith("X")) if (version.startsWith("11"))
return JAVA_X; return JAVA_11;
else if (version.contains("1.9.") || version.startsWith("9")) else if (version.startsWith("10"))
return JAVA_10;
else if (version.startsWith("9"))
return JAVA_9; return JAVA_9;
else if (version.contains("1.8")) else if (version.contains("1.8"))
return JAVA_8; return JAVA_8;
else if (version.contains("1.7")) else if (version.contains("1.7"))
return JAVA_7; return JAVA_7;
else if (version.contains("1.6"))
return JAVA_6;
else if (version.contains("1.5"))
return JAVA_5;
else else
return UNKNOWN; return UNKNOWN;
} }
public static JavaVersion fromExecutable(File executable) throws IOException { public static JavaVersion fromExecutable(File executable) throws IOException {
File actualFile = executable;
Platform platform = Platform.BIT_32; Platform platform = Platform.BIT_32;
String version = null; String version = null;
if ("javaw".equals(FileUtils.getNameWithoutExtension(actualFile))) // javaw is only used on windows
actualFile = new File(actualFile.getAbsoluteFile().getParentFile(), "java"); if ("javaw.exe".equalsIgnoreCase(executable.getName()))
executable = new File(executable.getAbsoluteFile().getParentFile(), "java.exe");
try { Process process = new ProcessBuilder(executable.getAbsolutePath(), "-version").start();
Process process = new ProcessBuilder(actualFile.getAbsolutePath(), "-version").start();
process.waitFor();
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) { try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
for (String line; (line = reader.readLine()) != null;) { for (String line; (line = reader.readLine()) != null;) {
Matcher m = REGEX.matcher(line); Matcher m = REGEX.matcher(line);
@@ -126,33 +119,26 @@ public final class JavaVersion implements Serializable {
platform = Platform.BIT_64; platform = Platform.BIT_64;
} }
} }
} catch (InterruptedException e) {
throw new IOException("Interrupted scanning the java version.", e);
}
if (version == null) if (version == null)
throw new IOException("No matched Java version."); throw new IOException("No matched Java version.");
if (parseVersion(version) == UNKNOWN) if (parseVersion(version) == UNKNOWN)
throw new IOException("Unrecognized Java version " + version); throw new IOException("Unrecognized Java version " + version);
return new JavaVersion(actualFile, version, platform);
}
private static JavaVersion fromKnownExecutable(File file, String version) { return new JavaVersion(executable, version, platform);
return new JavaVersion(file, version, Platform.UNKNOWN);
} }
public static JavaVersion fromJavaHome(File home) throws IOException { public static JavaVersion fromJavaHome(File home) throws IOException {
return fromExecutable(getJavaFile(home)); return fromExecutable(getExecutable(home));
} }
private static File getJavaFile(File home) { private static File getExecutable(File javaHome) {
File path = new File(home, "bin"); if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
File javaw = new File(path, "javae.exe"); return new File(javaHome, "bin/java.exe");
if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS && javaw.isFile()) } else {
return javaw; return new File(javaHome, "bin/java");
else }
return new File(path, "java"); // Both linux and windows allow this.
} }
public static JavaVersion fromCurrentEnvironment() { public static JavaVersion fromCurrentEnvironment() {
@@ -160,7 +146,7 @@ public final class JavaVersion implements Serializable {
} }
public static final JavaVersion THIS_JAVA = new JavaVersion( public static final JavaVersion THIS_JAVA = new JavaVersion(
getJavaFile(new File(System.getProperty("java.home"))), getExecutable(new File(System.getProperty("java.home"))),
System.getProperty("java.version"), System.getProperty("java.version"),
Platform.PLATFORM Platform.PLATFORM
); );
@@ -194,7 +180,7 @@ public final class JavaVersion implements Serializable {
javaVersions = queryMacintosh(); javaVersions = queryMacintosh();
break; break;
default: default:
javaVersions = Collections.emptyList(); javaVersions = new ArrayList<>();
break; break;
} }
@@ -214,6 +200,7 @@ public final class JavaVersion implements Serializable {
LATCH.countDown(); LATCH.countDown();
} }
// ==== Linux ====
private static List<JavaVersion> queryLinux() throws IOException { private static List<JavaVersion> queryLinux() throws IOException {
Path jvmDir = Paths.get("/usr/lib/jvm"); Path jvmDir = Paths.get("/usr/lib/jvm");
if (Files.isDirectory(jvmDir)) { if (Files.isDirectory(jvmDir)) {
@@ -234,9 +221,11 @@ public final class JavaVersion implements Serializable {
return Collections.emptyList(); return Collections.emptyList();
} }
} }
// ====
// ==== OSX ====
private static List<JavaVersion> queryMacintosh() throws IOException { private static List<JavaVersion> queryMacintosh() throws IOException {
LinkedList<JavaVersion> res = new LinkedList<>(); List<JavaVersion> res = new ArrayList<>();
File currentJRE = new File("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home"); File currentJRE = new File("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home");
if (currentJRE.exists()) if (currentJRE.exists())
@@ -248,9 +237,11 @@ public final class JavaVersion implements Serializable {
return res; return res;
} }
// ====
// ==== Windows ====
private static List<JavaVersion> queryWindows() { private static List<JavaVersion> queryWindows() {
LinkedList<JavaVersion> res = new LinkedList<>(); List<JavaVersion> res = new ArrayList<>();
Lang.ignoringException(() -> res.addAll(queryRegisterKey("HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\"))); Lang.ignoringException(() -> res.addAll(queryRegisterKey("HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\")));
Lang.ignoringException(() -> res.addAll(queryRegisterKey("HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\"))); Lang.ignoringException(() -> res.addAll(queryRegisterKey("HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\")));
Lang.ignoringException(() -> res.addAll(queryRegisterKey("HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\JRE\\"))); Lang.ignoringException(() -> res.addAll(queryRegisterKey("HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\JRE\\")));
@@ -259,7 +250,7 @@ public final class JavaVersion implements Serializable {
} }
private static List<String> querySubFolders(String location) throws IOException, InterruptedException { private static List<String> querySubFolders(String location) throws IOException, InterruptedException {
List<String> res = new LinkedList<>(); List<String> res = new ArrayList<>();
String[] cmd = new String[] { "cmd", "/c", "reg", "query", location }; String[] cmd = new String[] { "cmd", "/c", "reg", "query", location };
Process process = Runtime.getRuntime().exec(cmd); Process process = Runtime.getRuntime().exec(cmd);
process.waitFor(); process.waitFor();
@@ -273,7 +264,7 @@ public final class JavaVersion implements Serializable {
} }
private static List<JavaVersion> queryRegisterKey(String location) throws IOException, InterruptedException { private static List<JavaVersion> queryRegisterKey(String location) throws IOException, InterruptedException {
List<JavaVersion> res = new LinkedList<>(); List<JavaVersion> res = new ArrayList<>();
for (String java : querySubFolders(location)) { for (String java : querySubFolders(location)) {
String home = queryRegisterValue(java, "JavaHome"); String home = queryRegisterValue(java, "JavaHome");
if (home != null) if (home != null)
@@ -306,4 +297,5 @@ public final class JavaVersion implements Serializable {
} }
return null; return null;
} }
// ====
} }