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

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

Upgrade to sbt-native-packager 1.1.1. Fixes #76.
This commit is contained in:
eugene yokota 2016-08-22 11:57:32 -04:00 committed by GitHub
parent e4e3e54c33 a1e1a570e0
commit 18e2fa2f28
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -1,13 +1,13 @@
language: scala language: scala
script: 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: scala:
- 2.10.3 - 2.10.3
jdk: jdk:
- openjdk6 - oraclejdk7
notifications: notifications:
email: email:
- qbranch@typesafe.com - sbt-dev-bot@googlegroups.com
before_install: before_install:
- cat /etc/hosts # optionally check the content *before* - cat /etc/hosts # optionally check the content *before*
- sudo hostname "$(hostname | cut -c1-63)" - sudo hostname "$(hostname | cut -c1-63)"

2
README.md
View File

@ -1,7 +1,7 @@
sbt: the launcher 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 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 project directory, the runner will figure out the versions of sbt and
scala required by the project and download them if necessary. scala required by the project and download them if necessary.

10
build.sbt
View File

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

2
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" % "sbt-native-packager" % "0.6.3"), addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.1"),
libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.10" libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.10"
) //dependsOn(nativePackager) ) //dependsOn(nativePackager)