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

Add standard manifest attributes before user options instead of after. Fixes #187

This commit is contained in:
Mark Harrah 2011-09-16 22:04:51 -04:00
parent de6f55952f
commit 66c24c9e59
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/Defaults.scala
View File

@ -321,8 +321,8 @@ object Defaults extends BuildCommon
) )
lazy val packageConfig: Seq[Setting[_]] = Seq( lazy val packageConfig: Seq[Setting[_]] = Seq(
packageOptions in packageBin <<= (packageOptions, mainClass in packageBin, name, version, homepage, organization, organizationName) map { (p, main, name, ver, h, org, orgName) => packageOptions in packageBin <<= (packageOptions, mainClass in packageBin, name, version, homepage, organization, organizationName) map { (p, main, name, ver, h, org, orgName) =>
p ++ main.map(Package.MainClass.apply) :+ Package.addSpecManifestAttributes(name, ver, orgName) :+ Package.addImplManifestAttributes(name, ver, h, org, orgName) }, Package.addSpecManifestAttributes(name, ver, orgName) +: Package.addImplManifestAttributes(name, ver, h, org, orgName) +: main.map(Package.MainClass.apply) ++: p },
packageOptions in packageSrc <<= (packageOptions, name, version, organizationName) map { _ :+ Package.addSpecManifestAttributes(_, _, _) }, packageOptions in packageSrc <<= (name, version, organizationName, packageOptions) map { Package.addSpecManifestAttributes(_, _, _) +: _ },
`package` <<= packageBin `package` <<= packageBin
) ++ ) ++
packageTasks(packageBin, packageBinTask) ++ packageTasks(packageBin, packageBinTask) ++