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

when IDE runs on JDK, set fallback_jdk_home to point to jdk home and not jre home (IDEA-166909)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2017-01-24 20:17:01 +01:00
parent 36b12352c2
commit a44f03fbef
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+24 -2
View File
@@ -153,6 +153,7 @@ public class BuildManager implements Disposable {
s -> !(StringUtil.endsWithIgnoreCase(s, IWS_EXTENSION) || StringUtil.endsWithIgnoreCase(s, IPR_EXTENSION) || StringUtil.containsIgnoreCase(s, IDEA_PROJECT_DIR_PATTERN));
private final File mySystemDirectory;
private final List<String> myFallbackJdkParams = new SmartList<>();
private final ProjectManager myProjectManager;
private final Map<TaskFuture, Project> myAutomakeFutures = Collections.synchronizedMap(new HashMap<TaskFuture, Project>());
@@ -246,6 +247,12 @@ public class BuildManager implements Disposable {
}
mySystemDirectory = system;
final String fallbackSdkHome = getFallbackSdkHome();
if (fallbackSdkHome != null) {
myFallbackJdkParams.add("-D" + GlobalOptions.FALLBACK_JDK_HOME + "=" + fallbackSdkHome);
myFallbackJdkParams.add("-D" + GlobalOptions.FALLBACK_JDK_VERSION + "=" + SystemProperties.getJavaVersion());
}
projectManager.addProjectManagerListener(new ProjectWatcher());
final MessageBusConnection conn = application.getMessageBus().connect();
@@ -322,6 +329,22 @@ public class BuildManager implements Disposable {
Disposer.register(this, () -> future.cancel(false));
}
@Nullable
private static String getFallbackSdkHome() {
final String home = SystemProperties.getJavaHome(); // should point either to jre or jdk
if (home == null) {
return null;
}
File javaHome = new File(home);
if (!JavaSdk.checkForJdk(javaHome)) {
final File parent = javaHome.getParentFile();
if (parent != null && JavaSdk.checkForJdk(parent)) {
javaHome = parent;
}
}
return FileUtil.toSystemIndependentName(javaHome.getAbsolutePath());
}
private List<Project> getOpenProjects() {
final Project[] projects = myProjectManager.getOpenProjects();
if (projects.length == 0) {
@@ -1151,8 +1174,7 @@ public class BuildManager implements Disposable {
cmdLine.addParameter("-D" + PathManager.PROPERTY_PLUGINS_PATH + "=" + PathManager.getPluginsPath());
cmdLine.addParameter("-D" + GlobalOptions.LOG_DIR_OPTION + "=" + FileUtil.toSystemIndependentName(getBuildLogDirectory().getAbsolutePath()));
cmdLine.addParameter("-D" + GlobalOptions.FALLBACK_JDK_HOME + "=" + FileUtil.toSystemIndependentName(SystemProperties.getJavaHome()));
cmdLine.addParameter("-D" + GlobalOptions.FALLBACK_JDK_VERSION + "=" + SystemProperties.getJavaVersion());
cmdLine.addParameters(myFallbackJdkParams);
cmdLine.addParameter("-Dio.netty.noUnsafe=true");