aboutsummaryrefslogtreecommitdiff
path: root/R
diff options
context:
space:
mode:
Diffstat (limited to 'R')
-rwxr-xr-xR/create-docs.sh5
-rwxr-xr-xR/install-dev.sh9
2 files changed, 9 insertions, 5 deletions
diff --git a/R/create-docs.sh b/R/create-docs.sh
index af47c0863b..6a4687b06e 100755
--- a/R/create-docs.sh
+++ b/R/create-docs.sh
@@ -30,10 +30,7 @@ set -e
export FWDIR="$(cd "`dirname "$0"`"; pwd)"
pushd $FWDIR
-# Generate Rd file
-Rscript -e 'library(devtools); devtools::document(pkg="./pkg", roclets=c("rd"))'
-
-# Install the package
+# Install the package (this will also generate the Rd files)
./install-dev.sh
# Now create HTML files
diff --git a/R/install-dev.sh b/R/install-dev.sh
index b9e2527035..1edd551f8d 100755
--- a/R/install-dev.sh
+++ b/R/install-dev.sh
@@ -34,5 +34,12 @@ LIB_DIR="$FWDIR/lib"
mkdir -p $LIB_DIR
-# Install R
+pushd $FWDIR
+
+# Generate Rd files if devtools is installed
+Rscript -e ' if("devtools" %in% rownames(installed.packages())) { library(devtools); devtools::document(pkg="./pkg", roclets=c("rd")) }'
+
+# Install SparkR to $LIB_DIR
R CMD INSTALL --library=$LIB_DIR $FWDIR/pkg/
+
+popd