Merge pull request #202 from sbt/wip/fix-175

Fixes #175 - Staging does not clear previous files.

src/main/scala/com/typesafe/sbt/packager/universal/UniversalPlugin.scala

@@ -3,6 +3,7 @@ package packager
 package universal
 
 import sbt._
+import sbt.Keys.cacheDirectory
 import Keys._
 import Archives._
 import sbt.Keys.TaskStreams
@@ -36,7 +37,7 @@ trait UniversalPlugin extends Plugin {
         mappings <<= sourceDirectory map findSources,
         dist <<= (packageBin, streams) map printDist,
         stagingDirectory <<= target apply (_ / "stage"),
-        stage <<= (stagingDirectory, mappings) map stageFiles
+        stage <<= (cacheDirectory, stagingDirectory, mappings) map stageFiles(config.name)
       )) ++ Seq(
         sourceDirectory in config <<= sourceDirectory apply (_ / config.name),
         target in config <<= target apply (_ / config.name)
@@ -54,9 +55,12 @@ trait UniversalPlugin extends Plugin {
     dist
   }
 
-  private[this] def stageFiles(to: File, mappings: Seq[(File, String)]): Unit = {
-    val copies = mappings collect { case (f, p) => f -> (to / p) }
-    IO.copy(copies)
+  private[this] def stageFiles(config: String)(cacheDirectory: File, to: File, mappings: Seq[(File, String)]): Unit = {
+    val cache = cacheDirectory / ("packager-mappings-" + config)
+    val copies = mappings map {
+      case (file, path) => file -> (to / path)
+    }
+    Sync(cache)(copies)
     // Now set scripts to executable using Java's lack of understanding of permissions.
     // TODO - Config file user-readable permissions....
     for {

src/sbt-test/universal/clear-stage-dir/build.sbt

@@ -0,0 +1,7 @@
+import NativePackagerKeys._
+
+packagerSettings
+
+name := "simple-test"
+
+version := "0.1.0"

src/sbt-test/universal/clear-stage-dir/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version"))

src/sbt-test/universal/clear-stage-dir/src/universal/conf/test

@@ -0,0 +1 @@
+# Test configuration to include in zips.

src/sbt-test/universal/clear-stage-dir/src/universal/conf/test2

@@ -0,0 +1 @@
+# removable file

src/sbt-test/universal/clear-stage-dir/test

@@ -0,0 +1,9 @@
+# Stage the distribution and ensure files show up.
+> universal:stage
+$ exists target/universal/stage/conf/test
+$ exists target/universal/stage/conf/test2
+$ delete src/universal/conf/test2
+> universal:stage
+$ exists target/universal/stage/conf/test
+$ absent target/universal/stage/conf/test2
+