diff --git a/build/conf/nsis/silent.config b/build/conf/nsis/silent.config index cad3e60f8142..ecca4ad6792c 100644 --- a/build/conf/nsis/silent.config +++ b/build/conf/nsis/silent.config @@ -7,6 +7,4 @@ launcher32=0 launcher64=1 ; Download and install jre32 -jre32=0 - -@@List of associations@@ +jre32=0 \ No newline at end of file diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy index c9fd0270475d..d93c7ca7f566 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy @@ -38,28 +38,24 @@ class WinExeInstallerBuilder { } private void generateInstallationConfigFileForSilentMode() { - String silentConfig = customizer.silentInstallationConfig == null ? + File silentConfigFile = new File (customizer.silentInstallationConfig == null ? "$buildContext.paths.communityHome/build/conf/nsis/silent.config" : - customizer.silentInstallationConfig - if (! new File(silentConfig).exists()) { + customizer.silentInstallationConfig) + if (! silentConfigFile.exists()) { buildContext.messages.error( "Silent config file for Windows installer won't be generated. The template doesn't exist: '${silentConfig}'") } else { def extensionsList = customizer.fileAssociations - String associations = "; List of associations. To create an association change value to 1.\n" + String associations = "\n\n; List of associations. To create an association change value to 1.\n" if (! extensionsList.isEmpty()) { associations += extensionsList.collect { "$it=0\n" }.join("") } else { - associations = "; There are no associations for the product.\n" - } - buildContext.ant.copy(todir: "${buildContext.paths.artifacts}") { - fileset(file: silentConfig) - filterset(begintoken: "@@", endtoken: "@@") { - filter(token: "List of associations", value: associations) - } + associations = "\n\n; There are no associations for the product.\n" } + silentConfigFile.append(associations) + buildContext.ant.copy(file: silentConfigFile, todir: "${buildContext.paths.artifacts}") } }