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

Generate an error when the incremental compiler is given relative source files. Fixes #923. 

Review by @gkossakowski
This commit is contained in:
Mark Harrah 2013-11-08 20:40:44 -05:00
parent 45d81a03a1
commit 2f683ef81d
5 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compile/inc/src/main/scala/sbt/inc/Incremental.scala
View File

@ -226,6 +226,7 @@ object Incremental
val byProduct = changes.removedProducts.flatMap(previous.produced)
val byBinaryDep = changes.binaryDeps.flatMap(previous.usesBinary)
val byExtSrcDep = invalidateByExternal(previous, changes.external.modified, log) //changes.external.modified.flatMap(previous.usesExternal) // ++ scopeInvalidations
checkAbsolute(srcChanges.added.toList)
log.debug(
"\nInitial source changes: \n\tremoved:" + srcChanges.removed + "\n\tadded: " + srcChanges.added + "\n\tmodified: " + srcChanges.changed +
"\nRemoved products: " + changes.removedProducts +
@ -240,6 +241,19 @@ object Incremental
srcDirect ++ byProduct ++ byBinaryDep ++ byExtSrcDep
}
private[this] def checkAbsolute(addedSources: List[File]): Unit =
if(addedSources.nonEmpty) {
addedSources.filterNot(_.isAbsolute) match {
case first :: more =>
val fileStrings = more match {
case Nil => first.toString
case x :: Nil => s"$first and $x"
case _ => s"$first and ${more.size} others"
}
sys.error(s"The incremental compiler requires absolute sources, but some were relative: $fileStrings")
case Nil =>
}
}
/** Sources invalidated by `external` sources in other projects according to the previous `relations`. */
def invalidateByExternal(relations: Relations, external: Set[String], log: Logger): Set[File] =

1
sbt/src/sbt-test/source-dependencies/relative-source-error/changes/absolute.sbt Normal file
View File

@ -0,0 +1 @@
scalaSource in Compile := baseDirectory.value / "src"

1
sbt/src/sbt-test/source-dependencies/relative-source-error/changes/relative.sbt Normal file
View File

@ -0,0 +1 @@
scalaSource in Compile := file("src")

1
sbt/src/sbt-test/source-dependencies/relative-source-error/src/A.scala Normal file
View File

@ -0,0 +1 @@
object A

4
sbt/src/sbt-test/source-dependencies/relative-source-error/test Normal file
View File

@ -0,0 +1,4 @@
$ copy-file changes/relative.sbt build.sbt
-> compile
$ copy-file changes/absolute.sbt build.sbt
> compile