diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-13 14:47:25 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-13 15:29:33 -0500 |
| commit | 4b7aec94eaf1200f4ac19a755af8b8cf8601f5d6 (patch) | |
| tree | 7119093e9dc0df2569baf71703afe145e8e79c60 | |
| parent | ff6856395499853f3dc10723a0c722ee4c33fed7 (diff) | |
| download | cbt-4b7aec94eaf1200f4ac19a755af8b8cf8601f5d6.tar.gz cbt-4b7aec94eaf1200f4ac19a755af8b8cf8601f5d6.tar.bz2 cbt-4b7aec94eaf1200f4ac19a755af8b8cf8601f5d6.zip | |
small refactoring simplifying Stage2
| -rw-r--r-- | nailgun_launcher/NailgunLauncher.java | 2 | ||||
| -rw-r--r-- | stage1/Stage1.scala | 9 | ||||
| -rw-r--r-- | stage2/Stage2.scala | 9 |
3 files changed, 10 insertions, 10 deletions
diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java index dede00b..944daf8 100644 --- a/nailgun_launcher/NailgunLauncher.java +++ b/nailgun_launcher/NailgunLauncher.java @@ -26,7 +26,7 @@ public class NailgunLauncher{ public static String TARGET = System.getenv("TARGET"); private static String NAILGUN = "nailgun_launcher/"; private static String STAGE1 = "stage1/"; - + @SuppressWarnings("unchecked") public static Object getBuild( Object context ) throws Throwable{ BuildStage1Result res = buildStage1( 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( diff --git a/stage2/Stage2.scala b/stage2/Stage2.scala index 34128ac..b7b6d33 100644 --- a/stage2/Stage2.scala +++ b/stage2/Stage2.scala @@ -2,13 +2,8 @@ package cbt import java.io._ object Stage2 extends Stage2Base{ - def getBuild(__context: java.lang.Object, _cbtChanged: java.lang.Boolean) = { - val _context = __context.asInstanceOf[Context] - val context = _context.copy( - cbtHasChanged = _context.cbtHasChanged || _cbtChanged - ) - val first = new Lib(context.logger).loadRoot( context ) - first.finalBuild + def getBuild(context: Context) = { + new Lib( context.logger ).loadRoot( context ).finalBuild } def run( args: Stage2Args ): Unit = { |