spark git commit: [SPARK-8027] [SPARKR] Move man pages creation to install-dev.sh
Repository: spark
Updated Branches:
refs/heads/branch-1.4 81ff7a901 - 0b71b851d
[SPARK-8027] [SPARKR] Move man pages creation to install-dev.sh
This also helps us get rid of the sparkr-docs maven profile as docs are now
built by just using -Psparkr when the roxygen2 package is available
Related to discussion in #6567
cc pwendell srowen -- Let me know if this looks better
Author: Shivaram Venkataraman shiva...@cs.berkeley.edu
Closes #6593 from shivaram/sparkr-pom-cleanup and squashes the following
commits:
b282241 [Shivaram Venkataraman] Remove sparkr-docs from release script as well
8f100a5 [Shivaram Venkataraman] Move man pages creation to install-dev.sh This
also helps us get rid of the sparkr-docs maven profile as docs are now built by
just using -Psparkr when the roxygen2 package is available
(cherry picked from commit 3dc005282a694e105f40e429b28b0a677743341f)
Signed-off-by: Shivaram Venkataraman shiva...@cs.berkeley.edu
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0b71b851
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0b71b851
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0b71b851
Branch: refs/heads/branch-1.4
Commit: 0b71b851de8a1f97fe764b668337474661ee014e
Parents: 81ff7a9
Author: Shivaram Venkataraman shiva...@cs.berkeley.edu
Authored: Thu Jun 4 12:52:16 2015 -0700
Committer: Shivaram Venkataraman shiva...@cs.berkeley.edu
Committed: Thu Jun 4 12:52:45 2015 -0700
--
R/create-docs.sh | 5 +
R/install-dev.sh | 9 -
core/pom.xml | 23 ---
dev/create-release/create-release.sh | 16
4 files changed, 17 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/0b71b851/R/create-docs.sh
--
diff --git a/R/create-docs.sh b/R/create-docs.sh
index af47c08..6a4687b 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
http://git-wip-us.apache.org/repos/asf/spark/blob/0b71b851/R/install-dev.sh
--
diff --git a/R/install-dev.sh b/R/install-dev.sh
index b9e2527..1edd551 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
http://git-wip-us.apache.org/repos/asf/spark/blob/0b71b851/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index a021842..5c02be8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -481,29 +481,6 @@
/plugins
/build
/profile
-profile
- idsparkr-docs/id
- build
-plugins
- plugin
-groupIdorg.codehaus.mojo/groupId
-artifactIdexec-maven-plugin/artifactId
-executions
- execution
-idsparkr-pkg-docs/id
-phasecompile/phase
-goals
- goalexec/goal
-/goals
- /execution
-/executions
-configuration
-
executable..${path.separator}R${path.separator}create-docs${script.extension}/executable
-/configuration
- /plugin
-/plugins
- /build
-/profile
/profiles
/project
http://git-wip-us.apache.org/repos/asf/spark/blob/0b71b851/dev/create-release/create-release.sh
--
diff --git a/dev/create-release/create-release.sh
b/dev/create-release/create-release.sh
index 0b14a61..54274a8 100755
--- a/dev/create-release/create-release.sh
+++ b/dev/create-release/create-release.sh
@@ -228,14 +228,14 @@ if [[ ! $@ =~ --skip-package ]]; then
# We increment the Zinc port each time to avoid OOM's and other craziness if
multiple builds
# share the same Zinc server.
- make_binary_release hadoop1 -Psparkr -Psparkr-docs -Phadoop-1 -Phive
-Phive-thriftserver 3030
- make_binary_release hadoop1-scala2.11 -Psparkr -Psparkr-docs -Phadoop-1
-Phive -Dscala-2.11 3031
- make_binary_release cdh4 -Psparkr -Psparkr-docs -Phadoop-1 -Phive
spark git commit: [SPARK-8027] [SPARKR] Move man pages creation to install-dev.sh
Repository: spark
Updated Branches:
refs/heads/master cd3176bd8 - 3dc005282
[SPARK-8027] [SPARKR] Move man pages creation to install-dev.sh
This also helps us get rid of the sparkr-docs maven profile as docs are now
built by just using -Psparkr when the roxygen2 package is available
Related to discussion in #6567
cc pwendell srowen -- Let me know if this looks better
Author: Shivaram Venkataraman shiva...@cs.berkeley.edu
Closes #6593 from shivaram/sparkr-pom-cleanup and squashes the following
commits:
b282241 [Shivaram Venkataraman] Remove sparkr-docs from release script as well
8f100a5 [Shivaram Venkataraman] Move man pages creation to install-dev.sh This
also helps us get rid of the sparkr-docs maven profile as docs are now built by
just using -Psparkr when the roxygen2 package is available
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3dc00528
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3dc00528
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3dc00528
Branch: refs/heads/master
Commit: 3dc005282a694e105f40e429b28b0a677743341f
Parents: cd3176b
Author: Shivaram Venkataraman shiva...@cs.berkeley.edu
Authored: Thu Jun 4 12:52:16 2015 -0700
Committer: Shivaram Venkataraman shiva...@cs.berkeley.edu
Committed: Thu Jun 4 12:52:16 2015 -0700
--
R/create-docs.sh | 5 +
R/install-dev.sh | 9 -
core/pom.xml | 23 ---
dev/create-release/create-release.sh | 16
4 files changed, 17 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/3dc00528/R/create-docs.sh
--
diff --git a/R/create-docs.sh b/R/create-docs.sh
index af47c08..6a4687b 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
http://git-wip-us.apache.org/repos/asf/spark/blob/3dc00528/R/install-dev.sh
--
diff --git a/R/install-dev.sh b/R/install-dev.sh
index b9e2527..1edd551 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
http://git-wip-us.apache.org/repos/asf/spark/blob/3dc00528/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index e35694e..40a64be 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -481,29 +481,6 @@
/plugins
/build
/profile
-profile
- idsparkr-docs/id
- build
-plugins
- plugin
-groupIdorg.codehaus.mojo/groupId
-artifactIdexec-maven-plugin/artifactId
-executions
- execution
-idsparkr-pkg-docs/id
-phasecompile/phase
-goals
- goalexec/goal
-/goals
- /execution
-/executions
-configuration
-
executable..${path.separator}R${path.separator}create-docs${script.extension}/executable
-/configuration
- /plugin
-/plugins
- /build
-/profile
/profiles
/project
http://git-wip-us.apache.org/repos/asf/spark/blob/3dc00528/dev/create-release/create-release.sh
--
diff --git a/dev/create-release/create-release.sh
b/dev/create-release/create-release.sh
index 0b14a61..54274a8 100755
--- a/dev/create-release/create-release.sh
+++ b/dev/create-release/create-release.sh
@@ -228,14 +228,14 @@ if [[ ! $@ =~ --skip-package ]]; then
# We increment the Zinc port each time to avoid OOM's and other craziness if
multiple builds
# share the same Zinc server.
- make_binary_release hadoop1 -Psparkr -Psparkr-docs -Phadoop-1 -Phive
-Phive-thriftserver 3030
- make_binary_release hadoop1-scala2.11 -Psparkr -Psparkr-docs -Phadoop-1
-Phive -Dscala-2.11 3031
- make_binary_release cdh4 -Psparkr -Psparkr-docs -Phadoop-1 -Phive
-Phive-thriftserver -Dhadoop.version=2.0.0-mr1-cdh4.2.0 3032
- make_binary_release hadoop2.3 -Psparkr -Psparkr-docs -Phadoop-2.3 -Phive
