Skip to content

Commit 642fd21

Browse files
committed
Merge pull request scala#685 from scalamacros/topic/antbatinvocations
fixes a bug with bat files invocation from ant
2 parents 8bc3352 + aa11b65 commit 642fd21

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

build.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,17 @@ INITIALISATION
304304
</condition>
305305

306306
<exec osfamily="unix" executable="tools/get-scala-commit-sha" outputproperty="git.commit.sha" failifexecutionfails="false" />
307-
<exec osfamily="windows" executable="tools/get-scala-commit-sha.bat" outputproperty="git.commit.sha" failifexecutionfails="false" />
307+
<exec osfamily="windows" executable="cmd.exe" outputproperty="git.commit.sha" failifexecutionfails="false">
308+
<arg value="/c"/>
309+
<arg value="tools\get-scala-commit-sha.bat"/>
310+
<arg value="-p"/>
311+
</exec>
308312
<exec osfamily="unix" executable="tools/get-scala-commit-date" outputproperty="git.commit.date" failifexecutionfails="false" />
309-
<exec osfamily="windows" executable="tools/get-scala-commit-date.bat" outputproperty="git.commit.date" failifexecutionfails="false" />
313+
<exec osfamily="windows" executable="cmd.exe" outputproperty="git.commit.date" failifexecutionfails="false">
314+
<arg value="/c"/>
315+
<arg value="tools\get-scala-commit-date.bat"/>
316+
<arg value="-p"/>
317+
</exec>
310318
<!-- some default in case something went wrong getting the revision -->
311319
<property name="git.commit.sha" value="unknown"/>
312320
<property name="git.commit.date" value="unknown"/>

0 commit comments

Comments
 (0)