You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sh...@apache.org on 2015/05/23 21:28:20 UTC
spark git commit: [HOTFIX] Copy SparkR lib if it exists in
make-distribution
Repository: spark
Updated Branches:
refs/heads/master 2b7e63585 -> b231baa24
[HOTFIX] Copy SparkR lib if it exists in make-distribution
This is to fix an issue reported in #6373 where the `cp` would fail if `-Psparkr` was not used in the build
cc dragos pwendell
Author: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Closes #6379 from shivaram/make-distribution-hotfix and squashes the following commits:
08eb7e4 [Shivaram Venkataraman] Copy SparkR lib if it exists in make-distribution
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b231baa2
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b231baa2
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b231baa2
Branch: refs/heads/master
Commit: b231baa24857ea83c8062dd4e033db4e35bf457d
Parents: 2b7e635
Author: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Authored: Sat May 23 12:28:16 2015 -0700
Committer: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Committed: Sat May 23 12:28:16 2015 -0700
----------------------------------------------------------------------
make-distribution.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/b231baa2/make-distribution.sh
----------------------------------------------------------------------
diff --git a/make-distribution.sh b/make-distribution.sh
index 7882734..a2b0c43 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -229,10 +229,13 @@ 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"
-mkdir -p "$DISTDIR"/R/lib
-cp -r "$SPARK_HOME/R/lib/SparkR" "$DISTDIR"/R/lib
cp -r "$SPARK_HOME/sbin" "$DISTDIR"
cp -r "$SPARK_HOME/ec2" "$DISTDIR"
+# Copy SparkR if it exists
+if [ -d "$SPARK_HOME"/R/lib/SparkR ]; then
+ mkdir -p "$DISTDIR"/R/lib
+ cp -r "$SPARK_HOME/R/lib/SparkR" "$DISTDIR"/R/lib
+fi
# Download and copy in tachyon, if requested
if [ "$SPARK_TACHYON" == "true" ]; then
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org