summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2012-06-08 21:11:52 +0200
committerEugene Burmako <xeno.by@gmail.com>2012-06-08 21:14:24 +0200
commitaa11b656e1f398cb3e66cb0d386f3723d0aa46f9 (patch)
tree4688322f7d4303b196f0cad334e3d20489687aac /build.xml
parent59f0214e5d8603572f50514666ec24e274747369 (diff)
downloadscala-aa11b656e1f398cb3e66cb0d386f3723d0aa46f9.tar.gz
scala-aa11b656e1f398cb3e66cb0d386f3723d0aa46f9.tar.bz2
scala-aa11b656e1f398cb3e66cb0d386f3723d0aa46f9.zip
fixes a bug with bat files invocation from ant
http://ant.apache.org/manual/Tasks/exec.html Note that .bat files cannot in general by executed directly. One needs to execute the command shell executable cmd using the /c switch.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml12
1 files changed, 10 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index c0382cdce4..a9e0aa257e 100644
--- a/build.xml
+++ b/build.xml
@@ -304,9 +304,17 @@ INITIALISATION
</condition>
<exec osfamily="unix" executable="tools/get-scala-commit-sha" outputproperty="git.commit.sha" failifexecutionfails="false" />
- <exec osfamily="windows" executable="tools/get-scala-commit-sha.bat" outputproperty="git.commit.sha" failifexecutionfails="false" />
+ <exec osfamily="windows" executable="cmd.exe" outputproperty="git.commit.sha" failifexecutionfails="false">
+ <arg value="/c"/>
+ <arg value="tools\get-scala-commit-sha.bat"/>
+ <arg value="-p"/>
+ </exec>
<exec osfamily="unix" executable="tools/get-scala-commit-date" outputproperty="git.commit.date" failifexecutionfails="false" />
- <exec osfamily="windows" executable="tools/get-scala-commit-date.bat" outputproperty="git.commit.date" failifexecutionfails="false" />
+ <exec osfamily="windows" executable="cmd.exe" outputproperty="git.commit.date" failifexecutionfails="false">
+ <arg value="/c"/>
+ <arg value="tools\get-scala-commit-date.bat"/>
+ <arg value="-p"/>
+ </exec>
<!-- some default in case something went wrong getting the revision -->
<property name="git.commit.sha" value="unknown"/>
<property name="git.commit.date" value="unknown"/>