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

fixes #55 

updated dependency-management/sources test covers this
This commit is contained in:
Mark Harrah 2011-06-15 19:09:31 -04:00
parent 50fd30a695
commit 02d11e3115
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ivy/IvyActions.scala
View File

@ -131,7 +131,7 @@ object IvyActions
def transitiveScratch(ivySbt: IvySbt, id: ModuleID, label: String, deps: Seq[ModuleID], classifiers: Seq[String], c: UpdateConfiguration, ivyScala: Option[IvyScala], log: Logger): UpdateReport =
{
val base = id.copy(name = id.name + "$" + label)
val base = restrictedCopy(id).copy(name = id.name + "$" + label)
val module = new ivySbt.Module(InlineConfiguration(base, deps).copy(ivyScala = ivyScala))
val report = update(module, c, log)
transitive(ivySbt, id, report, classifiers, c, ivyScala, log)
@ -141,13 +141,14 @@ object IvyActions
def updateClassifiers(ivySbt: IvySbt, id: ModuleID, modules: Seq[ModuleID], classifiers: Seq[String], configuration: UpdateConfiguration, ivyScala: Option[IvyScala], log: Logger): UpdateReport =
{
assert(!classifiers.isEmpty, "classifiers cannot be empty")
val baseModules = modules map { m => ModuleID(m.organization, m.name, m.revision, crossVersion = m.crossVersion) }
val baseModules = modules map restrictedCopy
val deps = baseModules.distinct map { m => m.copy(explicitArtifacts = classifiers map { c => Artifact.classified(m.name, c) }) }
val base = id.copy(name = id.name + classifiers.mkString("$","_",""))
val base = restrictedCopy(id).copy(name = id.name + classifiers.mkString("$","_",""))
val module = new ivySbt.Module(InlineConfiguration(base, deps).copy(ivyScala = ivyScala))
update(module, configuration, log)
}
private def resolve(logging: UpdateLogging.Value)(ivy: Ivy, module: DefaultModuleDescriptor, defaultConf: String): (ResolveReport, Option[ResolveException]) =
private[this] def restrictedCopy(m: ModuleID) = ModuleID(m.organization, m.name, m.revision, crossVersion = m.crossVersion)
private[this] def resolve(logging: UpdateLogging.Value)(ivy: Ivy, module: DefaultModuleDescriptor, defaultConf: String): (ResolveReport, Option[ResolveException]) =
{
val resolveOptions = new ResolveOptions
resolveOptions.setLog(ivyLogLevel(logging))

2
sbt/src/sbt-test/dependency-management/sources/project/Test.scala
View File

@ -16,7 +16,7 @@ object Test extends Build
val srcs = getSources(report)
if(srcs.isEmpty)
error("No sources retrieved")
else if(srcs.size != 2)
else if(srcs.size != 3)
error("Incorrect sources retrieved:\n\t" + srcs.mkString("\n\t"))
else
()