diff options
author | michelou <michelou@epfl.ch> | 2009-03-03 18:43:32 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2009-03-03 18:43:32 +0000 |
commit | 3489c4fdd12e2bbcf5e0f3ad1b2b561f624451d9 (patch) | |
tree | 15af684a8ae95d166f75a074855e20044c382af2 /src/compiler | |
parent | 51c487b1269daa98bcf114dbab8fd5f5f03d4d3f (diff) | |
download | scala-3489c4fdd12e2bbcf5e0f3ad1b2b561f624451d9.tar.gz scala-3489c4fdd12e2bbcf5e0f3ad1b2b561f624451d9.tar.bz2 scala-3489c4fdd12e2bbcf5e0f3ad1b2b561f624451d9.zip |
updated svn keywords
Diffstat (limited to 'src/compiler')
10 files changed, 59 insertions, 25 deletions
diff --git a/src/compiler/scala/tools/ant/sabbus/Break.scala b/src/compiler/scala/tools/ant/sabbus/Break.scala index e1b0090cb2..3a8451e6ef 100644 --- a/src/compiler/scala/tools/ant/sabbus/Break.scala +++ b/src/compiler/scala/tools/ant/sabbus/Break.scala @@ -6,19 +6,21 @@ ** |/ ** \* */ +// $Id$ + package scala.tools.ant.sabbus import org.apache.tools.ant.Task class Break extends Task { - def setId(input: String): Unit = { + def setId(input: String) { id = Some(input) } private var id: Option[String] = None - override def execute: Unit = { + override def execute { if (id.isEmpty) error("Attribute 'id' is not set") Compilers.break(id.get) } diff --git a/src/compiler/scala/tools/ant/sabbus/CompilationFailure.scala b/src/compiler/scala/tools/ant/sabbus/CompilationFailure.scala index d93181007f..f73a482d15 100644 --- a/src/compiler/scala/tools/ant/sabbus/CompilationFailure.scala +++ b/src/compiler/scala/tools/ant/sabbus/CompilationFailure.scala @@ -6,6 +6,8 @@ ** |/ ** \* */ +// $Id$ + package scala.tools.ant.sabbus case class CompilationFailure(message: String, cause: Exception) extends Exception(message, cause) diff --git a/src/compiler/scala/tools/ant/sabbus/Compiler.scala b/src/compiler/scala/tools/ant/sabbus/Compiler.scala index 46bc62e40f..cd5b4a88aa 100644 --- a/src/compiler/scala/tools/ant/sabbus/Compiler.scala +++ b/src/compiler/scala/tools/ant/sabbus/Compiler.scala @@ -6,6 +6,8 @@ ** |/ ** \* */ +// $Id$ + package scala.tools.ant.sabbus import java.io.File diff --git a/src/compiler/scala/tools/ant/sabbus/Compilers.scala b/src/compiler/scala/tools/ant/sabbus/Compilers.scala index e946d7bf7c..ba90614f80 100644 --- a/src/compiler/scala/tools/ant/sabbus/Compilers.scala +++ b/src/compiler/scala/tools/ant/sabbus/Compilers.scala @@ -6,6 +6,8 @@ ** |/ ** \* */ +// $Id$ + package scala.tools.ant.sabbus import java.net.URL diff --git a/src/compiler/scala/tools/ant/sabbus/ForeignCompiler.scala b/src/compiler/scala/tools/ant/sabbus/ForeignCompiler.scala index ca6f385da1..06a429fe2b 100644 --- a/src/compiler/scala/tools/ant/sabbus/ForeignCompiler.scala +++ b/src/compiler/scala/tools/ant/sabbus/ForeignCompiler.scala @@ -6,6 +6,8 @@ ** |/ ** \* */ +// $Id$ + package scala.tools.ant.sabbus import java.io.File @@ -17,7 +19,7 @@ class ForeignCompiler { private var argsBuffer: Array[String] = null def args: Array[String] = argsBuffer - def args_=(a: Array[String]): Unit = { + def args_=(a: Array[String]) { argsBuffer = a nsc } diff --git a/src/compiler/scala/tools/ant/sabbus/Make.scala b/src/compiler/scala/tools/ant/sabbus/Make.scala index ebdc4f94f3..93f8a60e16 100644 --- a/src/compiler/scala/tools/ant/sabbus/Make.scala +++ b/src/compiler/scala/tools/ant/sabbus/Make.scala @@ -6,15 +6,15 @@ ** |/ ** \* */ +// $Id$ + package scala.tools.ant.sabbus -import java.net.URL import java.io.File import org.apache.tools.ant.Task -import org.apache.tools.ant.types.{Path, Reference} class Make extends Task with TaskArgs { - override def execute: Unit = { + override def execute { if (id.isEmpty) error("Mandatory attribute 'id' is not set.") if (compilerPath.isEmpty) error("Mandatory attribute 'compilerpath' is not set.") val settings = new Settings diff --git a/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala b/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala index e973672bf3..f70400fea8 100644 --- a/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala +++ b/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala @@ -1,7 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala Ant Tasks ** +** / __/ __// _ | / / / _ | (c) 2005-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + package scala.tools.ant.sabbus -import java.io.File; -import org.apache.tools.ant.Project; +import java.io.File +import org.apache.tools.ant.Project import org.apache.tools.ant.taskdefs.{MatchingTask, Java} import org.apache.tools.ant.util.{GlobPatternMapper, SourceFileScanner} @@ -10,15 +20,15 @@ class ScalacFork extends MatchingTask with TaskArgs { sourceDir = Some(input) } - def setFailOnError(input: Boolean): Unit = { + def setFailOnError(input: Boolean) { failOnError = input } - def setTimeout(input: Long): Unit = { + def setTimeout(input: Long) { timeout = Some(input) } - def setJvmArgs(input: String): Unit = { + def setJvmArgs(input: String) { jvmArgs = Some(input) } diff --git a/src/compiler/scala/tools/ant/sabbus/Settings.scala b/src/compiler/scala/tools/ant/sabbus/Settings.scala index fcd8321ead..ccc8448f88 100644 --- a/src/compiler/scala/tools/ant/sabbus/Settings.scala +++ b/src/compiler/scala/tools/ant/sabbus/Settings.scala @@ -6,6 +6,8 @@ ** |/ ** \* */ +// $Id$ + package scala.tools.ant.sabbus import java.io.File diff --git a/src/compiler/scala/tools/ant/sabbus/TaskArgs.scala b/src/compiler/scala/tools/ant/sabbus/TaskArgs.scala index 1ce89120c7..4583b5dd84 100644 --- a/src/compiler/scala/tools/ant/sabbus/TaskArgs.scala +++ b/src/compiler/scala/tools/ant/sabbus/TaskArgs.scala @@ -1,3 +1,13 @@ +/* __ *\ +** ________ ___ / / ___ Scala Ant Tasks ** +** / __/ __// _ | / / / _ | (c) 2005-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + package scala.tools.ant.sabbus import java.io.File @@ -6,22 +16,22 @@ import org.apache.tools.ant.types.{Path, Reference} trait TaskArgs { this: Task => - def setId(input: String): Unit = { + def setId(input: String) { id = Some(input) } - def setParams(input: String): Unit = { + def setParams(input: String) { params = params match { case None => Some(input) case Some(ps) => Some(ps + " " + input) } } - def setTarget(input: String): Unit = { + def setTarget(input: String) { compTarget = Some(input) } - def setCompilationPath(input: Path): Unit = { + def setCompilationPath(input: Path) { if (compilationPath.isEmpty) compilationPath = Some(input) else compilationPath.get.append(input) } @@ -31,11 +41,11 @@ trait TaskArgs { this: Task => compilationPath.get.createPath() } - def setCompilationPathRef(input: Reference): Unit = { + def setCompilationPathRef(input: Reference) { createCompilationPath.setRefid(input) } - def setSrcPath(input: Path): Unit = { + def setSrcPath(input: Path) { if (sourcePath.isEmpty) sourcePath = Some(input) else sourcePath.get.append(input) } @@ -45,11 +55,11 @@ trait TaskArgs { this: Task => sourcePath.get.createPath() } - def setSrcPathRef(input: Reference): Unit = { + def setSrcPathRef(input: Reference) { createSrcPath.setRefid(input) } - def setCompilerPath(input: Path): Unit = { + def setCompilerPath(input: Path) { if (compilerPath.isEmpty) compilerPath = Some(input) else compilerPath.get.append(input) } @@ -59,11 +69,11 @@ trait TaskArgs { this: Task => compilerPath.get.createPath() } - def setCompilerPathRef(input: Reference): Unit = { + def setCompilerPathRef(input: Reference) { createCompilerPath.setRefid(input) } - def setDestdir(input: File): Unit = { + def setDestdir(input: File) { destinationDir = Some(input) } diff --git a/src/compiler/scala/tools/ant/sabbus/Use.scala b/src/compiler/scala/tools/ant/sabbus/Use.scala index 7b5347958b..3cb7ed29d1 100644 --- a/src/compiler/scala/tools/ant/sabbus/Use.scala +++ b/src/compiler/scala/tools/ant/sabbus/Use.scala @@ -6,6 +6,8 @@ ** |/ ** \* */ +// $Id$ + package scala.tools.ant.sabbus import java.io.File @@ -16,7 +18,7 @@ import org.apache.tools.ant.util.{GlobPatternMapper, SourceFileScanner} class Use extends MatchingTask { - def setId(input: String): Unit = { + def setId(input: String) { id = Some(input) } @@ -24,11 +26,11 @@ class Use extends MatchingTask { sourceDir = Some(input) } - def setDestdir(input: File): Unit = { + def setDestdir(input: File) { destinationDir = Some(input) } - def setFailOnError(input: Boolean): Unit = { + def setFailOnError(input: Boolean) { failOnError = input } @@ -37,7 +39,7 @@ class Use extends MatchingTask { private var destinationDir: Option[File] = None private var failOnError: Boolean = true - override def execute(): Unit = { + override def execute() { if (id.isEmpty) error("Mandatory attribute 'id' is not set.") if (sourceDir.isEmpty) error("Mandatory attribute 'srcdir' is not set.") val compiler = Compilers(id.get) |