From 5a52ba0f952b21818ed73cb253381f6a3799dc46 Mon Sep 17 00:00:00 2001 From: Reynold Xin Date: Wed, 15 Jun 2016 20:11:23 -0700 Subject: [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 Author: avulanov Closes #13691 from rxin/SPARK-15851. --- project/SparkBuild.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'project') 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) -- cgit v1.2.3