aboutsummaryrefslogtreecommitdiff
path: root/stage2/BuildDependency.scala
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-04-06 22:16:46 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2016-04-06 22:51:51 -0400
commita63b6d3ea52d0badb07c2c003f98e77bee7cbdda (patch)
tree517b43916adfc3a0e4ac6a1f52176b135d052d43 /stage2/BuildDependency.scala
parent0195249ebf44bf0f797a976d884350f963982ec1 (diff)
downloadcbt-a63b6d3ea52d0badb07c2c003f98e77bee7cbdda.tar.gz
cbt-a63b6d3ea52d0badb07c2c003f98e77bee7cbdda.tar.bz2
cbt-a63b6d3ea52d0badb07c2c003f98e77bee7cbdda.zip
Correctly interact with build in cwd instead of loading it's managed build in case of a BuildBuild.
Diffstat (limited to 'stage2/BuildDependency.scala')
-rw-r--r--stage2/BuildDependency.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/stage2/BuildDependency.scala b/stage2/BuildDependency.scala
index 19357f9..8965cee 100644
--- a/stage2/BuildDependency.scala
+++ b/stage2/BuildDependency.scala
@@ -16,7 +16,7 @@ trait TriggerLoop extends Dependency{
}
/** You likely want to use the factory method in the BasicBuild class instead of this. */
case class BuildDependency(context: Context) extends TriggerLoop{
- override def show = this.getClass.getSimpleName ++ "(" ++ context.cwd.string ++ ")"
+ override def show = this.getClass.getSimpleName ++ "(" ++ context.projectDirectory.string ++ ")"
final override lazy val logger = context.logger
final override lazy val lib: Lib = new Lib(logger)
private val root = lib.loadRoot( context.copy(args=Seq()) )
@@ -31,7 +31,7 @@ case class BuildDependency(context: Context) extends TriggerLoop{
}
/*
case class DependencyOr(first: BuildDependency, second: JavaDependency) extends ProjectProxy with BuildDependencyBase{
- val isFirst = new File(first.context.cwd).exists
+ val isFirst = new File(first.context.projectDirectory).exists
def triggerLoopFiles = if(isFirst) first.triggerLoopFiles else Seq()
protected val delegate = if(isFirst) first else second
}