diff --git a/build.xml b/build.xml index a11e27d34..0b64da2cf 100644 --- a/build.xml +++ b/build.xml @@ -416,7 +416,6 @@ BUILD LOCAL REFERENCE (LOCKER) LAYER - @@ -1187,7 +1183,7 @@ OPTIMIZE diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala index 0f5397d83..246d40116 100644 --- a/src/compiler/scala/tools/ant/Scalac.scala +++ b/src/compiler/scala/tools/ant/Scalac.scala @@ -44,7 +44,6 @@ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} *
  • force,
  • *
  • logging,
  • *
  • logphase,
  • - *
  • usepredefs,
  • *
  • debuginfo,
  • *
  • addparams,
  • *
  • scalacdebugging,
  • @@ -133,8 +132,6 @@ class Scalac extends MatchingTask { /** Which compilation phases should be logged during compilation. */ private var logPhase: List[String] = Nil - /** Whether to use implicit predefined values or not. */ - private var usepredefs: Option[Boolean] = None /** Instruct the compiler to generate debugging information */ private var debugInfo: Option[String] = None /** Instruct the compiler to use additional parameters */ @@ -300,10 +297,6 @@ class Scalac extends MatchingTask { } } - /** Sets the usepredefs attribute. Used by Ant. - * @param input The value for usepredefs. */ - def setUsepredefs(input: Boolean) { usepredefs = Some(input) } - /** Set the debug info attribute. * @param input The value for debug. */ def setDebuginfo(input: String) { debugInfo = Some(input) } @@ -543,7 +536,6 @@ class Scalac extends MatchingTask { settings.debug.value = true } if (!logPhase.isEmpty) settings.log.value = logPhase - if (!usepredefs.isEmpty) settings.nopredefs.value = !usepredefs.get if (!debugInfo.isEmpty) settings.debuginfo.value = debugInfo.get if (!deprecation.isEmpty) settings.deprecation.value = deprecation.get if (!optimise.isEmpty) settings.XO.value = optimise.get