diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-08 00:35:12 +0000 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-08 00:12:42 -0500 |
commit | 151dab0984902e5a9eb03fb1a18a0da833c2ab13 (patch) | |
tree | 3edb68fefd90e950c22697cf55329adbb5fcd291 | |
parent | e60a2203eb55fe5259663da1b3cc85a302505de4 (diff) | |
download | cbt-151dab0984902e5a9eb03fb1a18a0da833c2ab13.tar.gz cbt-151dab0984902e5a9eb03fb1a18a0da833c2ab13.tar.bz2 cbt-151dab0984902e5a9eb03fb1a18a0da833c2ab13.zip |
filter out 'direct' meta task earlier from the args
-rw-r--r-- | stage1/Stage1.scala | 2 | ||||
-rw-r--r-- | stage2/Stage2.scala | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala index c94d1a4..e20a046 100644 --- a/stage1/Stage1.scala +++ b/stage1/Stage1.scala @@ -165,7 +165,7 @@ object Stage1{ val stage2Args = Stage2Args( new File( args.args(0) ), - args.args.drop(1).toVector, + args.args.drop(1).dropWhile(_ == "direct").toVector, // launcher changes cause entire nailgun restart, so no need for them here cbtHasChanged = cbtHasChanged, classLoaderCache = classLoaderCache, diff --git a/stage2/Stage2.scala b/stage2/Stage2.scala index 3d5c244..b1539bf 100644 --- a/stage2/Stage2.scala +++ b/stage2/Stage2.scala @@ -19,10 +19,9 @@ object Stage2 extends Stage2Base{ logger.stage2(s"Stage2 start") val loop = args.args.lift(0) == Some("loop") - val direct = args.args.lift(0) == Some("direct") val cross = args.args.lift(0) == Some("cross") - val taskIndex = if (loop || direct || cross) { + val taskIndex = if (loop || cross) { 1 } else { 0 |