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

fix Locate to only try to open archives

This commit is contained in:
Mark Harrah 2011-08-05 21:56:32 -04:00
parent 4442f6a80e
commit 3b86fc628e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compile/inc/Locate.scala
View File

@ -50,7 +50,7 @@ object Locate
def definesClass(entry: File): String => Boolean = def definesClass(entry: File): String => Boolean =
if(entry.isDirectory) if(entry.isDirectory)
directoryDefinesClass(entry) directoryDefinesClass(entry)
else if(entry.exists) else if(entry.exists && classpath.ClasspathUtilities.isArchive(entry))
jarDefinesClass(entry) jarDefinesClass(entry)
else else
const(false) const(false)

2
project/Sbt.scala
View File

@ -90,7 +90,7 @@ object Sbt extends Build
// Implements the core functionality of detecting and propagating changes incrementally. // Implements the core functionality of detecting and propagating changes incrementally.
// Defines the data structures for representing file fingerprints and relationships and the overall source analysis // Defines the data structures for representing file fingerprints and relationships and the overall source analysis
lazy val compileIncrementalSub = testedBaseProject(compilePath / "inc", "Incremental Compiler") dependsOn(collectionSub, apiSub, ioSub, logSub) lazy val compileIncrementalSub = testedBaseProject(compilePath / "inc", "Incremental Compiler") dependsOn(collectionSub, apiSub, ioSub, logSub, classpathSub)
// Persists the incremental data structures using SBinary // Persists the incremental data structures using SBinary
lazy val compilePersistSub = baseProject(compilePath / "persist", "Persist") dependsOn(compileIncrementalSub, apiSub) settings(sbinary) lazy val compilePersistSub = baseProject(compilePath / "persist", "Persist") dependsOn(compileIncrementalSub, apiSub) settings(sbinary)
// sbt-side interface to compiler. Calls compiler-side interface reflectively // sbt-side interface to compiler. Calls compiler-side interface reflectively