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

win installer: small refactoring build script and uninstaller for jre32.

Browse Source
This commit is contained in:
Vladimir.Orlov
2018-10-04 15:20:18 +03:00
parent 74c12f077c
commit 1632c6d98f
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/conf/nsis/idea.nsi
-1
View File
@@ -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"
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.groovy
+2 -5
View File
@@ -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")