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

fix unmanaged dependencies being excluded in certain cases

This commit is contained in:
Mark Harrah 2011-02-20 15:40:29 -05:00
parent 9fb78514c7
commit 2ed574b30d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/Default.scala
View File

@ -658,19 +658,19 @@ object Classpaths
visited.toSeq visited.toSeq
} }
def unmanagedDependencies0(projectRef: ProjectRef, project: Project, conf: Configuration, data: Settings[Scope]): Task[Classpath] = def unmanagedDependencies0(projectRef: ProjectRef, project: Project, conf: Configuration, data: Settings[Scope]): Task[Classpath] =
interDependencies(projectRef, project, conf, data)(unmanagedLibs) interDependencies(projectRef, project, conf, data, true, unmanagedLibs)
def internalDependencies0(projectRef: ProjectRef, project: Project, conf: Configuration, data: Settings[Scope]): Task[Classpath] = def internalDependencies0(projectRef: ProjectRef, project: Project, conf: Configuration, data: Settings[Scope]): Task[Classpath] =
interDependencies(projectRef, project, conf, data)(products) interDependencies(projectRef, project, conf, data, false, products)
def interDependencies(projectRef: ProjectRef, project: Project, conf: Configuration, data: Settings[Scope])( def interDependencies(projectRef: ProjectRef, project: Project, conf: Configuration, data: Settings[Scope], includeSelf: Boolean,
f: (ProjectRef, String, Settings[Scope]) => Task[Classpath]): Task[Classpath] = f: (ProjectRef, String, Settings[Scope]) => Task[Classpath]): Task[Classpath] =
{ {
val visited = interSort(projectRef, project, conf, data) val visited = interSort(projectRef, project, conf, data)
val productsTasks = asScalaSet(new LinkedHashSet[Task[Classpath]]) val tasks = asScalaSet(new LinkedHashSet[Task[Classpath]])
for( (dep, c) <- visited ) for( (dep, c) <- visited )
if( (dep != projectRef) || conf.name != c ) if(includeSelf || (dep != projectRef) || conf.name != c )
productsTasks += f(dep, c, data) tasks += f(dep, c, data)
(productsTasks.toSeq.join).map(_.flatten) (tasks.toSeq.join).map(_.flatten.distinct)
} }
def mapped(confString: Option[String], masterConfs: Seq[String], depConfs: Seq[String], default: String, defaultMapping: String): String => Seq[String] = def mapped(confString: Option[String], masterConfs: Seq[String], depConfs: Seq[String], default: String, defaultMapping: String): String => Seq[String] =