Repository: spark Updated Branches: refs/heads/branch-2.2 7bf25e086 -> b9adddb6a
[SPARK-22167][R][BUILD] sparkr packaging issue allow zinc ## What changes were proposed in this pull request? When zinc is running the pwd might be in the root of the project. A quick solution to this is to not go a level up incase we are in the root rather than root/core/. If we are in the root everything works fine, if we are in core add a script which goes and runs the level up ## How was this patch tested? set -x in the SparkR install scripts. Author: Holden Karau <hol...@us.ibm.com> Closes #19402 from holdenk/SPARK-22167-sparkr-packaging-issue-allow-zinc. (cherry picked from commit 8fab7995d36c7bc4524393b20a4e524dbf6bbf62) Signed-off-by: Holden Karau <hol...@us.ibm.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b9adddb6 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b9adddb6 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b9adddb6 Branch: refs/heads/branch-2.2 Commit: b9adddb6a3d4f35c7ad67f2e4ec903ede05893b6 Parents: 7bf25e0 Author: Holden Karau <hol...@us.ibm.com> Authored: Mon Oct 2 11:46:51 2017 -0700 Committer: Holden Karau <hol...@us.ibm.com> Committed: Mon Oct 2 11:47:11 2017 -0700 ---------------------------------------------------------------------- R/install-dev.sh | 1 + core/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/b9adddb6/R/install-dev.sh ---------------------------------------------------------------------- diff --git a/R/install-dev.sh b/R/install-dev.sh index d613552..9fbc999 100755 --- a/R/install-dev.sh +++ b/R/install-dev.sh @@ -28,6 +28,7 @@ set -o pipefail set -e +set -x FWDIR="$(cd "`dirname "${BASH_SOURCE[0]}"`"; pwd)" LIB_DIR="$FWDIR/lib" http://git-wip-us.apache.org/repos/asf/spark/blob/b9adddb6/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 254a9b9..977396c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -464,7 +464,7 @@ </execution> </executions> <configuration> - <executable>..${file.separator}R${file.separator}install-dev${script.extension}</executable> + <executable>${project.basedir}${file.separator}..${file.separator}R${file.separator}install-dev${script.extension}</executable> </configuration> </plugin> </plugins> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
