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

grab base inter-project dependencies from the ProjectInfo

This commit is contained in:
Mark Harrah 2010-09-21 22:35:33 -04:00
parent bedc288c91
commit eed8dfdbab
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/MultiProject.scala
View File

@ -162,8 +162,8 @@ trait Project extends Tasked with HistoryEnabled with Member[Project] with Named
def input = Dummy.In
def state = Dummy.State
def aggregate: Iterable[ProjectDependency.Execution]
def dependencies: Iterable[ProjectDependency.Classpath]
def aggregate: Iterable[ProjectDependency.Execution] = info.dependencies collect { case ex: ProjectDependency.Execution => ex }
def dependencies: Iterable[ProjectDependency.Classpath] = info.dependencies collect { case cp: ProjectDependency.Classpath => cp }
type Task[T] = sbt.Task[T]
def act(input: Input, state: State): Option[(Task[State], Execute.NodeView[Task])] =
@ -191,10 +191,8 @@ trait ProjectExtra
trait ReflectiveProject extends Project
{
private[this] def vals[T: Manifest] = ReflectUtilities.allVals[T](this).map(_._2)
def aggregate: Iterable[ProjectDependency.Execution] = vals[ProjectDependency.Execution] ++ vals[Project].map(p => ProjectDependency.Execution(Right(p)))
/** All projects directly contained in this that are defined in this container's compilation set.
* This is for any contained projects, including execution and classpath dependencies, but not external projects. */
def dependencies: Iterable[ProjectDependency.Classpath] = vals[ProjectDependency.Classpath]
override def aggregate: Iterable[ProjectDependency.Execution] = vals[ProjectDependency.Execution] ++ vals[Project].map(p => ProjectDependency.Execution(Right(p))) ++ super.aggregate
override def dependencies: Iterable[ProjectDependency.Classpath] = vals[ProjectDependency.Classpath] ++ super.dependencies
}
trait ConsoleTask
{
@ -207,7 +205,7 @@ trait ProjectConstructors extends Project
val info: ProjectInfo
//def project(base: Path, name: String, deps: ProjectDependency*): Project = project(path, name, info => new DefaultProject(info), deps: _* )
def project[P <: Project](path: Path, name: String, construct: ProjectInfo => P, deps: ProjectDependency*): P =
construct( info.copy(Some(name), projectDirectory = path.asFile, parent = Some(this))() )
construct( info.copy(Some(name), projectDirectory = path.asFile, parent = Some(this), dependencies = deps)() )
def project(base: Path): ProjectDependency.Execution = new ProjectDependency.Execution(Left(base.asFile))

2
main/ProjectInfo.scala
View File

@ -15,7 +15,7 @@ import inc.Analysis
* `parent` is the parent Project, or None if this is the root project.
* `buildScalaVersion` contains the explicitly requested Scala version to use for building (as when using `+` or `++`) or None if the normal version should be used.
*/
final case class ProjectInfo(name: Option[String], projectDirectory: File, builderDir: File, dependencies: Iterable[Project], parent: Option[Project])(
final case class ProjectInfo(name: Option[String], projectDirectory: File, builderDir: File, dependencies: Iterable[ProjectDependency], parent: Option[Project])(
val configuration: AppConfiguration, val analysis: Analysis, val compileInputs: Compile.Inputs, val construct: File => Project, external: ExternalProjects)
{
def app = configuration.provider