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

Always add .win.zip suffix for windows distribution; always add .portable suffix for cross-platform zip.

Browse Source 
ref CPP-14770 Publish CLion as Maven dependency for plugin development
This commit is contained in:
Anton Makeev
2018-12-17 18:16:01 +01:00
parent f93af018f6
commit 6987811409
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
+1 -1
View File
@@ -390,7 +390,7 @@ idea.fatal.error.notification=disabled
if (paths.size() == 3) {
buildContext.executeStep("Build cross-platform distribution", BuildOptions.CROSS_PLATFORM_DISTRIBUTION_STEP) {
def crossPlatformBuilder = new CrossPlatformDistributionBuilder(buildContext)
crossPlatformBuilder.buildCrossPlatformZip(paths[0], paths[1], paths[2])
crossPlatformBuilder.buildCrossPlatformZip(paths[0], paths[1], paths[2], ".portable")
}
}
else {
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CrossPlatformDistributionBuilder.groovy
+4 -3
View File
@@ -23,7 +23,7 @@ class CrossPlatformDistributionBuilder {
this.buildContext = buildContext
}
void buildCrossPlatformZip(String winDistPath, String linuxDistPath, String macDistPath) {
void buildCrossPlatformZip(String winDistPath, String linuxDistPath, String macDistPath, String zipNameSuffix) {
buildContext.messages.block("Building cross-platform zip") {
def executableName = buildContext.productProperties.baseFileName
def zipDir = "$buildContext.paths.temp/cross-platform-zip"
@@ -64,8 +64,9 @@ class CrossPlatformDistributionBuilder {
LinuxDistributionBuilder.getFrameClass(buildContext)),
new ProductInfoLaunchData(OsFamily.MACOS.osName, "MacOS/$executableName", null, "bin/mac/${executableName}.vmoptions", null)
])
String suffix = buildContext.bundledJreManager.jreSuffix()
String targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.getBaseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)}${suffix}.zip"
zipNameSuffix += buildContext.bundledJreManager.jreSuffix()
String targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.getBaseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)}${zipNameSuffix}.zip"
buildContext.ant.zip(zipfile: targetPath, duplicate: "fail") {
fileset(dir: buildContext.paths.distAll) {
exclude(name: "bin/idea.properties")
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.groovy
+1 -1
View File
@@ -106,7 +106,7 @@ class WindowsDistributionBuilder extends OsSpecificDistributionBuilder {
}
if (customizer.buildZipArchive) {
buildWinZip(jreDirectoryPaths.findAll {it != null}, buildContext.productProperties.buildCrossPlatformDistribution ? ".win" : "", winDistPath)
buildWinZip(jreDirectoryPaths.findAll {it != null}, ".win", winDistPath)
}
if (arch != null && customizer.buildZipWithBundledOracleJre &&