From ed193714a8849dd845bd7e6e92bd3f253af89502 Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Tue, 16 Apr 2019 15:34:34 +0300 Subject: [PATCH] IDEA-210993 IDEA with JBR 11 starts with error via idea.bat PY-35103 Running "pycharm.bat" complains "cannot find VM options file" if the custom VM options file was created --- .../resources/win/scripts/executable-template.bat | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/platform/build-scripts/resources/win/scripts/executable-template.bat b/platform/build-scripts/resources/win/scripts/executable-template.bat index a6815360e624..fdc6d5131fca 100644 --- a/platform/build-scripts/resources/win/scripts/executable-template.bat +++ b/platform/build-scripts/resources/win/scripts/executable-template.bat @@ -58,11 +58,20 @@ IF NOT EXIST "%JAVA_EXE%" ( SET JRE=%JDK% IF EXIST "%JRE%\jre" SET JRE=%JDK%\jre -IF EXIST "%JRE%\lib\amd64" SET BITS=64 +IF EXIST "%JRE%\lib\amd64" ( + SET BITS=64 +) ELSE ( + FOR /F "eol=# usebackq delims=" %%i IN ("%JRE%\release") do ( + ECHO.%%i | findstr /C:"1.8" 1>nul + IF ERRORLEVEL 1 SET BITS=64 + goto :jvmOptions + ) +) :: --------------------------------------------------------------------- :: Collect JVM options and properties. :: --------------------------------------------------------------------- +:jvmOptions IF NOT "%@@product_uc@@_PROPERTIES%" == "" SET IDE_PROPERTIES_PROPERTY="-Didea.properties.file=%@@product_uc@@_PROPERTIES%" :: explicit