diff options
Diffstat (limited to 'project/build/CompilationStep.scala')
-rw-r--r-- | project/build/CompilationStep.scala | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/project/build/CompilationStep.scala b/project/build/CompilationStep.scala index f9602b2718..d5fdb73f8c 100644 --- a/project/build/CompilationStep.scala +++ b/project/build/CompilationStep.scala @@ -2,15 +2,15 @@ import sbt._ import AdditionalResources._ trait Step extends Dag[Step] { - def dependencies:Iterable[Step] + def dependencies: Iterable[Step] } -class WrapperStep(contents:List[Step]) extends Step{ +class WrapperStep(contents: List[Step]) extends Step { def dependencies = contents } -abstract class CompilationStep(val name:String, val pathConfig:PathConfig, logger:Logger) extends CompileConfiguration with Step { - def this(name:String, layout:PathLayout,logger:Logger) = this(name, layout / name, logger) +abstract class CompilationStep(val name: String, val pathConfig: PathConfig, logger: Logger) extends CompileConfiguration with Step { + def this(name: String, layout: PathLayout, logger: Logger) = this(name, layout / name, logger) // Utility methods (for quick access, ...) final def srcDir = pathConfig.sources @@ -23,17 +23,17 @@ abstract class CompilationStep(val name:String, val pathConfig:PathConfig, logge final def analysisPath: Path = pathConfig.analysis final def outputDirectory: Path = pathConfig.output def classpath = { - def addDependenciesOutputTo(list:List[Step],acc:PathFinder):PathFinder = list match{ + def addDependenciesOutputTo(list: List[Step], acc: PathFinder): PathFinder = list match { case Nil => acc - case x::xs => x match{ - case c:CompilationStep => addDependenciesOutputTo(xs,acc +++ c.outputDirectory) - case w:WrapperStep => addDependenciesOutputTo(xs, addDependenciesOutputTo(dependencies.toList,acc)) + case x :: xs => x match { + case c: CompilationStep => addDependenciesOutputTo(xs, acc +++ c.outputDirectory) + case w: WrapperStep => addDependenciesOutputTo(xs, addDependenciesOutputTo(dependencies.toList, acc)) } } - addDependenciesOutputTo(dependencies.toList,outputDirectory) + addDependenciesOutputTo(dependencies.toList, outputDirectory) } - def javaOptions: Seq[String] = Seq ("-target","1.5","-source","1.5","-g:none") + def javaOptions: Seq[String] = "-target 1.5 -source 1.5 -g:none" split ' ' def maxErrors: Int = 100 def compileOrder = CompileOrder.JavaThenScala - def fingerprints = Fingerprints(Nil,Nil) + def fingerprints = Fingerprints(Nil, Nil) } |