diff options
author | Lex Spoon <lex@lexspoon.org> | 2006-01-20 15:14:52 +0000 |
---|---|---|
committer | Lex Spoon <lex@lexspoon.org> | 2006-01-20 15:14:52 +0000 |
commit | 628f5c1eab1f460e0ac1281b3e156e234ce5cb77 (patch) | |
tree | 2f5db56be74ad0a6bd42df917604c9274fb26815 | |
parent | 9eac2bedc616f87dd70c7bd0172e98b5b4b57d19 (diff) | |
download | scala-628f5c1eab1f460e0ac1281b3e156e234ce5cb77.tar.gz scala-628f5c1eab1f460e0ac1281b3e156e234ce5cb77.tar.bz2 scala-628f5c1eab1f460e0ac1281b3e156e234ce5cb77.zip |
When zip-ping up an sbp file, include all depen...
When zip-ping up an sbp file, include all dependencies, not just the
ones that have changed.
-rw-r--r-- | src/compiler/scala/tools/ant/ScalaBazaar.scala | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/compiler/scala/tools/ant/ScalaBazaar.scala b/src/compiler/scala/tools/ant/ScalaBazaar.scala index d217b60317..9ca96376ae 100644 --- a/src/compiler/scala/tools/ant/ScalaBazaar.scala +++ b/src/compiler/scala/tools/ant/ScalaBazaar.scala @@ -235,21 +235,13 @@ package scala.tools.ant { // Checks for new files and creates the ZIP - val mapper = new MergingMapper() - mapper.setTo(getFile.getName) val zipContent = for { val Pair(folder, fileSets) <- fileSetsMap.fileSets val fileSet <- fileSets - val file <- { - List.fromArray(new SourceFileScanner(this).restrict( - fileSet.getDirectoryScanner(getProject).getIncludedFiles, - fileSet.getDir(getProject), - getFile.getParentFile, - mapper - )) - } - } yield Triple(folder, fileSet.getDir(getProject), file) + val file <- + List.fromArray(fileSet.getDirectoryScanner(getProject).getIncludedFiles) + } yield {Console.println(file.toString); Triple(folder, fileSet.getDir(getProject), file)} if (!zipContent.isEmpty) { val zip = new ZipOutputStream(new FileOutputStream(file.get, false)) for (val Triple(destFolder, srcFolder, file) <- zipContent) { |