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

Fixes #594. Global plugin products weren't being included on Compile classpath of build definition project.

This commit is contained in:
Mark Harrah 2012-11-10 18:18:15 -05:00
parent 52b7dccff4
commit 9bf5405621
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/GlobalPlugin.scala
View File

@ -4,7 +4,7 @@ package sbt
import Project._
import Scoped._
import Keys._
import Configurations.Runtime
import Configurations.{Compile,Runtime}
import java.io.File
import org.apache.ivy.core.module.{descriptor, id}
import descriptor.ModuleDescriptor, id.ModuleRevisionId
@ -19,8 +19,12 @@ object GlobalPlugin
projectDescriptors ~= { _ ++ gp.descriptors },
projectDependencies ++= gp.projectID +: gp.dependencies,
resolvers <<= resolvers { rs => (rs ++ gp.resolvers).distinct },
internalDependencyClasspath in Runtime ~= { prev => (prev ++ gp.internalClasspath).distinct }
// TODO: these shouldn't be required (but are): the project* settings above should take care of this
injectInternalClasspath(Runtime, gp.internalClasspath),
injectInternalClasspath(Compile, gp.internalClasspath)
)
private[this] def injectInternalClasspath(config: Configuration, cp: Seq[Attributed[File]]): Setting[_] =
internalDependencyClasspath in config ~= { prev => (prev ++ cp).distinct }
def build(base: File, s: State, config: LoadBuildConfiguration): (BuildStructure, State) =
{
@ -43,7 +47,7 @@ object GlobalPlugin
val taskInit = (projectID, projectDependencies, projectDescriptors, resolvers, fullClasspath in Runtime, internalDependencyClasspath in Runtime, exportedProducts in Runtime, ivyModule) map {
(pid, pdeps, pdescs, rs, cp, intcp, prods, mod) =>
val depMap = pdescs + mod.dependencyMapping(state.log)
GlobalPluginData(pid, pdeps, depMap, rs, cp, prods ++ intcp)
GlobalPluginData(pid, pdeps, depMap, rs, cp, (prods ++ intcp).distinct)
}
val resolvedTaskInit = taskInit mapReferenced Project.mapScope(Scope replaceThis p)
val task = resolvedTaskInit evaluate data