Permalink
Browse files

Merge branch 'master' of https://git.twitter.biz/sbt-package-dist

Conflicts:
	project/Build.scala
  • Loading branch information...
2 parents eb140b8 + 4a75494 commit 9f495b7e7838d637e10e9ef82b9e34635e1d7d4a Robey Pointer committed Apr 27, 2012
Showing with 10 additions and 3 deletions.
  1. +6 −0 CHANGELOG
  2. +1 −1 project/Build.scala
  3. +3 −2 src/main/scala/com/twitter/sbt/PackageDist.scala
View
@@ -1,3 +1,9 @@
+1.0.4
+-----
+release: 16 Apr 2012
+
+- moved packaged zip file to dist folder (out of hierarchy being zipped)
+
1.0.3
-----
release: 9 Apr 2012
View
@@ -18,7 +18,7 @@ object StandardProjectPlugin extends Build {
).settings(
organization := "com.twitter",
name := "sbt-package-dist",
- version := "1.0.4-SNAPSHOT",
+ version := "1.0.5-SNAPSHOT",
SubversionPublisher.subversionRepository := Some("https://svn.twitter.biz/maven-public"),
sbtPlugin := true,
libraryDependencies ++= Seq (
@@ -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 9f495b7

Please sign in to comment.