merge 2.11.x onto 2.12.x

README.md

@@ -34,7 +34,7 @@ The specification also used to be in this repo -- it is now a part of the main r
   - install Windows 7 professional N 64-bit, ensure network access to GitHub
   - install Oracle Java 6 JDK
   - install WiX v3.6 (reboot!)
-  - download sbt launcher 0.13.1 from xsbt.org to `c:\users\jenkins\Downloads`
+  - download sbt launcher from xsbt.org to `c:\users\jenkins\Downloads`
   - install Git
   - configure the Jenkins master's tool locations for
      - HOME

build.sbt

@@ -23,7 +23,7 @@ Docs.settings
 
 ScalaDist.platformSettings
 
-enablePlugins(UniversalPlugin, RpmPlugin, JDebPackaging)
+enablePlugins(UniversalPlugin, RpmPlugin, JDebPackaging, WindowsPlugin)
 
 // resolvers += "local" at "file:///e:/.m2/repository"
 // resolvers += Resolver.mavenLocal

project/Docs.scala

@@ -16,7 +16,7 @@ object Docs {
   import ScalaDist._
 
   def settings: Seq[Setting[_]] = Seq(
-    name in UniversalDocs := s"scala-docs-${version.value}",
+    packageName in UniversalDocs := s"scala-docs-${version.value}",
     // libraryDependencies += scalaDistDep(version.value, "javadoc"), // seems not to be necessary
     // need updateClassifiers to get javadoc jars
     mappings in UniversalDocs ++= createMappingsWith(updateClassifiers.value.toSeq, universalDocsMappings)

project/ScalaDist.scala

@@ -35,7 +35,15 @@ object ScalaDist {
       mappings in upload += uploadMapping(packageZipTarball in UniversalDocs).value,
       mappings in upload += uploadMapping(packageXzTarball in UniversalDocs).value,
       mappings in upload += uploadMapping(packageBin in Rpm).value,
-      mappings in upload += uploadMapping(packageBin in Debian).value
+      // Debian needs special handling because the value sbt-native-packager
+      // gives us for `packageBin in Debian` (coming from the archiveFilename
+      // method) includes the debian version and arch information,
+      // which we historically have not included.  I don't see a way to
+      // override the filename on disk, so we re-map at upload time
+      mappings in upload += Def.task {
+        (packageBin in Debian).value ->
+          s"scala/${version.value}/${(name in Debian).value}-${version.value}.deb"
+      }.value
     )
 
   def settings: Seq[Setting[_]] =
@@ -52,7 +60,13 @@ object ScalaDist {
 
       // create lib directory by resolving scala-dist's dependencies
       // to populate the rest of the distribution, explode scala-dist artifact itself
-      mappings in Universal ++= createMappingsWith(update.value.toSeq, universalMappings)
+      mappings in Universal ++= createMappingsWith(update.value.toSeq, universalMappings),
+
+      // work around regression in sbt-native-packager 1.0.5 where
+      // these tasks invoke `tar` without any flags at all
+      universalArchiveOptions in (UniversalDocs, packageZipTarball) := Seq("--force-local", "-pcvf"),
+      universalArchiveOptions in (UniversalDocs, packageXzTarball ) := Seq("--force-local", "-pcvf")
+
     )
 
   // private lazy val onWindows = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows")

project/Unix.scala

@@ -89,14 +89,10 @@ object Unix {
     // Debian Specific
     name in Debian    := "scala",
     debianPackageDependencies += "java8-runtime-headless",
-    // debianPackageDependencies += "libjansi-java",
 
     linuxPackageMappings in Debian += (packageMapping(
         (sourceDirectory.value / "debian" / "changelog") -> "/usr/share/doc/scala/changelog.gz"
-      ) withUser "root" withGroup "root" withPerms "0644" gzipped) asDocs(),
-
-    // Hack so we use regular version, rather than debian version.
-    target in Debian := target.value / s"${(name in Debian).value}-${version.value}"
+      ).withUser("root").withGroup("root").withPerms("0644").gzipped).asDocs()
 
   )
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.7
+sbt.version=0.13.9

project/plugins.sbt

@@ -1,4 +1,6 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.4")
+scalacOptions ++= Seq("-deprecation", "-feature", "-Xlint")
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.6")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-s3" % "0.8")