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

rename `packageTasks` to more consistent `packageTaskSettings`

This commit is contained in:
Indrajit Raychaudhuri 2012-03-06 10:30:29 +05:30
parent b64e9fb482
commit 14f6d7fd87
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/Defaults.scala
View File

@ -359,9 +359,9 @@ object Defaults extends BuildCommon
packageOptions <<= (name, version, homepage, organization, organizationName, mainClass, packageOptions) map { (name, ver, h, org, orgName, main, p) => Package.addSpecManifestAttributes(name, ver, orgName) +: Package.addImplManifestAttributes(name, ver, h, org, orgName) +: main.map(Package.MainClass.apply) ++: p })) ++ packageOptions <<= (name, version, homepage, organization, organizationName, mainClass, packageOptions) map { (name, ver, h, org, orgName, main, p) => Package.addSpecManifestAttributes(name, ver, orgName) +: Package.addImplManifestAttributes(name, ver, h, org, orgName) +: main.map(Package.MainClass.apply) ++: p })) ++
inTask(packageSrc)(Seq( inTask(packageSrc)(Seq(
packageOptions <<= (name, version, organizationName, packageOptions) map { Package.addSpecManifestAttributes(_, _, _) +: _ })) ++ packageOptions <<= (name, version, organizationName, packageOptions) map { Package.addSpecManifestAttributes(_, _, _) +: _ })) ++
packageTasks(packageBin, packageBinMappings) ++ packageTaskSettings(packageBin, packageBinMappings) ++
packageTasks(packageSrc, packageSrcMappings) ++ packageTaskSettings(packageSrc, packageSrcMappings) ++
packageTasks(packageDoc, packageDocMappings) ++ packageTaskSettings(packageDoc, packageDocMappings) ++
Seq(`package` <<= packageBin) Seq(`package` <<= packageBin)
def packageBinMappings = products map { _ flatMap Path.allSubpaths } def packageBinMappings = products map { _ flatMap Path.allSubpaths }
@ -412,13 +412,15 @@ object Defaults extends BuildCommon
} }
else else
base.configurations base.configurations
@deprecated("Use `Pair.apply` instead", "0.12.0") @deprecated("Use `Pair.apply` instead", "0.12.0")
def pairID[A,B] = (a: A, b: B) => (a,b) def pairID[A,B] = (a: A, b: B) => (a,b)
def perTaskCache(key: TaskKey[_]): Setting[File] = def perTaskCache(key: TaskKey[_]): Setting[File] =
cacheDirectory ~= { _ / ("for_" + key.key.label) } cacheDirectory ~= { _ / ("for_" + key.key.label) }
def packageTasks(key: TaskKey[File], mappingsTask: Initialize[Task[Seq[(File,String)]]]) = @deprecated("Use `packageTaskSettings` instead.", "0.12.0")
def packageTasks(key: TaskKey[File], mappingsTask: Initialize[Task[Seq[(File,String)]]]) = packageTaskSettings(key, mappingsTask)
def packageTaskSettings(key: TaskKey[File], mappingsTask: Initialize[Task[Seq[(File,String)]]]) =
inTask(key)( Seq( inTask(key)( Seq(
key in TaskGlobal <<= packageTask, key in TaskGlobal <<= packageTask,
packageConfiguration <<= packageConfigurationTask, packageConfiguration <<= packageConfigurationTask,