aboutsummaryrefslogtreecommitdiff
path: root/stage1
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-11-13 14:47:25 -0500
committerChristopher Vogt <oss.nsp@cvogt.org>2016-11-13 15:29:33 -0500
commit4b7aec94eaf1200f4ac19a755af8b8cf8601f5d6 (patch)
tree7119093e9dc0df2569baf71703afe145e8e79c60 /stage1
parentff6856395499853f3dc10723a0c722ee4c33fed7 (diff)
downloadcbt-4b7aec94eaf1200f4ac19a755af8b8cf8601f5d6.tar.gz
cbt-4b7aec94eaf1200f4ac19a755af8b8cf8601f5d6.tar.bz2
cbt-4b7aec94eaf1200f4ac19a755af8b8cf8601f5d6.zip
small refactoring simplifying Stage2
Diffstat (limited to 'stage1')
-rw-r--r--stage1/Stage1.scala9
1 files changed, 7 insertions, 2 deletions
diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala
index 81b008f..d559dd4 100644
--- a/stage1/Stage1.scala
+++ b/stage1/Stage1.scala
@@ -72,8 +72,13 @@ object Stage1{
classLoader
.loadClass("cbt.Stage2")
- .getMethod( "getBuild", classOf[java.lang.Object], classOf[java.lang.Boolean] )
- .invoke(null, context, (buildStage1.changed || changed): java.lang.Boolean)
+ .getMethod( "getBuild", classOf[Context] )
+ .invoke(
+ null,
+ context.copy(
+ cbtHasChanged = context.cbtHasChanged || buildStage1.changed || changed // might be redundant
+ )
+ )
}
def buildStage2(