From a63b6d3ea52d0badb07c2c003f98e77bee7cbdda Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Wed, 6 Apr 2016 22:16:46 -0400 Subject: Correctly interact with build in cwd instead of loading it's managed build in case of a BuildBuild. --- stage2/Stage2.scala | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'stage2/Stage2.scala') 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) -- cgit v1.2.3