summaryrefslogtreecommitdiff
path: root/project/build/CompilationStep.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-01-27 20:24:50 +0000
committerPaul Phillips <paulp@improving.org>2011-01-27 20:24:50 +0000
commit330febc72b402aac2460be2cbc212d5860ed205c (patch)
treed43f7039557f0e6261f49f243e52c69f61eac9f6 /project/build/CompilationStep.scala
parent0d29472c7796ce6462e0893d7f401b56cbad1754 (diff)
downloadscala-330febc72b402aac2460be2cbc212d5860ed205c.tar.gz
scala-330febc72b402aac2460be2cbc212d5860ed205c.tar.bz2
scala-330febc72b402aac2460be2cbc212d5860ed205c.zip
Securing some of the blessings of whitespace fo...
Securing some of the blessings of whitespace for the sbt build. No review.
Diffstat (limited to 'project/build/CompilationStep.scala')
-rw-r--r--project/build/CompilationStep.scala22
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)
}