From f71fdaafc881e983549b1b9713af8bfcf0efe895 Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Mon, 11 Mar 2019 11:55:31 +0300 Subject: [PATCH] windows installer: name for checkbox of single 64bit shortcut for IDEA IC is too long. --- build/conf/nsis/idea.nsi | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi index d4a20ed784cc..cfa1e10462a8 100644 --- a/build/conf/nsis/idea.nsi +++ b/build/conf/nsis/idea.nsi @@ -383,16 +383,22 @@ FunctionEnd Function ConfirmDesktopShortcut !insertmacro MUI_HEADER_TEXT "$(installation_options)" "$(installation_options_prompt)" - ; shortcut for 64-bit launcher. - StrCpy $R0 "${MUI_PRODUCT} launcher" - StrCpy $R1 "" - ; not suggest user to create shortcut for 32Bit launcher if bundled jre does not support 32Bit. - StrCmp ${JRE_32BIT_VERSION_SUPPORTED} "0" get_installation_options_positions 0 + StrCmp ${JRE_32BIT_VERSION_SUPPORTED} "0" 0 jre_32bit_version_supported + ; shortcut for 64-bit launcher. + StrCpy $R0 "64-bit launcher" + StrCpy $R1 "" + Goto get_installation_options_positions + +jre_32bit_version_supported: ${StrRep} $0 ${PRODUCT_EXE_FILE} "64.exe" ".exe" ${If} $0 == ${PRODUCT_EXE_FILE} ; shortcuts for 32-bit and 64-bit. StrCpy $R0 "32-bit launcher" StrCpy $R1 "64-bit launcher" + ${Else} + ;there is only one launcher and it is 64-bit. + StrCpy $R0 "${MUI_PRODUCT} launcher" + StrCpy $R1 "" ${EndIf} get_installation_options_positions: