From 3c2589231cb8ad588795cc2f25aa4e62a9986525 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 13 Oct 2016 12:15:51 +0300 Subject: [PATCH] build scripts: don't add suffix '64' for VM_OPTIONS environment variable in launcher for Windows distribution if 32-bit launcher isn't generated --- .../intellij/build/impl/WindowsDistributionBuilder.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy index a335b551cb1a..d2e245facb84 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy @@ -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()