put zip to make-distribution.sh

maropu · Apr 27, 2015 · 9396346 · 9396346
1 parent 0d2baf7
commit 9396346
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/make-distribution.sh b/make-distribution.sh
@@ -228,6 +228,7 @@ cp "$SPARK_HOME"/conf/*.template "$DISTDIR"/conf
 cp "$SPARK_HOME/README.md" "$DISTDIR"
 cp -r "$SPARK_HOME/bin" "$DISTDIR"
 cp -r "$SPARK_HOME/python" "$DISTDIR"
+zip -r "$DISTDIR"/python/lib/pyspark.zip "$SPARK_HOME"/python/lib/pyspark
 cp -r "$SPARK_HOME/sbin" "$DISTDIR"
 cp -r "$SPARK_HOME/ec2" "$DISTDIR"
 

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
@@ -361,20 +361,12 @@ object PySparkAssembly {
     // to be included in the assembly. We can't just add "python/" to the assembly's resource dir
     // list since that will copy unneeded / unwanted files.
     resourceGenerators in Compile <+= resourceManaged in Compile map { outDir: File =>
-      val src = new File(BuildCommons.sparkHome, "python/pyspark")
-
-      val zipFile = new File(BuildCommons.sparkHome , "python/lib/pyspark.zip")
-      IO.delete(zipFile)
-      def entries(f: File):List[File] =
-        f :: (if (f.isDirectory) IO.listFiles(f).toList.flatMap(entries(_)) else Nil)
-      IO.zip(entries(src).map(
-        d => (d, d.getAbsolutePath.substring(src.getParent.length +1))),
-        zipFile)
-
       val dst = new File(outDir, "pyspark")
       if (!dst.isDirectory()) {
         require(dst.mkdirs())
       }
+
+      val src = new File(BuildCommons.sparkHome, "python/pyspark")
       copy(src, dst)
     }
   )