diff options
| -rwxr-xr-x | cbt | 8 | ||||
| -rw-r--r-- | stage1/Stage1.scala | 12 |
2 files changed, 4 insertions, 16 deletions
@@ -192,12 +192,8 @@ stage1 () { fi log "run CBT and loop if desired. This allows recompiling CBT itself as part of compile looping." $* - if [ "$1" = "admin" ] || [ "$2" = "admin" ]; then - mainClass=cbt.AdminStage1 - else - mainClass=cbt.Stage1 - fi - + mainClass=cbt.Stage1 + CP=$STAGE1$TARGET:$SCALA_CLASSPATH if [ $use_nailgun -eq 1 ] then diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala index 417920c..a593c03 100644 --- a/stage1/Stage1.scala +++ b/stage1/Stage1.scala @@ -31,22 +31,14 @@ class Init(args: Array[String]) { val logger = new Logger(props.get("log")) } -object Stage1 extends Stage1Base{ - def mainClass = ("cbt.Stage2") -} - -object AdminStage1 extends Stage1Base{ - def mainClass = ("cbt.AdminStage2") -} - -abstract class Stage1Base{ - def mainClass: String +object Stage1{ protected def newerThan( a: File, b: File ) ={ a.lastModified > b.lastModified } def main(args: Array[String]): Unit = { + val mainClass = if(args contains "admin") "cbt.AdminStage2" else "cbt.Stage2" val init = new Init(args) val lib = new Stage1Lib(init.logger) import lib._ |