diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-08 14:41:02 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-08 14:41:02 -0700 |
| commit | 642fd210c5a573ff277686c9462dccacf2d39403 (patch) | |
| tree | 5a8ad0c2ae7ab6025737a588adb64e15dcef93db | |
| parent | 8bc3352573bb8cd7e993608697e02f1fefd50ec1 (diff) | |
| parent | aa11b656e1f398cb3e66cb0d386f3723d0aa46f9 (diff) | |
| download | scala-642fd210c5a573ff277686c9462dccacf2d39403.tar.gz scala-642fd210c5a573ff277686c9462dccacf2d39403.tar.bz2 scala-642fd210c5a573ff277686c9462dccacf2d39403.zip | |
Merge pull request #685 from scalamacros/topic/antbatinvocations
fixes a bug with bat files invocation from ant
| -rw-r--r-- | build.xml | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -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"/> |