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

fix inter-project dependencies involving extra attributes

This commit is contained in:
Mark Harrah 2011-07-29 23:33:10 -04:00
parent af6b420083
commit 213399c40c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ivy/Ivy.scala
View File

@ -141,7 +141,6 @@ final class IvySbt(val configuration: IvyConfiguration)
log.debug("Using inline dependencies specified in Scala" + (if(ivyXML.isEmpty) "." else " and XML.")) log.debug("Using inline dependencies specified in Scala" + (if(ivyXML.isEmpty) "." else " and XML."))
val parser = IvySbt.parseIvyXML(ivy.getSettings, IvySbt.wrapped(module, ivyXML), moduleID, defaultConf.name, validate) val parser = IvySbt.parseIvyXML(ivy.getSettings, IvySbt.wrapped(module, ivyXML), moduleID, defaultConf.name, validate)
IvySbt.addDependencies(moduleID, dependencies, parser) IvySbt.addDependencies(moduleID, dependencies, parser)
IvySbt.addMainArtifact(moduleID) IvySbt.addMainArtifact(moduleID)
(moduleID, parser.getDefaultConf) (moduleID, parser.getDefaultConf)
@ -351,11 +350,11 @@ private object IvySbt
private def wrapped(module: ModuleID, dependencies: NodeSeq) = private def wrapped(module: ModuleID, dependencies: NodeSeq) =
{ {
import module._ import module._
<ivy-module version="2.0"> <ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra">
{ if(hasInfo(module, dependencies)) { if(hasInfo(module, dependencies))
NodeSeq.Empty NodeSeq.Empty
else else
<info organisation={organization} module={name} revision={revision}/> addExtraAttributes(<info organisation={organization} module={name} revision={revision}/>, module.extraAttributes)
} }
{dependencies} {dependencies}
{ {
@ -364,6 +363,8 @@ private object IvySbt
} }
</ivy-module> </ivy-module>
} }
private[this] def addExtraAttributes(elem: scala.xml.Elem, extra: Map[String, String]): scala.xml.Elem =
(elem /: extra) { case (e, (key,value) ) => e % new scala.xml.UnprefixedAttribute(key, value, scala.xml.Null) }
private def hasInfo(module: ModuleID, x: scala.xml.NodeSeq) = private def hasInfo(module: ModuleID, x: scala.xml.NodeSeq) =
{ {
val info = <g>{x}</g> \ "info" val info = <g>{x}</g> \ "info"

2
project/Util.scala
View File

@ -11,7 +11,7 @@ object Util
def noPublish(p: Project) = p.copy(settings = noRemotePublish(p.settings)) def noPublish(p: Project) = p.copy(settings = noRemotePublish(p.settings))
def noRemotePublish(in: Seq[Setting[_]]) = in filterNot { s => s.key == deliver || s.key == publish } def noRemotePublish(in: Seq[Setting[_]]) = in filterNot { s => s.key == deliver || s.key == publish }
lazy val noExtra = projectDependencies ~= { _.map(_.copy(extraAttributes = Map.empty)) } // not sure why this is needed lazy val noExtra = projectDependencies ~= { _.map(_.copy(extraAttributes = Map.empty)) } // remove after 0.10.2
def project(path: File, nameString: String) = Project(normalize(nameString), path) settings( name := nameString, noExtra ) def project(path: File, nameString: String) = Project(normalize(nameString), path) settings( name := nameString, noExtra )
def baseProject(path: File, nameString: String) = project(path, nameString) settings( base : _*) def baseProject(path: File, nameString: String) = project(path, nameString) settings( base : _*)