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

Merge pull request #4782 from eatkins/reuse-sbt-classpath 

Re-use metabuild scala instance layer
This commit is contained in:
eugene yokota 2019-06-07 07:16:12 +02:00 committed by GitHub
parent af0cfc9740 f1698d2bf2
commit efa26d6eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
main-command/src/main/scala/sbt/State.scala
View File

@ -8,20 +8,14 @@
package sbt
import java.io.File
import java.net.{ URL, URLClassLoader }
import java.util.concurrent.Callable
import sbt.internal.classpath.ClassLoaderCache
import sbt.internal.inc.classpath.{ ClassLoaderCache => IncClassLoaderCache }
import sbt.util.Logger
import sbt.internal.util.{
AttributeKey,
AttributeMap,
ErrorHandling,
ExitHook,
ExitHooks,
GlobalLogging
}
import sbt.internal.util.complete.{ HistoryCommands, Parser }
import sbt.internal.util._
import sbt.util.Logger
/**
* Data structure representing all command execution information.
@ -202,6 +196,10 @@ trait StateOps extends Any {
}
object State {
private class UncloseableURLLoader(cp: Seq[File], parent: ClassLoader)
extends URLClassLoader(Array.empty, parent) {
override def getURLs: Array[URL] = cp.map(_.toURI.toURL).toArray
}
/** Indicates where command execution should resume after a failure.*/
val FailureWall = BasicCommandStrings.FailureWall
@ -344,6 +342,31 @@ object State {
def initializeClassLoaderCache: State = {
s.get(BasicKeys.extendedClassLoaderCache).foreach(_.close())
val cache = newClassLoaderCache
s.configuration.provider.scalaProvider.loader match {
case null => // This can happen in scripted
case fullScalaLoader =>
val jars = s.configuration.provider.scalaProvider.jars
val (library, rest) = jars.partition(_.getName == "scala-library.jar")
library.toList match {
case l @ lj :: Nil =>
fullScalaLoader.getParent match {
case null => // This can happen for old launchers.
case libraryLoader =>
cache.cachedCustomClassloader(l, () => new UncloseableURLLoader(l, libraryLoader))
fullScalaLoader match {
case u: URLClassLoader
if u.getURLs
.filterNot(_ == lj.toURI.toURL)
.sameElements(rest.map(_.toURI.toURL)) =>
cache.cachedCustomClassloader(
jars.toList,
() => new UncloseableURLLoader(jars, fullScalaLoader)
)
case _ =>
}
}
}
}
s.put(BasicKeys.extendedClassLoaderCache, cache)
.put(BasicKeys.classLoaderCache, new IncClassLoaderCache(cache))
}