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

Remove ivy-specific hackery for interface-src in favor of raw maven publishing.

This commit is contained in:
Josh Suereth 2015-07-14 11:17:37 -04:00
parent 3d12d81a2b
commit 755f792262
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -317,7 +317,9 @@ lazy val compileInterfaceProj = (project in compilePath / "interface").
// needed because we fork tests and tests are ran in parallel so we have multiple Scala
// compiler instances that are memory hungry
javaOptions in Test += "-Xmx1G",
artifact in (Compile, packageSrc) := Artifact(srcID).copy(configurations = Compile :: Nil).extra("e:component" -> srcID)
publishArtifact in (Compile, packageSrc) := true,
publishMavenStyle := true
//, artifact in (Compile, packageSrc) := Artifact(srcID).copy(configurations = Compile :: Nil).extra("e:component" -> srcID)
)
// Implements the core functionality of detecting and propagating changes incrementally.

17
compile/ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala
View File

@ -112,30 +112,29 @@ private[compiler] class NewComponentCompiler(compiler: RawCompiler, manager: Com
}
private def compileAndInstall(id: String, binID: String): Unit = {
val srcID = id + srcExtension
def interfaceSources(moduleVersions: Seq[String]): Iterable[File] =
moduleVersions match {
case Seq() =>
val jarName = s"$srcID-$sbtVersion.jar"
//val jarName = s"$srcID-$sbtVersion.jar"
def getAndDefineDefaultSources() =
update(getModule(id))(_.getName == jarName) map { sourcesJar =>
update(getModule(id))(_.getName endsWith "-sources.jar") map { sourcesJar =>
manager.define(id, sourcesJar)
sourcesJar
} getOrElse (throw new InvalidComponent(s"Couldn't retrieve default sources: file '$jarName' in module '$id'"))
} getOrElse (throw new InvalidComponent(s"Couldn't retrieve default sources: file '$id-sources.jar' in module '$id'"))
log.debug(s"Fetching default sources: file '$jarName' in module '$id'")
log.debug(s"Fetching default sources: file '$id-sources.jar' in module '$id'")
manager.files(id)(new IfMissing.Fallback(getAndDefineDefaultSources()))
case version +: rest =>
val moduleName = s"${id}_$version"
val jarName = s"${srcID}_$version-$sbtVersion.jar"
//val jarName = s"${srcID}_$version-$sbtVersion.jar"
def getAndDefineVersionSpecificSources() =
update(getModule(moduleName))(_.getName == jarName) map { sourcesJar =>
update(getModule(moduleName))(_.getName endsWith "-sources.jar") map { sourcesJar =>
manager.define(moduleName, sourcesJar)
sourcesJar
} getOrElse interfaceSources(rest)
log.debug(s"Fetching version-specific sources: file '$jarName' in module '$moduleName'")
log.debug(s"Fetching version-specific sources: file '$id-sources.jar' in module '$moduleName'")
manager.files(moduleName)(new IfMissing.Fallback(getAndDefineVersionSpecificSources()))
}
IO.withTemporaryDirectory { binaryDirectory =>
@ -158,7 +157,7 @@ private[compiler] class NewComponentCompiler(compiler: RawCompiler, manager: Com
*/
private def getModule(id: String): ivySbt.Module = {
val dummyID = ModuleID(xsbti.ArtifactInfo.SbtOrganization, scala.util.Random.alphanumeric take 20 mkString "", sbtVersion, Some("component"))
val moduleID = ModuleID(xsbti.ArtifactInfo.SbtOrganization, id, sbtVersion, Some("component"))
val moduleID = ModuleID(xsbti.ArtifactInfo.SbtOrganization, id, sbtVersion, Some("component")).sources()
getModule(dummyID, Seq(moduleID))
}