Skip to content
Browse files

fix zip path location

  • Loading branch information...
1 parent 9d95178 commit 508ac45b88d4864786e24c6bc8ae16c31c8ede70 Stephan Zuercher committed Apr 16, 2012
Showing with 8 additions and 2 deletions.
  1. +5 −0 CHANGELOG
  2. +3 −2 src/main/scala/com/twitter/sbt/PackageDist.scala
View
5 CHANGELOG
@@ -1,3 +1,8 @@
+1.0.4
+-----
+
+- moved packaged zip file to dist folder (out of hierarchy being zipped)
+
1.0.3
-----
release: 9 Apr 2012
View
5 src/main/scala/com/twitter/sbt/PackageDist.scala
@@ -308,18 +308,19 @@ object PackageDist extends Plugin {
// package all the things
packageDist <<= (
test in Test,
+ baseDirectory,
packageDistCopy,
packageDistValidateConfigFiles,
packageDistDir,
packageDistName,
packageDistZipPath,
packageDistZipName,
streams
- ) map { (_, files, _, dest, distName, zipPath, zipName, s) =>
+ ) map { (_, base, files, _, dest, distName, zipPath, zipName, s) =>
// build the zip
s.log.info("Building %s from %d files.".format(zipName, files.size))
val zipRebaser = Path.rebase(dest, zipPath)
- val zipFile = dest / zipName
+ val zipFile = base / "dist" / zipName
IO.zip(files.map(f => (f, zipRebaser(f).get)), zipFile)
zipFile
}

0 comments on commit 508ac45

Please sign in to comment.
Something went wrong with that request. Please try again.