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

Make mapping task names more consistent, ref #317, credit @Atry

This commit is contained in:
Indrajit Raychaudhuri 2012-02-05 21:28:16 +05:30
parent 5fdbc86259
commit d54c520cb1
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main/Defaults.scala
View File

@ -360,13 +360,20 @@ object Defaults extends BuildCommon
packageOptions in packageSrc <<= (name, version, organizationName, packageOptions) map { Package.addSpecManifestAttributes(_, _, _) +: _ },
`package` <<= packageBin
) ++
packageTasks(packageBin, packageBinTask) ++
packageTasks(packageSrc, packageSrcTask) ++
packageTasks(packageDoc, packageDocTask)
packageTasks(packageBin, packageBinMappings) ++
packageTasks(packageSrc, packageSrcMappings) ++
packageTasks(packageDoc, packageDocMappings)
def packageBinTask = products map { _ flatMap Path.allSubpaths }
def packageDocTask = doc map { p => Path.allSubpaths(p).toSeq }
def packageSrcTask = concatMappings(resourceMappings, sourceMappings)
def packageBinMappings = products map { _ flatMap Path.allSubpaths }
def packageDocMappings = doc map { Path.allSubpaths(_).toSeq }
def packageSrcMappings = concatMappings(resourceMappings, sourceMappings)
@deprecated("Use `packageBinMappings` instead", "0.12.0")
def packageBinTask = packageBinMappings
@deprecated("Use `packageDocMappings` instead", "0.12.0")
def packageDocTask = packageDocMappings
@deprecated("Use `packageSrcMappings` instead", "0.12.0")
def packageSrcTask = packageSrcMappings
private type Mappings = Initialize[Task[Seq[(File, String)]]]
def concatMappings(as: Mappings, bs: Mappings) = (as zipWith bs)( (a,b) => (a :^: b :^: KNil) map { case a :+: b :+: HNil => a ++ b } )