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

allow Defaults.packageTasks to be used in global configuration

This commit is contained in:
Mark Harrah 2011-08-01 14:23:42 -04:00
parent a6ef6481ac
commit e67b3be331
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/Defaults.scala
View File

@ -329,12 +329,12 @@ object Defaults extends BuildCommon
(dirs, filter, excludes) map { (d,f,excl) => d.descendentsExcept(f,excl).get } (dirs, filter, excludes) map { (d,f,excl) => d.descendentsExcept(f,excl).get }
def artifactPathSetting(art: ScopedSetting[Artifact]) = (crossTarget, projectID, art, scalaVersion in artifactName, artifactName) { (t, module, a, sv, toString) => t / toString(sv, module, a) asFile } def artifactPathSetting(art: ScopedSetting[Artifact]) = (crossTarget, projectID, art, scalaVersion in artifactName, artifactName) { (t, module, a, sv, toString) => t / toString(sv, module, a) asFile }
def artifactSetting = (artifact, artifactClassifier, configuration) { (a,classifier,c) => def artifactSetting = ((artifact, artifactClassifier).identity zipWith configuration.?) { case ((a,classifier),cOpt) =>
val cPart = if(c == Compile) Nil else c.name :: Nil val cPart = cOpt flatMap { c => if(c == Compile) None else Some(c.name) }
val combined = cPart ++ classifier.toList val combined = cPart.toList ++ classifier.toList
if(combined.isEmpty) a.copy(classifier = None, configurations = c :: Nil) else { if(combined.isEmpty) a.copy(classifier = None, configurations = cOpt.toList) else {
val classifierString = combined mkString "-" val classifierString = combined mkString "-"
val confs = artifactConfigurations(a, c, classifier) val confs = cOpt.toList flatMap { c => artifactConfigurations(a, c, classifier) }
a.copy(classifier = Some(classifierString), `type` = Artifact.classifierType(classifierString), configurations = confs) a.copy(classifier = Some(classifierString), `type` = Artifact.classifierType(classifierString), configurations = confs)
} }
} }