Removed obsolete "usepredef" from Scalac ant task.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@14130 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
dubochet 2008-02-25 20:06:42 +00:00
parent 4e9cc058db
commit 6fa0b33e83
3 changed files with 2 additions and 16 deletions

View File

@ -416,7 +416,6 @@ BUILD LOCAL REFERENCE (LOCKER) LAYER
<starr
srcdir="${src.dir}/library"
destdir="${locker.dir}/lib/library"
usepredefs="no"
addparams="${nsc.params}" target="${nsc.target}"
deprecation="yes" unchecked="yes"
classpath="${locker.dir}/lib/library"
@ -545,7 +544,6 @@ BUILD QUICK-TEST LAYER
<locker
srcdir="${src.dir}/library"
destdir="${quick.dir}/lib/library"
usepredefs="no"
addparams="${nsc.params}" target="${nsc.target}"
deprecation="yes" unchecked="yes"
scalacdebugging="${nsc.log-files}"
@ -788,7 +786,6 @@ CLDC
<quick
srcdir="${cldc.dir}/src"
destdir="${cldc.dir}/lib/library"
usepredefs="no"
addparams="${nsc.params}"
target="cldc"
scalacdebugging="${nsc.log-files}"
@ -938,7 +935,6 @@ ANDROID
<quick
srcdir="${android.dir}/src"
destdir="${android.dir}/lib/library"
usepredefs="no"
deprecation="yes" unchecked="yes"
addparams="${nsc.params}"
extdirs=""
@ -1078,7 +1074,7 @@ MSIL
</target>
<target name="msil.libraries" depends="setup.quick, msil.sources">
<quick srcdir="${msil.dir}/src" usepredefs="no" target="msil"
<quick srcdir="${msil.dir}/src" target="msil"
assemname="${msil.dir}/predef" assemrefs="${lib.dir}"
failonerror="false">
<include name="scala/Predef.scala"/>
@ -1187,7 +1183,7 @@ OPTIMIZE
<quick
srcdir="${src.dir}/library"
destdir="${optimised.dir}/lib/library"
usepredefs="no" addparams="${nsc.params}" target="${nsc.target}"
addparams="${nsc.params}" target="${nsc.target}"
deprecation="yes" unchecked="yes"
optimise="yes"
classpath="${optimised.dir}/lib/library"
@ -1319,7 +1315,6 @@ TEST
<quick
srcdir="${src.dir}/library"
destdir="${strap.dir}/lib/library"
usepredefs="no"
addparams="${nsc.params}" target="${nsc.target}"
deprecation="yes" unchecked="yes"
classpath="${strap.dir}/lib/library"

View File

@ -242,7 +242,6 @@
<scalac
srcdir="${src.lib.dir}"
destdir="${build.lib.dir}"
usepredefs="no"
deprecation="yes" unchecked="yes"
>
<classpath>

View File

@ -44,7 +44,6 @@ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter}
* <li>force,</li>
* <li>logging,</li>
* <li>logphase,</li>
* <li>usepredefs,</li>
* <li>debuginfo,</li>
* <li>addparams,</li>
* <li>scalacdebugging,</li>
@ -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 <code>usepredefs</code> attribute. Used by Ant.
* @param input The value for <code>usepredefs</code>. */
def setUsepredefs(input: Boolean) { usepredefs = Some(input) }
/** Set the <code>debug</code> info attribute.
* @param input The value for <code>debug</code>. */
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