diff options
| author | Reynold Xin <rxin@databricks.com> | 2016-06-15 20:11:23 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2016-06-15 20:11:23 -0700 |
| commit | 5a52ba0f952b21818ed73cb253381f6a3799dc46 (patch) | |
| tree | 5566290e28a87e4cbb86346a6897b687f9d024b0 | |
| parent | ebdd7512723851934241bd87fe7b25fd60cc58d8 (diff) | |
| download | spark-5a52ba0f952b21818ed73cb253381f6a3799dc46.tar.gz spark-5a52ba0f952b21818ed73cb253381f6a3799dc46.tar.bz2 spark-5a52ba0f952b21818ed73cb253381f6a3799dc46.zip | |
[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.
| -rw-r--r-- | core/pom.xml | 3 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/pom.xml b/core/pom.xml index 90c8f97f2b..b1f0b03b4a 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> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 2f7da31e55..bce7f1d69b 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) |