diff options
-rw-r--r-- | nailgun_launcher/EarlyDependencies.java | 2 | ||||
-rw-r--r-- | stage1/Stage1.scala | 4 | ||||
-rw-r--r-- | stage2/ToolsStage2.scala (renamed from stage2/AdminStage2.scala) | 10 | ||||
-rw-r--r-- | stage2/ToolsTasks.scala (renamed from stage2/AdminTasks.scala) | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/nailgun_launcher/EarlyDependencies.java b/nailgun_launcher/EarlyDependencies.java index 7a8d033..74719c3 100644 --- a/nailgun_launcher/EarlyDependencies.java +++ b/nailgun_launcher/EarlyDependencies.java @@ -1,4 +1,4 @@ -// This file was auto-generated using `cbt admin cbtEarlyDependencies` +// This file was auto-generated using `cbt tools cbtEarlyDependencies` package cbt; import java.io.*; import java.nio.file.*; diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala index e501300..5b52f50 100644 --- a/stage1/Stage1.scala +++ b/stage1/Stage1.scala @@ -29,7 +29,7 @@ final case class Stage1ArgsParser(__args: Seq[String]) { val enabledLoggers = props.get("log") - val admin = _args contains "admin" + val tools = _args contains "tools" } @@ -176,7 +176,7 @@ object Stage1{ val exitCode = ( classLoader .loadClass( - if(args.admin) "cbt.AdminStage2" else "cbt.Stage2" + if(args.tools) "cbt.ToolsStage2" else "cbt.Stage2" ) .getMethod( "run", classOf[Stage2Args] ) .invoke( diff --git a/stage2/AdminStage2.scala b/stage2/ToolsStage2.scala index f4e61d0..df615fc 100644 --- a/stage2/AdminStage2.scala +++ b/stage2/ToolsStage2.scala @@ -1,12 +1,12 @@ package cbt import java.io._ -object AdminStage2 extends Stage2Base{ +object ToolsStage2 extends Stage2Base{ def run( _args: Stage2Args ): Unit = { - val args = _args.args.dropWhile(Seq("admin","direct") contains _) + val args = _args.args.dropWhile(Seq("tools","direct") contains _) val lib = new Lib(_args.logger) - val adminTasks = new AdminTasks(lib, args, _args.cwd, _args.classLoaderCache, _args.cache, _args.cbtHome, _args.cbtHasChanged) - new lib.ReflectObject(adminTasks){ - def usage: String = "Available methods: " ++ lib.taskNames(adminTasks.getClass).mkString(" ") + val toolsTasks = new ToolsTasks(lib, args, _args.cwd, _args.classLoaderCache, _args.cache, _args.cbtHome, _args.cbtHasChanged) + new lib.ReflectObject(toolsTasks){ + def usage: String = "Available methods: " ++ lib.taskNames(toolsTasks.getClass).mkString(" ") }.callNullary(args.lift(0)) } } diff --git a/stage2/AdminTasks.scala b/stage2/ToolsTasks.scala index 56d6ddf..46f1336 100644 --- a/stage2/AdminTasks.scala +++ b/stage2/ToolsTasks.scala @@ -2,7 +2,7 @@ package cbt import scala.collection.immutable.Seq import java.io.{Console=>_,_} import java.nio.file._ -class AdminTasks( +class ToolsTasks( lib: Lib, args: Seq[String], cwd: File, @@ -100,7 +100,7 @@ class AdminTasks( val assignments = codeEach(zinc) ++ codeEach(scalaXml) val files = scalaDeps ++ transitive(scalaXml) ++ transitive(zinc) //{ case (name, dep) => s"$name =\n ${tree(dep, 4)};" }.mkString("\n\n ") - val code = s"""// This file was auto-generated using `cbt admin cbtEarlyDependencies` + val code = s"""// This file was auto-generated using `cbt tools cbtEarlyDependencies` package cbt; import java.io.*; import java.nio.file.*; |