diff options
| author | Felix Cheung <felixcheung_m@hotmail.com> | 2017-01-16 13:49:12 -0800 |
|---|---|---|
| committer | Felix Cheung <felixcheung@apache.org> | 2017-01-16 13:49:12 -0800 |
| commit | c84f7d3e1b845bc1e595ce9a6e2de663c2d218f4 (patch) | |
| tree | f5988031c266dfadaa4a791b07b0737cb39ab529 /dev/make-distribution.sh | |
| parent | a115a54399cd4bedb1a5086943a88af6339fbe85 (diff) | |
| download | spark-c84f7d3e1b845bc1e595ce9a6e2de663c2d218f4.tar.gz spark-c84f7d3e1b845bc1e595ce9a6e2de663c2d218f4.tar.bz2 spark-c84f7d3e1b845bc1e595ce9a6e2de663c2d218f4.zip | |
[SPARK-18828][SPARKR] Refactor scripts for R
## What changes were proposed in this pull request?
Refactored script to remove duplications and clearer purpose for each script
## How was this patch tested?
manually
Author: Felix Cheung <felixcheung_m@hotmail.com>
Closes #16249 from felixcheung/rscripts.
Diffstat (limited to 'dev/make-distribution.sh')
| -rwxr-xr-x | dev/make-distribution.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh index 6c5ae0d629..47ff504316 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -232,14 +232,17 @@ if [ "$MAKE_R" == "true" ]; then 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 + NO_TESTS=1 "$SPARK_HOME/"R/check-cran.sh + # Move R source package to match the Spark release version if the versions are not the same. # NOTE(shivaram): `mv` throws an error on Linux if source and destination are same file if [ "$R_PACKAGE_VERSION" != "$VERSION" ]; then mv $SPARK_HOME/R/SparkR_"$R_PACKAGE_VERSION".tar.gz $SPARK_HOME/R/SparkR_"$VERSION".tar.gz fi + + # Install source package to get it to generate vignettes rds files, etc. + VERSION=$VERSION "$SPARK_HOME/"R/install-source-package.sh popd > /dev/null else echo "Skipping building R source package" |