Revert "FIX #141 Upgrading to native-packager 1.0.4 and autoplugins"

This reverts commit 1da1582
because it doesn't work on Windows; see
#142 for discussion.

Author: SethTisue

build.sbt

@@ -23,8 +23,6 @@ Docs.settings
 
 ScalaDist.platformSettings
 
-enablePlugins(UniversalPlugin, RpmPlugin, JDebPackaging)
-
 // resolvers += "local" at "file:///e:/.m2/repository"
 // resolvers += Resolver.mavenLocal
-// to test, run e.g., stage, or windows:packageBin, show s3-upload::mappings
+// to test, run e.g., stage, or windows:packageBin, show s3-upload::mappings

project/ScalaDist.scala

@@ -2,8 +2,6 @@ import sbt._
 import sbt.Keys._
 
 import com.typesafe.sbt.SbtNativePackager._
-import com.typesafe.sbt.packager.MappingsHelper._
-import com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.useNativeZip
 import com.typesafe.sbt.packager.Keys._
 
 import com.typesafe.sbt.S3Plugin.S3.upload
@@ -44,6 +42,7 @@ object ScalaDist {
     )
 
   def settings: Seq[Setting[_]] =
+    packagerSettings ++
     useNativeZip ++ // use native zip to preserve +x permission on scripts
     Seq(
       name                := "scala",
@@ -75,16 +74,19 @@ object ScalaDist {
     case "scala-dist" =>
       val tmpdir = IO.createTemporaryDirectory
       IO.unzip(file, tmpdir)
+      // IO.listFiles(tmpdir) does not recurse, use ** with glob "*" to find all files
+      (PathFinder(IO.listFiles(tmpdir)) ** "*").get flatMap { file =>
+        val relative = IO.relativize(tmpdir, file).get // .get is safe because we just unzipped under tmpdir
+
+        // files are stored in repository with platform-appropriate line endings
+        // if (onWindows && (relative endsWith ".bat")) toDosInPlace(file)
 
-      // create mappings from the unzip scala-dist zip
-      contentOf(tmpdir) filter {
-	case (file, dest) => !(dest.endsWith("MANIFEST.MF") || dest.endsWith("META-INF"))
-      } map {
         // make unix scripts executable (heuristically...)
-	case (file, dest) if (dest startsWith "bin/") && !(dest endsWith ".bat") =>
+        if ((relative startsWith "bin/") && !(file.getName endsWith ".bat"))
           file.setExecutable(true, true)
-	  file -> dest
-	case mapping => mapping
+
+        if (relative startsWith "META-INF") Seq()
+        else Seq(file -> relative)
       }
 
     // core jars: use simple name for backwards compat

project/Unix.scala

@@ -4,7 +4,6 @@ import sbt.Keys._
 import com.typesafe.sbt.SbtNativePackager._
 import com.typesafe.sbt.packager.Keys._
 import com.typesafe.sbt.packager.linux.{LinuxPackageMapping => pkgMap, LinuxSymlink}
-import com.typesafe.sbt.packager.linux.LinuxPlugin.autoImport.packageMapping
 
 /** Create debian & rpm packages.
  *
@@ -97,6 +96,5 @@ object Unix {
 
     // Hack so we use regular version, rather than debian version.
     target in Debian := target.value / s"${(name in Debian).value}-${version.value}"
-
   )
 }

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.4")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.6.4")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-s3" % "0.8")