fix binary dependency recompilation problem introduced by fix for #108

This commit is contained in:
Mark Harrah 2011-08-27 11:54:16 -04:00
parent 950bf200dc
commit febe7e56e1
7 changed files with 21 additions and 5 deletions

View File

@ -39,7 +39,7 @@ object Defaults extends BuildCommon
(a.data, a.metadata get Keys.analysis getOrElse inc.Analysis.Empty)
def analysisMap[T](cp: Seq[Attributed[T]]): Map[T, inc.Analysis] =
(cp map extractAnalysis).toMap
(for(a <- cp; an <- a.metadata get Keys.analysis) yield (a.data, an) ).toMap
def buildCore: Seq[Setting[_]] = thisBuildCore ++ globalCore
def thisBuildCore: Seq[Setting[_]] = inScope(GlobalScope.copy(project = Select(ThisBuild)))(Seq(

View File

@ -48,10 +48,6 @@ class AggressiveCompile(cacheDirectory: File)
{
import config._
import currentSetup._
val getAPI = (f: File) => {
val extApis = getAnalysis(f) match { case Some(a) => a.apis.external; case None => Map.empty[String, Source] }
extApis.get _
}
val absClasspath = classpath.map(_.getCanonicalFile)
val apiOption= (api: Either[Boolean, Source]) => api.right.toOption
val cArgs = new CompilerArguments(compiler.scalaInstance, compiler.cp)

View File

@ -0,0 +1 @@
object Break

View File

@ -0,0 +1,3 @@
object A {
val x = 3
}

View File

@ -0,0 +1,10 @@
import sbt._
import Keys._
object B extends Build
{
lazy val dep = Project("dep", file("dep"))
lazy val use = Project("use", file("use")) settings(
unmanagedJars in Compile <+= packageBin in (dep, Compile) map Attributed.blank
)
}

View File

@ -0,0 +1,3 @@
> use/compile
$ copy-file changes/Break.scala dep/A.scala
-> use/compile

View File

@ -0,0 +1,3 @@
object B {
val y = A.x
}