aboutsummaryrefslogtreecommitdiff
path: root/stage2/BasicBuild.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/BasicBuild.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/BasicBuild.scala')
-rw-r--r--stage2/BasicBuild.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala
index 39cc9e3..f785f01 100644
--- a/stage2/BasicBuild.scala
+++ b/stage2/BasicBuild.scala
@@ -23,7 +23,7 @@ class Build(val context: Context) extends Dependency with TriggerLoop with SbtDe
override def canBeCached = false
def enableConcurrency = false
- final def projectDirectory: File = lib.realpath(context.cwd)
+ final def projectDirectory: File = lib.realpath(context.projectDirectory)
assert( projectDirectory.exists, "projectDirectory does not exist: " ++ projectDirectory.string )
final def usage: String = lib.usage(this.getClass, context)
@@ -89,7 +89,7 @@ class Build(val context: Context) extends Dependency with TriggerLoop with SbtDe
) = lib.ScalaDependency( groupId, artifactId, version, classifier, scalaVersion )
final def BuildDependency(path: File) = cbt.BuildDependency(
- context.copy( cwd = path, args = Seq() )
+ context.copy( projectDirectory = path, args = Seq() )
)
def triggerLoopFiles: Seq[File] = sources ++ transitiveDependencies.collect{ case b: TriggerLoop => b.triggerLoopFiles }.flatten