From 1632c6d98fc43fc38e0e345f173ec8a81c9ae53e Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Thu, 4 Oct 2018 15:17:53 +0300
Subject: [PATCH] win installer: small refactoring build script and uninstaller
 for jre32.

---
 build/conf/nsis/idea.nsi                                   | 1 -
 .../intellij/build/impl/WinExeInstallerBuilder.groovy      | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi
index ef102db58e06..1fbc82340c3f 100644
--- a/build/conf/nsis/idea.nsi
+++ b/build/conf/nsis/idea.nsi
@@ -1593,7 +1593,6 @@ skip_delete_settings:
     Delete "$INSTDIR\jre32\bin\server\classes.jsa"
     StrCpy $0 "$INSTDIR\jre32\lib\applet"
     Call un.DeleteDirIfEmpty
-    !include "un_jre32_win.nsh"
 no_jre32:
   !include "unidea_win.nsh"
   StrCpy $0 "$INSTDIR"
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 89fada8c3ba4..3672050e0816 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
@@ -118,16 +118,13 @@ class WinExeInstallerBuilder {
         generator.addDirectory(jreDirectoryPath)
       }
       generator.generateInstallerFile(new File(box, "nsiconf/idea_win.nsh"))
-      generator.generateUninstallerFile(new File(box, "nsiconf/unidea_win.nsh"))
-
       if (buildContext.bundledJreManager.is32bitArchSupported()) {
         String jre32Dir = buildContext.bundledJreManager.extractWinJre(JvmArchitecture.x32)
         if (jre32Dir != null) {
-          def generatorForJre32Dir = new NsisFileListGenerator()
-          generatorForJre32Dir.addDirectory(jre32Dir + "/jre32")
-          generatorForJre32Dir.generateUninstallerFile("\$INSTDIR\\jre32", new File(box, "nsiconf/un_jre32_win.nsh"))
+          generator.addDirectory(jre32Dir)
         }
       }
+      generator.generateUninstallerFile(new File(box, "nsiconf/unidea_win.nsh"))
     }
     catch (IOException e) {
       buildContext.messages.error("Failed to generated list of files for NSIS installer: $e")