Skip to content
Snippets Groups Projects
Commit 5a52ba0f authored by Reynold Xin's avatar Reynold Xin
Browse files

[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.
parent ebdd7512
No related branches found
No related tags found
No related merge requests found
......@@ -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>
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment