From 6ff83f3b522d8c4db96f90970127efd0bbacc7d2 Mon Sep 17 00:00:00 2001 From: Leonid Shalupov Date: Tue, 13 Jul 2021 16:52:02 +0300 Subject: [PATCH] installers: assert jre exists for zipArchiveWithBundledJre GitOrigin-RevId: c1139ae12b08d7d9a5466b9c759c1c1b54fec8e4 --- .../build/impl/WindowsDistributionBuilder.groovy | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy index b31b9c92b006..228a2fd14afc 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy @@ -106,7 +106,16 @@ final class WindowsDistributionBuilder extends OsSpecificDistributionBuilder { } if (customizer.buildZipArchive) { - List jreDirectoryPaths = customizer.zipArchiveWithBundledJre ? [jreDir] : [] + List jreDirectoryPaths + if (customizer.zipArchiveWithBundledJre) { + if (jreDir == null) { + buildContext.messages.error("Bundled jre is not found, but it's required for .win.zip") + } + + jreDirectoryPaths = [jreDir] + } else { + jreDirectoryPaths = [] + } zipPath = buildWinZip(jreDirectoryPaths, ".win", winDistPath) }