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

Minor fixes. 

* Migrated packaging info form debian.scala to packaging.scala
* Fixed issue with using sourceDirectory in Debian instead of
  in Linux
This commit is contained in:
Josh Suereth 2011-12-21 13:52:26 -05:00
parent 5ca52f63d8
commit 1605256c13
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/build.scala
View File

@ -2,6 +2,6 @@ import sbt._
import Keys._ import Keys._
object SbtExtras extends Build { object SbtExtras extends Build {
// TODO - Detect Debian distribution and enable debian settings for the project. // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution.
val root = Project("sbt-extras", file(".")) settings(DebianPkg.settings:_*) val root = Project("sbt-extras", file(".")) settings(Packaging.settings:_*)
} }

6
project/debian.scala → project/packaging.scala
View File

@ -3,7 +3,7 @@ import com.typesafe.packager.Keys._
import sbt.Keys._ import sbt.Keys._
import com.typesafe.packager.PackagerPlugin._ import com.typesafe.packager.PackagerPlugin._
object DebianPkg { object Packaging {
val settings: Seq[Setting[_]] = packagerSettings ++ Seq( val settings: Seq[Setting[_]] = packagerSettings ++ Seq(
@ -21,12 +21,12 @@ object DebianPkg {
(bd / "linux" / "usr/share/man/man1/sbt.1") -> "/usr/share/man/man1/sbt.1.gz" (bd / "linux" / "usr/share/man/man1/sbt.1") -> "/usr/share/man/man1/sbt.1.gz"
) withPerms "0644" gzipped) asDocs() ) withPerms "0644" gzipped) asDocs()
}, },
linuxPackageMappings <+= (sourceDirectory in Debian) map { bd => linuxPackageMappings <+= (sourceDirectory in Linux) map { bd =>
packageMapping( packageMapping(
(bd / "usr/share/doc/sbt/copyright") -> "/usr/share/doc/sbt/copyright" (bd / "usr/share/doc/sbt/copyright") -> "/usr/share/doc/sbt/copyright"
) withPerms "0644" asDocs() ) withPerms "0644" asDocs()
}, },
linuxPackageMappings <+= (sourceDirectory in Debian) map { bd => linuxPackageMappings <+= (sourceDirectory in Linux) map { bd =>
packageMapping( packageMapping(
(bd / "usr/share/doc/sbt") -> "/usr/share/doc/sbt" (bd / "usr/share/doc/sbt") -> "/usr/share/doc/sbt"
) asDocs() ) asDocs()