Merge pull request #110 from sbt/fix-win-path

Upgrade to sbt-native-packager 1.1.1. Fixes #76.

.travis.yml

@@ -1,13 +1,13 @@
 language: scala
 script:
-  - sbt ++$TRAVIS_SCALA_VERSION rpm:packageBin debian:packageBin universal:packageBin
+  - sbt -Dsbt.build.version=1.0.0-M1 ++$TRAVIS_SCALA_VERSION rpm:packageBin debian:packageBin universal:packageBin
 scala:
   - 2.10.3
 jdk:
-  - openjdk6
+  - oraclejdk7
 notifications:
   email:
-    - qbranch@typesafe.com
+    - sbt-dev-bot@googlegroups.com
 before_install:
   - cat /etc/hosts # optionally check the content *before*
   - sudo hostname "$(hostname | cut -c1-63)"

README.md

@@ -1,7 +1,7 @@
 sbt: the launcher
 ==================
 
-An alternative script for running [sbt](https://github.com/harrah/xsbt).
+An alternative script for running [sbt](https://github.com/sbt/sbt).
 It works with sbt 0.7.x projects as well as 0.10+. If you're in an sbt
 project directory, the runner will figure out the versions of sbt and
 scala required by the project and download them if necessary.

build.sbt

@@ -1,6 +1,4 @@
-import com.typesafe.sbt.packager.Keys._
-import com.typesafe.sbt.SbtNativePackager._
-import util.control.Exception.catching
+import scala.util.control.Exception.catching
 import _root_.bintray.InternalBintrayKeys._
 import _root_.bintray.{BintrayRepo, Bintray}
 
@@ -25,15 +23,13 @@ val windowsBuildId = settingKey[Int]("build id for Windows installer")
 
 // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution.
 val root = (project in file(".")).
+  enablePlugins(UniversalPlugin, LinuxPlugin, DebianPlugin, RpmPlugin, WindowsPlugin).
   settings(
     organization := "org.scala-sbt",
     name := "sbt-launcher-packaging",
     version := "0.1.0",
     crossTarget <<= target,
-    packagerSettings,
     deploymentSettings,
-    mapGenericFilesToLinux,
-    mapGenericFilesToWindows,
     publishToSettings,
     sbtLaunchJarUrl := downloadUrlForVersion(sbtVersionToRelease),
     sbtLaunchJarLocation <<= target apply (_ / "sbt-launch.jar"),
@@ -50,7 +46,7 @@ val root = (project in file(".")).
       file
     },
     // GENERAL LINUX PACKAGING STUFFS
-    maintainer := "Eugene Yokota <eugene.yokota@typesafe.com>",
+    maintainer := "Eugene Yokota <eugene.yokota@lightbend.com>",
     packageSummary := "sbt, the interactive build tool",
     packageDescription := """This script provides a native way to run sbt,
   a build tool for Scala and more.""",

project/project/plugins.scala

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