From 2b1a96481e5c99fd61ca8ed97b8964962e92bb27 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Mon, 5 Oct 2009 16:47:41 +0400 Subject: [PATCH] yet another "home" ambiguity resolved --- build/scripts/dist.gant | 2 +- build/scripts/layouts.gant | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant index 467519f2b8e7..5f28d29af106 100644 --- a/build/scripts/dist.gant +++ b/build/scripts/dist.gant @@ -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") { diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index a4add3ecaf42..a5957d07ba41 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -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 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")