yet another "home" ambiguity resolved

This commit is contained in:
Maxim Shafirov
2009-10-05 16:47:41 +04:00
parent f14c3d9984
commit 2b1a96481e
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -80,7 +80,7 @@ public def layoutAll(Map args, String home, String out) {
wire_build_date(args.buildNumber)
def layouts = includeFile("$home/build/scripts/layouts.gant")
layouts.layoutFull(paths.distAll)
layouts.layoutFull(home, paths.distAll)
ant.echo(message: args.buildNumber, file: "$paths.distAll/build.txt")
ant.copy(todir: "$paths.distAll/license", preservelastmodified: "true") {
+3 -3
View File
@@ -4,7 +4,7 @@ import static org.jetbrains.jps.idea.IdeaProjectLoader.*
includeTargets << new File("${guessHome(this)}/build/scripts/utils.gant")
target('default' : "Developers update") {
layoutFull(deploy)
layoutFull(home, deploy)
}
def module(String name) {
@@ -43,7 +43,7 @@ private List<String> platformApiModules() {
return ["platform-api", "lvcs-api", "lang-api", "vcs-api", "usageView", "xdebugger-api", "xml-openapi"]
}
def layoutFull(String targetDirectory) {
def layoutFull(String home, String targetDirectory) {
project.stage("layout to $targetDirectory")
//noinspection GroovyAssignabilityCheck
@@ -331,7 +331,7 @@ private def noResources(String moduleName) {
}
}
def reorder(String targetDirectory) {
def reorder(String home, String targetDirectory) {
if (isDefined("util")) {
ant.java(classname: "com.intellij.util.io.zip.ReorderJarsMain", fork: "true") {
arg(value: "$home/build/order.txt")