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

fix issue in API comparison where ordering was required but not done

This commit is contained in:
Mark Harrah 2011-02-14 18:58:20 -05:00
parent dcd24f5dc4
commit a3a81dc26e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compile/inc/Incremental.scala
View File

@ -15,6 +15,7 @@ object Incremental
def compile(sources: Set[File], entry: String => Option[File], previous: Analysis, current: ReadStamps, forEntry: File => Option[Analysis], doCompile: Set[File] => Analysis)(implicit equivS: Equiv[Stamp]): (Boolean, Analysis) =
{
val initialChanges = changedInitial(entry, sources, previous, current, forEntry)
println("Initial changes: " + initialChanges)
val initialInv = invalidateInitial(previous.relations, initialChanges)
println("Initially invalidated: " + initialInv)
val analysis = cycle(initialInv, previous, doCompile)
@ -49,8 +50,8 @@ object Incremental
*/
def changedIncremental[T](lastSources: collection.Set[T], oldAPI: T => Source, newAPI: T => Source): APIChanges[T] =
{
val oldApis = lastSources map oldAPI
val newApis = lastSources map newAPI
val oldApis = lastSources.toSeq map oldAPI
val newApis = lastSources.toSeq map newAPI
for(api <- newApis; definition <- api.definitions) { println(xsbt.api.DefaultShowAPI(definition)) }
val changes = (lastSources, oldApis, newApis).zipped.filter { (src, oldApi, newApi) => !SameAPI(oldApi, newApi) }