diff options
author | Burak Yavuz <brkyvz@gmail.com> | 2015-08-12 20:59:38 -0700 |
---|---|---|
committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-08-12 20:59:47 -0700 |
commit | 3d1b9f007b9b6a9bb4e146de32bd34affa723e12 (patch) | |
tree | 40e0f4d77c5514e9466d3623969f7fa5c0689b85 | |
parent | af470a757c7aed81d626634590a0fb395f0241f5 (diff) | |
download | spark-3d1b9f007b9b6a9bb4e146de32bd34affa723e12.tar.gz spark-3d1b9f007b9b6a9bb4e146de32bd34affa723e12.tar.bz2 spark-3d1b9f007b9b6a9bb4e146de32bd34affa723e12.zip |
[SPARK-9916] [BUILD] [SPARKR] removed left-over sparkr.zip copy/create commands from codebase
sparkr.zip is now built by SparkSubmit on a need-to-build basis.
cc shivaram
Author: Burak Yavuz <brkyvz@gmail.com>
Closes #8147 from brkyvz/make-dist-fix.
(cherry picked from commit 2fb4901b71cee65d40a43e61e3f4411c30cdefc3)
Signed-off-by: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
-rw-r--r-- | R/install-dev.bat | 5 | ||||
-rwxr-xr-x | make-distribution.sh | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/R/install-dev.bat b/R/install-dev.bat index f32670b67d..008a5c668b 100644 --- a/R/install-dev.bat +++ b/R/install-dev.bat @@ -25,8 +25,3 @@ set SPARK_HOME=%~dp0.. MKDIR %SPARK_HOME%\R\lib R.exe CMD INSTALL --library="%SPARK_HOME%\R\lib" %SPARK_HOME%\R\pkg\ - -rem Zip the SparkR package so that it can be distributed to worker nodes on YARN -pushd %SPARK_HOME%\R\lib -%JAVA_HOME%\bin\jar.exe cfM "%SPARK_HOME%\R\lib\sparkr.zip" SparkR -popd diff --git a/make-distribution.sh b/make-distribution.sh index 8589255027..04ad0052eb 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -219,7 +219,6 @@ cp -r "$SPARK_HOME/ec2" "$DISTDIR" if [ -d "$SPARK_HOME"/R/lib/SparkR ]; then mkdir -p "$DISTDIR"/R/lib cp -r "$SPARK_HOME/R/lib/SparkR" "$DISTDIR"/R/lib - cp "$SPARK_HOME/R/lib/sparkr.zip" "$DISTDIR"/R/lib fi # Download and copy in tachyon, if requested |