aboutsummaryrefslogtreecommitdiff
path: root/stage2/Stage2.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/Stage2.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/Stage2.scala')
-rw-r--r--stage2/Stage2.scala7
1 files changed, 3 insertions, 4 deletions
diff --git a/stage2/Stage2.scala b/stage2/Stage2.scala
index 4ae149c..0856f54 100644
--- a/stage2/Stage2.scala
+++ b/stage2/Stage2.scala
@@ -22,8 +22,8 @@ object Stage2 extends Stage2Base{
0
}
val task = args.args.lift( taskIndex )
-
- val context = Context( args.cwd, args.args.drop( taskIndex ), logger, args.cbtHasChanged, new ClassLoaderCache(logger) )
+
+ val context = Context( args.cwd, args.cwd, args.args.drop( taskIndex ), logger, args.cbtHasChanged, new ClassLoaderCache(logger) )
val first = lib.loadRoot( context )
val build = first.finalBuild
@@ -44,9 +44,8 @@ object Stage2 extends Stage2Base{
case file if triggerFiles.exists(file.toString startsWith _.toString) =>
val build = lib.loadDynamic(context)
- val reflectBuild = new lib.ReflectBuild( build )
logger.loop(s"Re-running $task for " ++ build.projectDirectory.toString)
- reflectBuild.callNullary(task)
+ new lib.ReflectBuild(build).callNullary(task)
}
} else {
new lib.ReflectBuild(build).callNullary(task)