mirror of https://github.com/sbt/sbt.git
Revert "remove precompiled compiler bridges"
This reverts commit f2e5d48b6b.
This commit is contained in:
parent
f6945b60c7
commit
1f0a120a6f
74
build.sbt
74
build.sbt
|
|
@ -333,18 +333,9 @@ lazy val compileInterfaceProj = (project in compilePath / "interface").
|
||||||
artifact in (Compile, packageSrc) := Artifact(srcID).copy(configurations = Compile :: Nil).extra("e:component" -> srcID)
|
artifact in (Compile, packageSrc) := Artifact(srcID).copy(configurations = Compile :: Nil).extra("e:component" -> srcID)
|
||||||
)
|
)
|
||||||
|
|
||||||
def precompiledSettings = Seq(
|
lazy val precompiled282 = precompiled(scala282)
|
||||||
artifact in packageBin <<= (appConfiguration, scalaVersion) { (app, sv) =>
|
lazy val precompiled292 = precompiled(scala292)
|
||||||
val launcher = app.provider.scalaProvider.launcher
|
lazy val precompiled293 = precompiled(scala293)
|
||||||
val bincID = binID + "_" + ScalaInstance(sv, launcher).actualVersion
|
|
||||||
Artifact(binID) extra ("e:component" -> bincID)
|
|
||||||
},
|
|
||||||
target <<= (target, scalaVersion) { (base, sv) => base / ("precompiled_" + sv) },
|
|
||||||
scalacOptions := Nil,
|
|
||||||
ivyScala ~= { _.map(_.copy(checkExplicit = false, overrideScalaVersion = false)) },
|
|
||||||
exportedProducts in Compile := Nil,
|
|
||||||
libraryDependencies += scalaCompiler.value % "provided"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Implements the core functionality of detecting and propagating changes incrementally.
|
// Implements the core functionality of detecting and propagating changes incrementally.
|
||||||
// Defines the data structures for representing file fingerprints and relationships and the overall source analysis
|
// Defines the data structures for representing file fingerprints and relationships and the overall source analysis
|
||||||
|
|
@ -452,7 +443,7 @@ lazy val mainProj = (project in mainPath).
|
||||||
// technically, we need a dependency on all of mainProj's dependencies, but we don't do that since this is strictly an integration project
|
// technically, we need a dependency on all of mainProj's dependencies, but we don't do that since this is strictly an integration project
|
||||||
// with the sole purpose of providing certain identifiers without qualification (with a package object)
|
// with the sole purpose of providing certain identifiers without qualification (with a package object)
|
||||||
lazy val sbtProj = (project in sbtPath).
|
lazy val sbtProj = (project in sbtPath).
|
||||||
dependsOn(mainProj, compileInterfaceProj, scriptedSbtProj % "test->test").
|
dependsOn(mainProj, compileInterfaceProj, precompiled282, precompiled292, precompiled293, scriptedSbtProj % "test->test").
|
||||||
settings(baseSettings: _*).
|
settings(baseSettings: _*).
|
||||||
settings(
|
settings(
|
||||||
name := "sbt",
|
name := "sbt",
|
||||||
|
|
@ -549,6 +540,35 @@ def utilPath = file("util")
|
||||||
def compilePath = file("compile")
|
def compilePath = file("compile")
|
||||||
def mainPath = file("main")
|
def mainPath = file("main")
|
||||||
|
|
||||||
|
def precompiledSettings = Seq(
|
||||||
|
artifact in packageBin <<= (appConfiguration, scalaVersion) { (app, sv) =>
|
||||||
|
val launcher = app.provider.scalaProvider.launcher
|
||||||
|
val bincID = binID + "_" + ScalaInstance(sv, launcher).actualVersion
|
||||||
|
Artifact(binID) extra ("e:component" -> bincID)
|
||||||
|
},
|
||||||
|
target <<= (target, scalaVersion) { (base, sv) => base / ("precompiled_" + sv) },
|
||||||
|
scalacOptions := Nil,
|
||||||
|
ivyScala ~= { _.map(_.copy(checkExplicit = false, overrideScalaVersion = false)) },
|
||||||
|
exportedProducts in Compile := Nil,
|
||||||
|
libraryDependencies += scalaCompiler.value % "provided"
|
||||||
|
)
|
||||||
|
|
||||||
|
def precompiled(scalav: String): Project = Project(id = normalize("Precompiled " + scalav.replace('.', '_')), base = compilePath / "interface").
|
||||||
|
dependsOn(interfaceProj).
|
||||||
|
settings(baseSettings ++ precompiledSettings: _*).
|
||||||
|
settings(
|
||||||
|
name := "Precompiled " + scalav.replace('.', '_'),
|
||||||
|
scalaHome := None,
|
||||||
|
scalaVersion <<= (scalaVersion in ThisBuild) { sbtScalaV =>
|
||||||
|
assert(sbtScalaV != scalav, "Precompiled compiler interface cannot have the same Scala version (" + scalav + ") as sbt.")
|
||||||
|
scalav
|
||||||
|
},
|
||||||
|
crossScalaVersions := Seq(scalav),
|
||||||
|
// we disable compiling and running tests in precompiled Projprojects of compiler interface
|
||||||
|
// so we do not need to worry about cross-versioning testing dependencies
|
||||||
|
sources in Test := Nil
|
||||||
|
)
|
||||||
|
|
||||||
lazy val safeUnitTests = taskKey[Unit]("Known working tests (for both 2.10 and 2.11)")
|
lazy val safeUnitTests = taskKey[Unit]("Known working tests (for both 2.10 and 2.11)")
|
||||||
lazy val safeProjects: ScopeFilter = ScopeFilter(
|
lazy val safeProjects: ScopeFilter = ScopeFilter(
|
||||||
inProjects(launchProj, mainSettingsProj, mainProj, ivyProj, completeProj,
|
inProjects(launchProj, mainSettingsProj, mainProj, ivyProj, completeProj,
|
||||||
|
|
@ -576,18 +596,46 @@ def customCommands: Seq[Setting[_]] = Seq(
|
||||||
},
|
},
|
||||||
commands += Command.command("release-sbt-local") { state =>
|
commands += Command.command("release-sbt-local") { state =>
|
||||||
"clean" ::
|
"clean" ::
|
||||||
|
"precompiled-2_8_2/compile" ::
|
||||||
|
"precompiled-2_9_2/compile" ::
|
||||||
|
"precompiled-2_9_3/compile" ::
|
||||||
"so compile" ::
|
"so compile" ::
|
||||||
|
"precompiled-2_8_2/publishLocal" ::
|
||||||
|
"precompiled-2_9_2/publishLocal" ::
|
||||||
|
"precompiled-2_9_3/publishLocal" ::
|
||||||
"so publishLocal" ::
|
"so publishLocal" ::
|
||||||
"reload" ::
|
"reload" ::
|
||||||
state
|
state
|
||||||
},
|
},
|
||||||
|
/** There are several complications with sbt's build.
|
||||||
|
* First is the fact that interface project is a Java-only project
|
||||||
|
* that uses source generator from datatype subproject in Scala 2.10.4,
|
||||||
|
* which is depended on by Scala 2.8.2, Scala 2.9.2, and Scala 2.9.3 precompiled project.
|
||||||
|
*
|
||||||
|
* Second is the fact that sbt project (currently using Scala 2.10.4) depends on
|
||||||
|
* the precompiled projects (that uses Scala 2.8.2 etc.)
|
||||||
|
*
|
||||||
|
* Finally, there's the fact that all subprojects are released with crossPaths
|
||||||
|
* turned off for the sbt's Scala version 2.10.4, but some of them are also
|
||||||
|
* cross published against 2.11.1 with crossPaths turned on.
|
||||||
|
*
|
||||||
|
* Because of the way ++ (and its improved version wow) is implemented
|
||||||
|
* precompiled compiler briges are handled outside of doge aggregation on root.
|
||||||
|
* `so compile` handles 2.10.x/2.11.x cross building.
|
||||||
|
*/
|
||||||
commands += Command.command("release-sbt") { state =>
|
commands += Command.command("release-sbt") { state =>
|
||||||
// TODO - Any sort of validation
|
// TODO - Any sort of validation
|
||||||
"clean" ::
|
"clean" ::
|
||||||
"checkCredentials" ::
|
"checkCredentials" ::
|
||||||
"conscript-configs" ::
|
"conscript-configs" ::
|
||||||
|
"precompiled-2_8_2/compile" ::
|
||||||
|
"precompiled-2_9_2/compile" ::
|
||||||
|
"precompiled-2_9_3/compile" ::
|
||||||
"so compile" ::
|
"so compile" ::
|
||||||
"so publishSigned" ::
|
"so publishSigned" ::
|
||||||
|
"precompiled-2_8_2/publishSigned" ::
|
||||||
|
"precompiled-2_9_2/publishSigned" ::
|
||||||
|
"precompiled-2_9_3/publishSigned" ::
|
||||||
"publishLauncher" ::
|
"publishLauncher" ::
|
||||||
state
|
state
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue