diff options
author | Paul Phillips <paulp@improving.org> | 2012-12-06 12:20:31 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-12-06 12:20:31 -0800 |
commit | 6ee2ce50a56237eed07bcc6b6198f97779208a02 (patch) | |
tree | df7a9386e892beafff42bddcc0347f9337cfd3df /src/compiler/scala/tools/ant/Scalac.scala | |
parent | 330c77b097782ed389a83175302379ea72d22c41 (diff) | |
parent | 96fa31d0a3cf7ff401f9197cd0e12acd296e55b1 (diff) | |
download | scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.tar.gz scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.tar.bz2 scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.zip |
Merge commit 'refs/pull/1718/head' into merge-msil-genjvm-delete
* commit 'refs/pull/1718/head':
Expunged the .net backend.
Conflicts:
build.detach.xml
build.examples.xml
build.xml
project/Build.scala
src/compiler/scala/tools/ant/Scalac.scala
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala
src/compiler/scala/tools/nsc/transform/Mixin.scala
src/intellij/compiler.iml.SAMPLE
tools/buildcp
Diffstat (limited to 'src/compiler/scala/tools/ant/Scalac.scala')
-rw-r--r-- | src/compiler/scala/tools/ant/Scalac.scala | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala index 8f507d924a..3b8ae202f6 100644 --- a/src/compiler/scala/tools/ant/Scalac.scala +++ b/src/compiler/scala/tools/ant/Scalac.scala @@ -56,8 +56,6 @@ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} * - `usejavacp`, * - `failonerror`, * - `scalacdebugging`, - * - `assemname`, - * - `assemrefs`. * * It also takes the following parameters as nested elements: * - `src` (for `srcdir`), @@ -100,7 +98,7 @@ class Scalac extends ScalaMatchingTask with ScalacShared { /** Defines valid values for the `target` property. */ object Target extends PermissibleValue { - val values = List("jvm-1.5", "jvm-1.6", "jvm-1.7", "msil") + val values = List("jvm-1.5", "jvm-1.6", "jvm-1.7") } /** Defines valid values for the `deprecation` and `unchecked` properties. */ @@ -170,11 +168,6 @@ class Scalac extends ScalaMatchingTask with ScalacShared { /** Indicates whether compilation errors will fail the build; defaults to true. */ protected var failonerror: Boolean = true - // Name of the output assembly (only relevant with -target:msil) - protected var assemname: Option[String] = None - // List of assemblies referenced by the program (only relevant with -target:msil) - protected var assemrefs: Option[String] = None - /** Prints out the files being compiled by the scalac ant task * (not only the number of files). */ protected var scalacDebugging: Boolean = false @@ -421,9 +414,6 @@ class Scalac extends ScalaMatchingTask with ScalacShared { * @param input The specified flag */ def setScalacdebugging(input: Boolean) { scalacDebugging = input } - def setAssemname(input: String) { assemname = Some(input) } - def setAssemrefs(input: String) { assemrefs = Some(input) } - /** Sets the `compilerarg` as a nested compilerarg Ant parameter. * @return A compiler argument to be configured. */ def createCompilerArg(): ImplementationSpecificArgument = { @@ -616,9 +606,6 @@ class Scalac extends ScalaMatchingTask with ScalacShared { if (!unchecked.isEmpty) settings.unchecked.value = unchecked.get if (!usejavacp.isEmpty) settings.usejavacp.value = usejavacp.get - if (!assemname.isEmpty) settings.assemname.value = assemname.get - if (!assemrefs.isEmpty) settings.assemrefs.value = assemrefs.get - val jvmargs = scalacCompilerArgs.getArgs filter (_ startsWith "-J") if (!jvmargs.isEmpty) settings.jvmargs.value = jvmargs.toList val defines = scalacCompilerArgs.getArgs filter (_ startsWith "-D") |