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

win launcher: do not search tools.jar for jdk 9+.

Browse Source 
IDEA-189436 IDEA fails to launch with JDK 10 set as IDEA_JDK_64.
This commit is contained in:
Vladimir.Orlov
2018-04-06 12:50:06 +03:00
parent 51cb6f2eed
commit a84e4fd74b
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/WinLauncher/WinLauncher.exe
BIN
View File
Binary file not shown.
bin/WinLauncher/WinLauncher64.exe
BIN
View File
Binary file not shown.
native/WinLauncher/WinLauncher/WinLauncher.cpp
+14 -4
View File
@@ -30,6 +30,9 @@ JavaVM* jvm = NULL;
JNIEnv* env = NULL;
volatile bool terminating = false;
//tools.jar doesn't exist in jdk 9 and later. So check it only for jdk 1.8 only.
bool toolsArchiveExists = true;
HANDLE hFileMapping;
HANDLE hEvent;
HANDLE hSingleInstanceWatcherThread;
@@ -227,8 +230,10 @@ bool FindJVMInRegistry()
if (FindJVMInRegistryWithVersion("1.8", true))
return true;
if (FindJVMInRegistryWithVersion("9", true))
toolsArchiveExists = false;
return true;
if (FindJVMInRegistryWithVersion("10", true))
toolsArchiveExists = false;
return true;
//obsolete java versions
@@ -241,8 +246,10 @@ bool FindJVMInRegistry()
if (FindJVMInRegistryWithVersion("1.8", false))
return true;
if (FindJVMInRegistryWithVersion("9", false))
toolsArchiveExists = false;
return true;
if (FindJVMInRegistryWithVersion("10", false))
toolsArchiveExists = false;
return true;
//obsolete java versions
@@ -427,11 +434,14 @@ std::string BuildClassPath()
std::string classpathLibs = LoadStdString(IDS_CLASSPATH_LIBS);
std::string result = CollectLibJars(classpathLibs);
std::string toolsJar = FindToolsJar();
if (toolsJar.size() > 0)
if (toolsArchiveExists)
{
result += ";";
result += toolsJar;
std::string toolsJar = FindToolsJar();
if (toolsJar.size() > 0)
{
result += ";";
result += toolsJar;
}
}
return result;