Make 'package' an alias for 'package-bin'. Fixes #156

This commit is contained in:
Mark Harrah 2011-08-23 19:53:33 -04:00
parent b40a2f31ea
commit faeb9e2fb1
5 changed files with 16 additions and 14 deletions

View File

@ -310,7 +310,8 @@ object Defaults extends BuildCommon
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) =>
p ++ main.map(Package.MainClass.apply) :+ Package.addSpecManifestAttributes(name, ver, orgName) :+ Package.addImplManifestAttributes(name, ver, h, org, orgName) },
packageOptions in packageSrc <<= (packageOptions, name, version, organizationName) map { _ :+ Package.addSpecManifestAttributes(_, _, _) }
packageOptions in packageSrc <<= (packageOptions, name, version, organizationName) map { _ :+ Package.addSpecManifestAttributes(_, _, _) },
`package` <<= packageBin
) ++
packageTasks(packageBin, packageBinTask) ++
packageTasks(packageSrc, packageSrcTask) ++

View File

@ -137,7 +137,8 @@ object Keys
val aggregate = SettingKey[Aggregation]("aggregate", "Configures task aggregation.")
// package keys
val packageBin = TaskKey[File]("package", "Produces the main artifact, such as a binary jar.")
val packageBin = TaskKey[File]("package-bin", "Produces a main artifact, such as a binary jar.")
val `package` = TaskKey[File]("package", "Produces the main artifact, such as a binary jar. This is typically an alias for the task that actually does the packaging.")
val packageDoc = TaskKey[File]("package-doc", "Produces a documentation artifact, such as a jar containing API documentation.")
val packageSrc = TaskKey[File]("package-src", "Produces a source artifact, such as a jar containing sources and resources.")

View File

@ -4,19 +4,19 @@
# much purpose other than checking that the 'set' command
# re-evaluates the project data.
> 'set name :== "lazy-package-name"'
> set crossPaths :== false
> 'set name := "lazy-package-name"'
> set crossPaths := false
> 'set version :== "0.1.1"'
> 'set version := "0.1.1"'
> package
$ exists "target/lazy-package-name-0.1.1.jar"
> clean
> 'set version :== "0.1.2"'
> 'set version := "0.1.2"'
> package
$ exists "target/lazy-package-name-0.1.2.jar"
> clean
> 'set version :== "0.1.3"'
> 'set version := "0.1.3"'
> package
$ exists "target/lazy-package-name-0.1.3.jar"

View File

@ -1,13 +1,13 @@
import java.util.jar.{Attributes, Manifest}
import Path.makeString
name :== "Jar Manifest Test"
name := "Jar Manifest Test"
version :== "0.2"
version := "0.2"
crossPaths :== false
crossPaths := false
mainClass :== Some("jartest.Main")
mainClass := Some("jartest.Main")
packageOptions in (Compile, packageBin) <<= (packageOptions in (Compile, packageBin), scalaInstance) map { (opts, si) =>
def manifestExtra =

View File

@ -1,8 +1,8 @@
name :== "Main Resources Test"
name := "Main Resources Test"
version :== "0.1"
version := "0.1"
crossPaths :== false
crossPaths := false
packageOptions <<= (packageOptions, scalaInstance) map { (opts, si) =>
def manifestExtra =