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

build scripts: don't add suffix '64' for VM_OPTIONS environment variable in launcher for Windows distribution if 32-bit launcher isn't generated

Browse Source
This commit is contained in:
nik
2016-10-13 14:18:05 +03:00
parent 6966bfb45c
commit 3c2589231c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
+2 -1
View File
@@ -162,6 +162,7 @@ class WindowsDistributionBuilder extends OsSpecificDistributionBuilder {
def productName = buildContext.applicationInfo.shortProductName
String jdkEnvVarSuffix = arch == JvmArchitecture.x64 && customizer.include32BitLauncher ? "_64" : "";
String vmOptionsEnvVarSuffix = arch == JvmArchitecture.x64 && customizer.include32BitLauncher ? "64" : ""
def envVarBaseName = buildContext.productProperties.environmentVariableBaseName(buildContext.applicationInfo)
new File(launcherPropertiesPath).text = """
IDS_JDK_ONLY=$buildContext.productProperties.toolsJarRequired
@@ -172,7 +173,7 @@ IDS_VM_OPTION_ERRORFILE=-XX:ErrorFile=%USERPROFILE%\\\\java_error_in_${lowerCase
IDS_VM_OPTION_HEAPDUMPPATH=-XX:HeapDumpPath=%USERPROFILE%\\\\java_error_in_${lowerCaseProductName}.hprof
IDC_WINLAUNCHER=${upperCaseProductName}_LAUNCHER
IDS_PROPS_ENV_VAR=${envVarBaseName}_PROPERTIES
IDS_VM_OPTIONS_ENV_VAR=$envVarBaseName${arch.fileSuffix}_VM_OPTIONS
IDS_VM_OPTIONS_ENV_VAR=$envVarBaseName${vmOptionsEnvVarSuffix}_VM_OPTIONS
IDS_ERROR_LAUNCHING_APP=Error launching $productName
IDS_VM_OPTIONS=$vmOptions
""".trim()