From 7d9fb75275430bcdecf8541d0d30c59a7e10881a Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sun, 9 Jan 2011 06:21:20 +0000 Subject: Brought back and deprecated onlyPresentation to... Brought back and deprecated onlyPresentation to unbreak sbt. (Another fine reason for us to push all the way to using sbt is that we wouldn't unwittingly break it, as that change and my recent jline changes both did.) Maybe there is a better way to do what's in this one: review by dragos. --- src/compiler/scala/tools/nsc/Global.scala | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/compiler') diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index f3563b5dad..56fe04055c 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1149,10 +1149,18 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable } }) } - + // In order to not outright break code which overrides onlyPresentation (like sbt 0.7.5.RC0) + // I restored and deprecated it. That would be enough to avoid the compilation + // failure, but the override wouldn't accomplish anything. So now forInteractive + // and forScaladoc default to onlyPresentation, which is the same as defaulting + // to false except in old code. The downside is that this leaves us calling a + // deprecated method: but I see no simple way out, so I leave it for now. def forJVM = opt.jvm def forMSIL = opt.msil - def forInteractive = false - def forScaladoc = false + def forInteractive = onlyPresentation + def forScaladoc = onlyPresentation def createJavadoc = false + + @deprecated("Use forInteractive or forScaladoc, depending on what you're after") + def onlyPresentation = false } -- cgit v1.2.3