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

* Fix base directory when Ivy configuration inherited from parent project 

* Add 'pomExtra' method that can provide extra elements directly embedded in a generated pom.
This commit is contained in:
Mark Harrah 2010-01-29 20:32:43 -05:00
parent 8bc87fecef
commit 3877cd4d84
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/sbt/BasicProjectTypes.scala
View File

@ -3,6 +3,7 @@
*/
package sbt
import scala.xml.NodeSeq
import StringUtilities.{appendable,nonEmpty}
/** A project that provides a classpath. */
@ -84,8 +85,8 @@ trait IvyTasks extends Project
import deliverConfig._
IvyActions.deliver(module, status, deliveredPattern, extraDependencies, configurations, quiet)
}
def makePomTask(module: => IvySbt#Module, output: => Path, extraDependencies: => Iterable[ModuleID], configurations: => Option[Iterable[Configuration]]) =
ivyTask { IvyActions.makePom(module, extraDependencies, configurations, output asFile) }
def makePomTask(module: => IvySbt#Module, output: => Path, extraDependencies: => Iterable[ModuleID], pomExtra: => NodeSeq, configurations: => Option[Iterable[Configuration]]) =
ivyTask { IvyActions.makePom(module, extraDependencies, configurations, pomExtra, output asFile) }
def installTask(module: IvySbt#Module, from: Resolver, to: Resolver) =
ivyTask { IvyActions.install(module, from.name, to.name) }
@ -187,7 +188,8 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
def ivyConfiguration: IvyConfiguration =
{
val in = inlineIvyConfiguration
def parentIvyConfiguration(default: IvyConfiguration)(p: Project) = p match { case b: BasicManagedProject => b.ivyConfiguration; case _ => default }
def adapt(c: IvyConfiguration): IvyConfiguration = c.withBase(in.baseDirectory)
def parentIvyConfiguration(default: IvyConfiguration)(p: Project) = p match { case b: BasicManagedProject => adapt(b.ivyConfiguration); case _ => default }
if(in.resolvers.isEmpty)
{
if(in.moduleConfigurations.isEmpty)
@ -260,7 +262,8 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
def outputPattern = "[conf]/[artifact](-[revision])(-[classifier]).[ext]"
/** Override this to specify the publications, configurations, and/or dependencies sections of an Ivy file.
* See http://code.google.com/p/simple-build-tool/wiki/LibraryManagement for details.*/
def ivyXML: scala.xml.NodeSeq = scala.xml.NodeSeq.Empty
def ivyXML: NodeSeq = NodeSeq.Empty
def pomExtra: NodeSeq = NodeSeq.Empty
def expandedIvyConfigurations =
{
val confs = ivyConfigurations
@ -370,7 +373,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
interDependencies.readOnly
}
protected def deliverScalaDependencies: Iterable[ModuleID] = Nil
protected def makePomAction = makePomTask(deliverIvyModule, pomPath, deliverProjectDependencies, None)
protected def makePomAction = makePomTask(deliverIvyModule, pomPath, deliverProjectDependencies, pomExtra, None)
protected def deliverLocalAction = deliverTask(deliverIvyModule, publishLocalConfiguration, true /*quiet*/)
protected def publishLocalAction =
{
@ -595,7 +598,7 @@ trait ReflectiveArtifacts extends ManagedProject
val reflective = reflectiveArtifacts
managedStyle match
{
case Maven =>reflective ++ List(Artifact(artifactID, "pom", "pom"))
case Maven => reflective ++ List(Artifact(artifactID, "pom", "pom"))
case Ivy => reflective
case Auto => Set.empty
}

2
src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
View File

@ -7,7 +7,7 @@ class MultiPublishTest(info: ProjectInfo) extends ParentProject(info)
ManagedStyle.Maven
else
ManagedStyle.Auto
override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
override def ivyCacheDirectory = Some(outputPath / "ivy" / "cache")
lazy val sub = project("sub", "Sub Project", new SubProject(_))
class SubProject(info: ProjectInfo) extends DefaultProject(info)