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

Merge branch 'full-packaging' into feature/windows-sbt-config

This commit is contained in:
Josh Suereth 2012-09-22 08:20:53 -04:00
parent 41c21b9ed7 0ac0a4767d
commit 42fbfabc6a
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project/build.scala
View File

@ -3,7 +3,11 @@ import Keys._
object SbtExtras extends Build { object SbtExtras extends Build {
// This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution. // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution.
val root = Project("sbt-packaging", file(".")) settings(Packaging.settings:_*) val root = Project("sbt-packaging", file(".")) settings(Packaging.settings:_*) settings(
sbtVersion <<= sbtVersion apply { v =>
sys.props.getOrElse("sbt.build.version", sys.env.getOrElse("sbt.build.version", v))
}
)
val meta = Project("metapackage", file("metapackage")) settings(MetaPackaging.settings(root):_*) val meta = Project("metapackage", file("metapackage")) settings(MetaPackaging.settings(root):_*)
} }

2
project/packaging.scala
View File

@ -190,7 +190,7 @@ object Packaging {
) )
def makeWindowsXml(sbtVersion: String, sourceDir: File): scala.xml.Node = { def makeWindowsXml(sbtVersion: String, sourceDir: File): scala.xml.Node = {
val version = (sbtVersion split "\\.") match { val version = (sbtVersion split "[^\\d]" filterNot (_.isEmpty)) match {
case Array(major,minor,bugfix, _*) => Seq(major,minor,bugfix, "1") mkString "." case Array(major,minor,bugfix, _*) => Seq(major,minor,bugfix, "1") mkString "."
case Array(major,minor) => Seq(major,minor,"0","1") mkString "." case Array(major,minor) => Seq(major,minor,"0","1") mkString "."
case Array(major) => Seq(major,"0","0","1") mkString "." case Array(major) => Seq(major,"0","0","1") mkString "."

4
project/project/plugins.scala
View File

@ -6,7 +6,7 @@ object PluginBuild extends Build {
val root = Project("root", file(".")) settings( val root = Project("root", file(".")) settings(
resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns), resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns),
addSbtPlugin("com.typesafe" % "sbt-native-packager" % "0.4.3"), addSbtPlugin("com.typesafe" % "sbt-native-packager" % "0.4.4"),
libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.6" libraryDependencies += "net.databinder" % "dispatch-http_2.9.1" % "0.8.6"
) )
} }