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

clean up optional dependency handling for make-pom. fixes #162

This commit is contained in:
Mark Harrah 2011-08-26 23:27:03 -04:00
parent 5f674dbea4
commit a258d4f3b5
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ivy/MakePom.scala
View File

@ -9,6 +9,7 @@ package sbt;
import java.io.{BufferedWriter, File, OutputStreamWriter, FileOutputStream} import java.io.{BufferedWriter, File, OutputStreamWriter, FileOutputStream}
import scala.xml.{Node => XNode, NodeSeq, PrettyPrinter, XML} import scala.xml.{Node => XNode, NodeSeq, PrettyPrinter, XML}
import Configurations.Optional
import org.apache.ivy.{core, plugins, Ivy} import org.apache.ivy.{core, plugins, Ivy}
import core.settings.IvySettings import core.settings.IvySettings
@ -123,32 +124,37 @@ class MakePom
<groupId>{mrid.getOrganisation}</groupId> <groupId>{mrid.getOrganisation}</groupId>
<artifactId>{mrid.getName}</artifactId> <artifactId>{mrid.getName}</artifactId>
<version>{mrid.getRevision}</version> <version>{mrid.getRevision}</version>
{ scope(dependency)} { scopeAndOptional(dependency)}
{ optional(dependency) }
</dependency> </dependency>
} }
def scope(dependency: DependencyDescriptor): NodeSeq = def scopeAndOptional(dependency: DependencyDescriptor): NodeSeq =
scope(getScope(dependency.getModuleConfigurations)) {
def scope(scope: String): NodeSeq = if(scope ne null) <scope>{scope}</scope> else NodeSeq.Empty val (scope, opt) = getScopeAndOptional(dependency.getModuleConfigurations)
def optional(dependency: DependencyDescriptor) = scopeElem(scope) ++ optionalElem(opt)
if(isOptional(dependency.getModuleConfigurations)) <optional>true</optional> else NodeSeq.Empty }
def scopeElem(scope: Option[String]): NodeSeq = scope match {
case Some(s) => <scope>{s}</scope>
case None => NodeSeq.Empty
}
def optionalElem(opt: Boolean) = if(opt) <optional>true</optional> else NodeSeq.Empty
def moduleDescriptor(module: ModuleDescriptor) = module.getModuleRevisionId def moduleDescriptor(module: ModuleDescriptor) = module.getModuleRevisionId
def getScope(confs: Array[String]) = def getScopeAndOptional(confs: Array[String]): (Option[String], Boolean) =
{ {
Configurations.defaultMavenConfigurations.find(conf => confs.contains(conf.name)) match val (opt, notOptional) = confs.partition(_ == Optional.name)
val defaultNotOptional = Configurations.defaultMavenConfigurations.find(notOptional contains _.name)
val scope = defaultNotOptional match
{ {
case Some(conf) => conf.name case Some(conf) => Some(conf.name)
case None => case None =>
if(confs.isEmpty || confs(0) == Configurations.Default.name) if(notOptional.isEmpty || notOptional(0) == Configurations.Default.name)
null None
else else
confs(0) Option(notOptional(0))
} }
(scope, !opt.isEmpty)
} }
def isOptional(confs: Array[String]) = confs.isEmpty || (confs.length == 1 && confs(0) == Configurations.Optional.name)
def makeRepositories(settings: IvySettings, includeAll: Boolean, filterRepositories: MavenRepository => Boolean) = def makeRepositories(settings: IvySettings, includeAll: Boolean, filterRepositories: MavenRepository => Boolean) =
{ {