diff options
author | michelou <michelou@epfl.ch> | 2006-11-10 13:44:36 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2006-11-10 13:44:36 +0000 |
commit | c7a3100b0824c17eb6d2890cdcd869e47387bdd5 (patch) | |
tree | 521853f16de41cf6fdfc12f906735cd156c876f6 | |
parent | 064217d20c8c5b41a1b282c837214f404314ab44 (diff) | |
download | scala-c7a3100b0824c17eb6d2890cdcd869e47387bdd5.tar.gz scala-c7a3100b0824c17eb6d2890cdcd869e47387bdd5.tar.bz2 scala-c7a3100b0824c17eb6d2890cdcd869e47387bdd5.zip |
moved cmdOptions into if-test in FastScalac.scala
-rw-r--r-- | src/compiler/scala/tools/ant/FastScalac.scala | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/src/compiler/scala/tools/ant/FastScalac.scala b/src/compiler/scala/tools/ant/FastScalac.scala index 47dc7b1fee..68c7acc48f 100644 --- a/src/compiler/scala/tools/ant/FastScalac.scala +++ b/src/compiler/scala/tools/ant/FastScalac.scala @@ -5,7 +5,7 @@ ** ** \* */ -// $Id: $ +// $Id$ package scala.tools.ant { @@ -66,38 +66,34 @@ package scala.tools.ant { ** The execute method ** \*============================================================================*/ - private def trim(xs: List[String]) = xs filter (x => x.length > 0) - /** Performs the compilation. */ override def execute() = { val Pair(settings, sourceFiles) = initialize - val reset = settings.BooleanSetting("-reset", "Reset compile server caches") - //val server = settings.StringSetting("-server", "serverAddr", "Specify compile server socket", "") - val shutdown = settings.BooleanSetting("-shutdown", "Shutdown compile server") - - reset.value = resetCaches - shutdown.value = shutdownServer - val cmdOptions = - // StringSetting - List.flatten( - List(settings.outdir, settings.classpath, settings.bootclasspath, - settings.extdirs, settings.encoding) map (s => List(s.nme, s.value))) ::: - // '-server' option - (if (serverAddr.isEmpty) Nil else List("-server", serverAddr.get)) ::: - // ChoiceSetting - (List(settings.debuginfo, settings.target) map (s => s.nme + ":" + s.value)) ::: - // BooleanSetting - trim( - List(settings.debug, settings.deprecation, settings.nopredefs, - settings.verbose, reset, shutdown) map (s => if (s.value) s.nme else "")) ::: - // PhaseSetting - trim( - List(settings.log) map (s => if (s.value.isEmpty) "" else s.nme + ":" + s.value)) - //Console.println("options="+cmdOptions)//debug - //Console.println("files="+sourceFiles)//debug - if (!sourceFiles.isEmpty) { + def trim(xs: List[String]) = xs filter (x => x.length > 0) + val reset = settings.BooleanSetting("-reset", "Reset compile server caches") + val shutdown = settings.BooleanSetting("-shutdown", "Shutdown compile server") + + reset.value = resetCaches + shutdown.value = shutdownServer + val cmdOptions = + // StringSetting + List.flatten( + List(settings.outdir, settings.classpath, settings.bootclasspath, + settings.extdirs, settings.encoding) map (s => List(s.nme, s.value))) ::: + // '-server' option + (if (serverAddr.isEmpty) Nil else List("-server", serverAddr.get)) ::: + // ChoiceSetting + (List(settings.debuginfo, settings.target) map (s => s.nme + ":" + s.value)) ::: + // BooleanSetting + trim( + List(settings.debug, settings.deprecation, settings.nopredefs, + settings.verbose, reset, shutdown) map (s => if (s.value) s.nme else "")) ::: + // PhaseSetting + trim( + List(settings.log) map (s => if (s.value.isEmpty) "" else s.nme + ":" + s.value)) + val args = (cmdOptions ::: (sourceFiles map (.toString()))).toArray try { nsc.CompileClient.main0(args) |