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

Add compiler bridge sources to fake resolver 

This allows sbt to resolve the compiler bridge sources when using the
static launcher
This commit is contained in:
Martin Duhem 2016-04-15 16:26:19 +02:00
parent 81e350325e
commit 03c02ec2e0
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sbt/src/main/scala/Main.scala
View File

@ -22,6 +22,8 @@ private object StaticUtils {
val LIBRARY_JAR = "scala-library.jar"
val REFLECT = "reflect"
val REFLECT_JAR = "scala-reflect.jar"
val BRIDGE = "compiler-interface"
val BRIDGE_JAR = s"compiler-interface-${sbtApplicationID.version}-sources.jar"
val XSBTI = "xsbti"
val XSBTI_JAR = s"interface-${sbtApplicationID.version}.jar"
val thisJAR: File = new File(getClass.getProtectionDomain().getCodeSource().getLocation().toURI().getPath())
@ -87,7 +89,7 @@ private class StaticLauncher(appProvider: StaticAppProvider, scalaProvider: Stat
override def bootDirectory(): File = new File(sys props "user.home") / ".sbt" / "boot"
override def ivyRepositories(): Array[xsbti.Repository] = Array.empty
override def ivyRepositories(): Array[xsbti.Repository] = appRepositories
override def appRepositories(): Array[xsbti.Repository] = Array(new FakeRepository(new FakeResolver("fakeresolver", bootDirectory / "fakeresolver-cache", modules)))
override def isOverrideRepositories(): Boolean = false
@ -95,14 +97,20 @@ private class StaticLauncher(appProvider: StaticAppProvider, scalaProvider: Stat
override def ivyHome(): File = null
override def checksums(): Array[String] = Array.empty
private val modules = Map(
("org.scala-sbt", "sbt", "0.13.12-SNAPSHOT") -> Seq(FakeResolver.FakeArtifact("sbt", "jar", "jar", StaticUtils.thisJAR))
private lazy val modules = Map(
("org.scala-sbt", "sbt", "0.13.12-SNAPSHOT") ->
Seq(FakeResolver.FakeArtifact("sbt", "jar", "jar", StaticUtils.thisJAR)),
("org.scala-sbt", "compiler-interface", "0.13.12-SNAPSHOT") -> {
val file = scalaProvider.getComponent(StaticUtils.BRIDGE)
Seq(FakeResolver.FakeArtifact("compiler-interface", "src", "jar", file))
}
)
}
private class StaticScalaProvider(appProvider: StaticAppProvider) extends xsbti.ScalaProvider {
private def getComponent(componentID: String): File = {
def getComponent(componentID: String): File = {
val component = appProvider.components.component(componentID)
assert(component.length == 1, s"""Component $componentID should have 1 file, ${component.length} files found: ${component.mkString(", ")}.""")
component(0)
@ -134,6 +142,10 @@ private class StaticAppProvider(appConfig: StaticAppConfiguration) extends xsbti
installFromResources(StaticUtils.XSBTI_JAR, StaticUtils.XSBTI)
}
if (components.component(StaticUtils.BRIDGE).isEmpty) {
installFromResources(StaticUtils.BRIDGE_JAR, StaticUtils.BRIDGE)
}
override def components(): xsbti.ComponentProvider = new StaticComponentProvider(scalaProvider.launcher.bootDirectory)
override def entryPoint(): Class[_] = loader.getClass
override def id(): xsbti.ApplicationID = sbtApplicationID
@ -173,4 +185,3 @@ private class StaticAppConfiguration(override val arguments: Array[String]) exte
override val baseDirectory: File = new File(sys props "user.dir")
override val provider: xsbti.AppProvider = new StaticAppProvider(this)
}