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

Fix issue where projects using scala-compiler.jar were always recompiled

This commit is contained in:
Mark Harrah 2010-02-14 20:21:05 -05:00
parent bbe980e9a5
commit 345d2fbfcd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/sbt/Conditional.scala
View File

@ -248,9 +248,10 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati
protected def productLastModified(product: Path) = product.asFile.lastModified
private def libraryJar = compiler.scalaInstance.libraryJar
private def compilerJar = compiler.scalaInstance.compilerJar
protected def externalInfo(externals: Iterable[File]) =
{
val (classpathJars, classpathDirs) = ClasspathUtilities.buildSearchPaths(classpath.get)
val (classpathJars, classpathDirs) = ClasspathUtilities.buildSearchPaths(classpath.get ++ Seq(Path.fromFile(libraryJar), Path.fromFile(compilerJar)))
for(external <- externals) yield
{
val available = external.exists && (external == libraryJar || ClasspathUtilities.onClasspath(classpathJars, classpathDirs, external) )