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

build scripts: fix generation of product-info.json for Windows distribution if JRE is not bundled

Browse Source
This commit is contained in:
nik
2018-10-04 11:19:44 +03:00
parent 74cf8d356a
commit ec545d9be3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
+2 -2
View File
@@ -103,7 +103,7 @@ class WindowsDistributionBuilder extends OsSpecificDistributionBuilder {
}
if (customizer.buildZipArchive) {
buildWinZip(jreDirectoryPaths, buildContext.productProperties.buildCrossPlatformDistribution ? ".win" : "", winDistPath)
buildWinZip(jreDirectoryPaths.findAll {it != null}, buildContext.productProperties.buildCrossPlatformDistribution ? ".win" : "", winDistPath)
}
if (arch != null && customizer.buildZipWithBundledOracleJre &&
@@ -235,7 +235,7 @@ IDS_VM_OPTIONS=$vmOptions
buildContext.messages.block("Build Windows ${zipNameSuffix}.zip distribution") {
def targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.getBaseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)}${zipNameSuffix}.zip"
def zipPrefix = customizer.getRootDirectoryName(buildContext.applicationInfo, buildContext.buildNumber)
def dirs = [buildContext.paths.distAll, winDistPath] + jreDirectoryPaths.findAll {it != null}
def dirs = [buildContext.paths.distAll, winDistPath] + jreDirectoryPaths
buildContext.messages.progress("Building Windows ${zipNameSuffix}.zip archive")
def productJsonDir = new File(buildContext.paths.temp, "win.dist.product-info.json.zip$zipNameSuffix").absolutePath
generateProductJson(productJsonDir, !jreDirectoryPaths.isEmpty())