spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject spark git commit: [SPARK-15851][BUILD] Fix the call of the bash script to enable proper run in Windows
Date Thu, 16 Jun 2016 03:11:47 GMT
Repository: spark
Updated Branches:
  refs/heads/master ebdd75127 -> 5a52ba0f9


[SPARK-15851][BUILD] Fix the call of the bash script to enable proper run in Windows

## What changes were proposed in this pull request?
The way bash script `build/spark-build-info` is called from core/pom.xml prevents Spark building
on Windows. Instead of calling the script directly we call bash and pass the script as an
argument. This enables running it on Windows with bash installed which typically comes with
Git.

This brings https://github.com/apache/spark/pull/13612 up-to-date and also addresses comments
from the code review.

Closes #13612

## How was this patch tested?
I built manually (on a Mac) to verify it didn't break Mac compilation.

Author: Reynold Xin <rxin@databricks.com>
Author: avulanov <nashb@yandex.ru>

Closes #13691 from rxin/SPARK-15851.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5a52ba0f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5a52ba0f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5a52ba0f

Branch: refs/heads/master
Commit: 5a52ba0f952b21818ed73cb253381f6a3799dc46
Parents: ebdd751
Author: Reynold Xin <rxin@databricks.com>
Authored: Wed Jun 15 20:11:23 2016 -0700
Committer: Reynold Xin <rxin@databricks.com>
Committed: Wed Jun 15 20:11:23 2016 -0700

----------------------------------------------------------------------
 core/pom.xml             | 3 ++-
 project/SparkBuild.scala | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/5a52ba0f/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 90c8f97..b1f0b03 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -357,7 +357,8 @@
             <configuration>
               <!-- Execute the shell script to generate the spark build information. -->
               <target>
-                <exec executable="${project.basedir}/../build/spark-build-info">
+                <exec executable="bash">
+                  <arg value="${project.basedir}/../build/spark-build-info"/>
                   <arg value="${project.build.directory}/extra-resources"/>
                   <arg value="${project.version}"/>
                 </exec>

http://git-wip-us.apache.org/repos/asf/spark/blob/5a52ba0f/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 2f7da31..bce7f1d 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -458,7 +458,7 @@ object Core {
     resourceGenerators in Compile += Def.task {
       val buildScript = baseDirectory.value + "/../build/spark-build-info"
       val targetDir = baseDirectory.value + "/target/extra-resources/"
-      val command =  buildScript + " " + targetDir + " " + version.value
+      val command = Seq("bash", buildScript, targetDir, version.value)
       Process(command).!!
       val propsFile = baseDirectory.value / "target" / "extra-resources" / "spark-version-info.properties"
       Seq(propsFile)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message