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-157339 162.188.8 doesn't find JVM, won't launch

Browse Source 
WEB-21980 Build 162.844.4 fails to run with a JDK error on windows 10 64b
This commit is contained in:
Vladimir.Orlov
2016-06-14 14:55:30 +03:00
parent 14b484d9af
commit 159850b3a0
10 changed files with 35 additions and 10 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.
build/conf/ideaCE-launcher.properties
+3 -1
View File
@@ -1,8 +1,10 @@
IDS_JDK_ONLY=true
IDS_APP_TITLE=__IDE-NAME__ Launcher
IDS_VM_OPTIONS_PATH=%USERPROFILE%\\.__PRODUCT_PATHS_SELECTOR__
IDS_VM_OPTION_ERRORFILE=-XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log
IDS_VM_OPTION_HEAPDUMPPATH=-XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof
IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME___VM_OPTIONS
IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log -XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof -Didea.jre.check=true
IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -Didea.jre.check=true
build/conf/ideaCE64-launcher.properties
+3 -1
View File
@@ -2,8 +2,10 @@ IDS_JDK_ONLY=true
IDS_JDK_ENV_VAR=IDEA_JDK_64
IDS_APP_TITLE=__IDE-NAME__ Launcher
IDS_VM_OPTIONS_PATH=%USERPROFILE%\\.__PRODUCT_PATHS_SELECTOR__
IDS_VM_OPTION_ERRORFILE=-XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log
IDS_VM_OPTION_HEAPDUMPPATH=-XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof
IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME__64_VM_OPTIONS
IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log -XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof -Didea.jre.check=true
IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -Didea.jre.check=true
native/WinLauncher/WinLauncher/WinLauncher.cpp
+16 -5
View File
@@ -430,16 +430,22 @@ bool FindValidVMOptions(std::vector<std::wstring> files, std::wstring& used, std
return false;
}
void AddPredefinedVMOptions(std::vector<std::string>& vmOptionLines)
{
std::string getVMOption(int resource){
TCHAR buffer[_MAX_PATH];
TCHAR copy[_MAX_PATH];
if (LoadString(hInst, IDS_VM_OPTIONS, buffer, _MAX_PATH))
std::string vmOption = "";
if (LoadString(hInst, resource, buffer, _MAX_PATH))
{
ExpandEnvironmentStrings(buffer, copy, _MAX_PATH);
std::wstring module(copy);
vmOption = std::string(module.begin(), module.end());
}
std::wstring module(copy);
std::string vmOptions(module.begin(), module.end());
return vmOption;
}
void AddPredefinedVMOptions(std::vector<std::string>& vmOptionLines)
{
std::string vmOptions = LoadStdString(IDS_VM_OPTIONS);
while (vmOptions.size() > 0)
{
int pos = vmOptions.find(' ');
@@ -449,6 +455,11 @@ void AddPredefinedVMOptions(std::vector<std::string>& vmOptionLines)
vmOptions = vmOptions.substr(pos);
}
std::string errorFile = getVMOption(IDS_VM_OPTION_ERRORFILE);
std::string heapDumpPath = getVMOption(IDS_VM_OPTION_HEAPDUMPPATH);
if (errorFile != "") vmOptionLines.push_back(errorFile);
if (heapDumpPath != "") vmOptionLines.push_back(heapDumpPath);
char propertiesFile[_MAX_PATH];
if (GetEnvironmentVariableA(LoadStdString(IDS_PROPS_ENV_VAR).c_str(), propertiesFile, _MAX_PATH))
{
native/WinLauncher/WinLauncher/WinLauncher.rc
+2
View File
@@ -140,6 +140,8 @@ BEGIN
IDS_APP_TITLE "WinLauncher"
IDS_JDK_ENV_VAR "IDEA_JDK"
IDS_VM_OPTIONS_PATH "%USERPROFILE%\\.__PRODUCT_PATHS_SELECTOR__"
IDS_VM_OPTION_ERRORFILE "-XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log"
IDS_VM_OPTION_HEAPDUMPPATH "-XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof"
IDS_MAIN_CLASS "com/intellij/idea/Main"
IDS_CLASSPATH_LIBS "bootstrap.jar;extensions.jar;util.jar;jdom.jar;log4j.jar;trove4j.jar;jna.jar"
IDS_JDK_ONLY "true"
native/WinLauncher/WinLauncher/resource.h
+2
View File
@@ -19,6 +19,8 @@
#define IDS_PROPS_ENV_VAR 112
#define IDS_VM_OPTIONS_ENV_VAR 113
#define IDS_ERROR_LAUNCHING_APP 114
#define IDS_VM_OPTION_ERRORFILE 115
#define IDS_VM_OPTION_HEAPDUMPPATH 116
#define IDR_MAINFRAME 128
#define IDS_VM_OPTIONS 129
#define IDB_BITMAP1 130
python/build/pycharm64_community_launcher.properties
+3 -1
View File
@@ -2,8 +2,10 @@ IDS_JDK_ENV_VAR=PYCHARM_JDK_64
IDS_JDK_ONLY=true
IDS_APP_TITLE=__IDE-NAME__ Launcher
IDS_VM_OPTIONS_PATH=%USERPROFILE%\\.__PRODUCT_PATHS_SELECTOR__
IDS_VM_OPTION_ERRORFILE=-XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log
IDS_VM_OPTION_HEAPDUMPPATH=-XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof
IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME__64_VM_OPTIONS
IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmCore -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log -XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof
IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmCore -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__
python/build/pycharm_community_launcher.properties
+3 -1
View File
@@ -2,8 +2,10 @@ IDS_JDK_ENV_VAR=PYCHARM_JDK
IDS_JDK_ONLY=false
IDS_APP_TITLE=__IDE-NAME__ Launcher
IDS_VM_OPTIONS_PATH=%USERPROFILE%\\.__PRODUCT_PATHS_SELECTOR__
IDS_VM_OPTION_ERRORFILE=-XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log
IDS_VM_OPTION_HEAPDUMPPATH=-XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof
IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME___VM_OPTIONS
IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmCore -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log -XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof
IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmCore -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__
python/educational-python/build/pycharm_edu_launcher.properties
+3 -1
View File
@@ -2,8 +2,10 @@ IDS_JDK_ENV_VAR=PYCHARM_JDK
IDS_JDK_ONLY=false
IDS_APP_TITLE=__IDE-NAME__ Launcher
IDS_VM_OPTIONS_PATH=%USERPROFILE%\\.__PRODUCT_PATHS_SELECTOR__
IDS_VM_OPTION_ERRORFILE=-XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log
IDS_VM_OPTION_HEAPDUMPPATH=-XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof
IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME___VM_OPTIONS
IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmEdu -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log -XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof
IDS_VM_OPTIONS=-Didea.platform.prefix=PyCharmEdu -Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__