MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-168924 JDK switcher does not show bundled jdk

Browse Source 
Handled new bundled jdk structure
This commit is contained in:
Alexey Ushakov
2017-03-01 22:51:02 +03:00
parent b85b5b8725
commit 0207ef1320
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/util/JdkBundle.java
+5 -2
View File
@@ -204,8 +204,11 @@ public class JdkBundle {
private static Pair<Pair<String, Boolean>, Pair<Version, Integer>> getJDKNameArchVersionAndUpdate(File jvm, String homeSubPath) {
GeneralCommandLine commandLine = new GeneralCommandLine().withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.NONE);
commandLine.setExePath(new File(jvm, homeSubPath + File.separator + "jre" +
File.separator + "bin" + File.separator + "java").getAbsolutePath());
File jvmPath = new File(jvm, homeSubPath + File.separator + "jre" + File.separator + "bin" + File.separator + "java");
if (!jvmPath.exists()) {
jvmPath = new File(jvm, homeSubPath + File.separator + "bin" + File.separator + "java");
}
commandLine.setExePath(jvmPath.getAbsolutePath());
commandLine.addParameter("-version");
String displayVersion;
platform/platform-tests/testSrc/com/intellij/util/JdkBundleTest.java
+10 -4
View File
@@ -113,10 +113,7 @@ public class JdkBundleTest {
}
}
@Test
public void testCreateBundle() throws Exception {
File homeJDK = new File(System.getProperty("java.home")).getParentFile();
public void doTestCreateBundle(File homeJDK) throws Exception {
if (!new File(homeJDK, "lib/tools.jar").exists()) return; // Skip pure jre
File bootJDK = SystemInfo.isMac ? homeJDK.getParentFile().getParentFile() : homeJDK;
@@ -141,6 +138,15 @@ public class JdkBundleTest {
assertTrue(evalVerStr + " is not the same with " + verStr, verStr.contains(evalVerStr));
}
@Test
public void testCreateBundle() throws Exception {
File home = new File(System.getProperty("java.home"));
doTestCreateBundle(home);
doTestCreateBundle(home.getParentFile());
}
@Test
public void testCreateBoot() throws Exception {
File homeJDK = new File(System.getProperty("java.home")).getParentFile();