diff options
| author | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2016-12-08 18:26:54 -0800 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2016-12-08 18:26:54 -0800 |
| commit | 4ac8b20bf2f962d9b8b6b209468896758d49efe3 (patch) | |
| tree | 2e00a7b60eb9ff78f78bf43148badff8e9810a08 /dev/make-distribution.sh | |
| parent | 458fa3325e5f8c21c50e406ac8059d6236f93a9c (diff) | |
| download | spark-4ac8b20bf2f962d9b8b6b209468896758d49efe3.tar.gz spark-4ac8b20bf2f962d9b8b6b209468896758d49efe3.tar.bz2 spark-4ac8b20bf2f962d9b8b6b209468896758d49efe3.zip | |
[SPARKR][PYSPARK] Fix R source package name to match Spark version. Remove pip tar.gz from distribution
## What changes were proposed in this pull request?
Fixes name of R source package so that the `cp` in release-build.sh works correctly.
Issue discussed in https://github.com/apache/spark/pull/16014#issuecomment-265867125
Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Closes #16221 from shivaram/fix-sparkr-release-build-name.
Diffstat (limited to 'dev/make-distribution.sh')
| -rwxr-xr-x | dev/make-distribution.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh index fe281bbaa2..4da7d57384 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -222,11 +222,14 @@ fi # Make R package - this is used for both CRAN release and packing R layout into distribution if [ "$MAKE_R" == "true" ]; then echo "Building R source package" + R_PACKAGE_VERSION=`grep Version $SPARK_HOME/R/pkg/DESCRIPTION | awk '{print $NF}'` pushd "$SPARK_HOME/R" > /dev/null # Build source package and run full checks # Install source package to get it to generate vignettes, etc. # Do not source the check-cran.sh - it should be run from where it is for it to set SPARK_HOME NO_TESTS=1 CLEAN_INSTALL=1 "$SPARK_HOME/"R/check-cran.sh + # Make a copy of R source package matching the Spark release version. + cp $SPARK_HOME/R/SparkR_"$R_PACKAGE_VERSION".tar.gz $SPARK_HOME/R/SparkR_"$VERSION".tar.gz popd > /dev/null else echo "Skipping building R source package" @@ -238,6 +241,12 @@ 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" + +# Remove the python distribution from dist/ if we built it +if [ "$MAKE_PIP" == "true" ]; then + rm -f $DISTDIR/python/dist/pyspark-*.tar.gz +fi + cp -r "$SPARK_HOME/sbin" "$DISTDIR" # Copy SparkR if it exists if [ -d "$SPARK_HOME"/R/lib/SparkR ]; then |