spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hol...@apache.org
Subject spark git commit: [SPARK-22167][R][BUILD] sparkr packaging issue allow zinc
Date Mon, 02 Oct 2017 18:47:44 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-2.1 81e4008c2 -> ff4179bba


[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 <holden@us.ibm.com>

Closes #19402 from holdenk/SPARK-22167-sparkr-packaging-issue-allow-zinc.

(cherry picked from commit 8fab7995d36c7bc4524393b20a4e524dbf6bbf62)
Signed-off-by: Holden Karau <holden@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/ff4179bb
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ff4179bb
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ff4179bb

Branch: refs/heads/branch-2.1
Commit: ff4179bba7651f8645840c81db80335388986b29
Parents: 81e4008
Author: Holden Karau <holden@us.ibm.com>
Authored: Mon Oct 2 11:46:51 2017 -0700
Committer: Holden Karau <holden@us.ibm.com>
Committed: Mon Oct 2 11:47:36 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/ff4179bb/R/install-dev.sh
----------------------------------------------------------------------
diff --git a/R/install-dev.sh b/R/install-dev.sh
index 0f88120..43bb1bc 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 $0`; pwd)"
 LIB_DIR="$FWDIR/lib"

http://git-wip-us.apache.org/repos/asf/spark/blob/ff4179bb/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8fe1288..fbb0eda 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -460,7 +460,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-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message