luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

source compatibility with 2.8.1, where resident mode can't be supported

This commit is contained in:
Mark Harrah 2012-05-19 18:20:20 -04:00
parent c62dd99ddf
commit 63895a3d77
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compile/interface/CompilerInterface.scala
View File

@ -146,7 +146,8 @@ private final class CachedCompiler0(args: Array[String], initialLog: WeakLog) ex
}
// Required because computePhaseDescriptors is private in 2.8 (changed to protected sometime later).
private[this] def superComputePhaseDescriptors() = superCall("computePhaseDescriptors").asInstanceOf[List[SubComponent]]
private[this] def superDropRun(): Unit = superCall("dropRun")
private[this] def superDropRun(): Unit =
try { superCall("dropRun") } catch { case e: NoSuchMethodException => () } // dropRun not in 2.8.1, so resident mode not supported
private[this] def superCall(methodName: String): AnyRef =
{
val meth = classOf[Global].getDeclaredMethod(methodName)
@ -203,6 +204,12 @@ private final class CachedCompiler0(args: Array[String], initialLog: WeakLog) ex
def reloadClass(pkg: Symbol, simpleName: String, bin: AbstractFile)
{
val loader = new loaders.ClassfileLoader(bin)
// enterClass/enterModule not in 2.8.1, so resident mode can't be supported
object LoadersCompat {
def enterClass(pkg: Any, simpleName: Any, loader: Any): Symbol = NoSymbol
def enterModule(pkg: Any, simpleName: Any, loader: Any): Symbol = NoSymbol
}
implicit def compat(run: AnyRef): LoadersCompat.type = LoadersCompat
toForget += loaders.enterClass(pkg, simpleName, loader)
toForget += loaders.enterModule(pkg, simpleName, loader)
}