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: extracted common suffix from MacDistributionCustomizer::rootDirectoryName, default implementation specified

Browse Source
This commit is contained in:
nik
2016-07-22 20:49:58 +03:00
parent 2ae9e7ee36
commit 32f76d62e2
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
+2 -2
View File
@@ -91,8 +91,8 @@ class IdeaCommunityProperties extends ProductProperties {
@Override
String rootDirectoryName(ApplicationInfoProperties applicationInfo, String buildNumber) {
applicationInfo.isEAP ? "IntelliJ IDEA ${applicationInfo.majorVersion}.${applicationInfo.minorVersion} CE EAP.app/Contents"
: "IntelliJ IDEA CE.app/Contents"
applicationInfo.isEAP ? "IntelliJ IDEA ${applicationInfo.majorVersion}.${applicationInfo.minorVersion} CE EAP.app"
: "IntelliJ IDEA CE.app"
}
}
}
build/groovy/org/jetbrains/intellij/build/MacDistributionCustomizer.groovy
+4 -1
View File
@@ -104,7 +104,10 @@ abstract class MacDistributionCustomizer {
* @param buildNumber current build number
* @return application bundle directory name
*/
abstract String rootDirectoryName(ApplicationInfoProperties applicationInfo, String buildNumber)
String rootDirectoryName(ApplicationInfoProperties applicationInfo, String buildNumber) {
String suffix = applicationInfo.isEAP ? " ${applicationInfo.majorVersion}.${applicationInfo.minorVersion} EAP" : ""
"$applicationInfo.productName${suffix}.app"
}
/**
* Custom properties to be added to the properties file. They will be used for launched product, e.g. you can add additional logging in EAP builds
build/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
+1 -1
View File
@@ -213,7 +213,7 @@ class MacDistributionBuilder {
return buildContext.messages.block("Build zip archive for Mac OS") {
def extraBins = customizer.extraExecutables
def allPaths = [buildContext.paths.distAll, macDistPath]
def zipRoot = customizer.rootDirectoryName(buildContext.applicationInfo, buildContext.buildNumber)
String zipRoot = "${customizer.rootDirectoryName(buildContext.applicationInfo, buildContext.buildNumber)}/Contents"
def targetPath = "$buildContext.paths.artifacts/${buildContext.productProperties.baseArtifactName(buildContext.applicationInfo, buildContext.buildNumber)}.mac.zip"
buildContext.ant.zip(zipfile: targetPath) {
allPaths.each {