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

don't package two copies of idea.properties into Mac zip, package only the Mac generated one

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-11-09 18:41:03 +01:00
parent f0d075f224
commit d93acfd9e9
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/dist.gant
+1 -1
View File
@@ -123,7 +123,7 @@ def layoutAll(Map args, String home, String out, Paths _paths = null) {
buildWinZip("$paths.artifacts/idea${args.buildNumber}.win.zip", [paths.distAll, paths.distWin])
def macAppRoot = isEap() ? "${p("component.version.codename")}-${args.buildNumber}.app" : "IntelliJ IDEA ${p("component.version.major")} CE.app"
buildMacZip(macAppRoot, "$paths.artifacts/idea${args.buildNumber}.mac.zip", [paths.distAll, paths.distMac])
buildMacZip(macAppRoot, "$paths.artifacts/idea${args.buildNumber}.mac.zip", [paths.distAll], paths.distMac)
buildTarGz("idea-${args.buildNumber}", "$paths.artifacts/idea${args.buildNumber}.tar", [paths.distAll, paths.distUnix])
}
build/scripts/utils.gant
+7 -3
View File
@@ -626,11 +626,12 @@ binding.setVariable("buildWinZip", { String zipPath, List paths ->
notifyArtifactBuilt(zipPath)
})
binding.setVariable("buildMacZip", { String zipRoot, String zipPath, List paths, List extraBins = [] ->
binding.setVariable("buildMacZip", { String zipRoot, String zipPath, List paths, List macPath, List extraBins = [] ->
projectBuilder.stage(".mac.zip")
allPaths = paths + [macPath]
ant.zip(zipfile: zipPath) {
paths.each {
allPaths.each {
zipfileset(dir: it, prefix: zipRoot) {
exclude(name: "bin/*.sh")
exclude(name: "bin/fsnotifier")
@@ -639,10 +640,13 @@ binding.setVariable("buildMacZip", { String zipRoot, String zipPath, List paths,
extraBins.each {
exclude(name: it)
}
if (it != macPath) {
exclude(name: "bin/idea.properties")
}
}
}
paths.each {
allPaths.each {
zipfileset(dir: it, filemode: "755", prefix: zipRoot) {
include(name: "bin/*.sh")
include(name: "bin/fsnotifier")