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

Provide empty <publications/> for inline Ivy XML if a publications tag does not exist. 

This prevents a default artifact from being added incorrectly.
This commit is contained in:
Mark Harrah 2010-04-01 20:14:05 -04:00
parent a629c6a1ea
commit 6a27b5e42b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ivy/Ivy.scala
View File

@ -20,6 +20,8 @@ import plugins.parser.m2.PomModuleDescriptorParser
import plugins.resolver.ChainResolver
import util.Message
import scala.xml.NodeSeq
final class IvySbt(configuration: IvyConfiguration)
{
import configuration.{log, baseDirectory}
@ -220,8 +222,6 @@ private object IvySbt
import configuration._
new IvyConfig(name, if(isPublic) PUBLIC else PRIVATE, description, extendsConfigs.map(_.name).toArray, transitive, null)
}
private def addDefaultArtifact(defaultConf: String, moduleID: DefaultModuleDescriptor) =
moduleID.addArtifact(defaultConf, new MDArtifact(moduleID, moduleID.getModuleRevisionId.getName, defaultType, defaultExtension))
/** Adds the ivy.xml main artifact. */
private def addMainArtifact(moduleID: DefaultModuleDescriptor)
{
@ -266,16 +266,20 @@ private object IvySbt
}
}
/** Creates a full ivy file for 'module' using the 'dependencies' XML as the part after the &lt;info&gt;...&lt;/info&gt; section. */
private def wrapped(module: ModuleID, dependencies: scala.xml.NodeSeq) =
private def wrapped(module: ModuleID, dependencies: NodeSeq) =
{
import module._
<ivy-module version="2.0">
{ if(hasInfo(dependencies))
scala.xml.NodeSeq.Empty
NodeSeq.Empty
else
<info organisation={organization} module={name} revision={revision}/>
}
{dependencies}
{
// this is because Ivy adds a default artifact if none are specified.
if(dependencies \\ "publications" isEmpty) <publications/> else NodeSeq.Empty
}
</ivy-module>
}
private def hasInfo(x: scala.xml.NodeSeq) = !(<g>{x}</g> \ "info").isEmpty