Broken ant.bat (at least on windows 2000)

[Martin van den Bemt <mv...@mvdb.com>]

Hi,

Tried to build the latest ant (as of 16-1), but nothing worked.
java.exe was complaining about the commandline parameters.
What happened :
I type build -Dproperty=value
Windows sees this : -Dproperty as %1 and value as %2
So I had to put and = between the values
The last option will just be entered without an is (checks the value of %2
and if empty it will call :finishArgs and just put the first value there
e.g. dist).

I don't If I broke anything else, but it worked for me. I didn't change /
test the jikes compiler options, because I don't use jikes.

I don't know if someone can check every scenario with this, or give me an
example of what to do to check a scenario. (don't if this is a windows 2000
specific thing, or also on other windows versions, because I only use
windows 2000 at the moment).

Sorry about the echos, but I used them to see the output to java.exe and
what the behaviour is windows 2000 with cmd line arguments..

Have fun..

Mvgr,
Martin van den Bemt


The is the diff :

Index: ant.bat
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/bin/ant.bat,v
retrieving revision 1.13
diff -r1.13 ant.bat
25c25,27
< set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
---
> if "%2"=="" goto finishArgs
> set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1=%2
> shift
26a29
> echo command line : %ANT_CMD_LINE_ARGS%
28a32,34
> :finishArgs
> set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
>
53c59
< set LOCALCLASSPATH="%CLASSPATH%"
---
> set LOCALCLASSPATH=%CLASSPATH%
76c82,84
< %_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" %ANT_OPTS%
org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
---
> echo %_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home=%ANT_HOME%
%ANT_OPTS% %ANT_CMD_LINE_ARGS% org.apache.tools.ant.Main
> %_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home=%ANT_HOME% %ANT_OPTS%
org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
> rem %_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%"
%ANT_OPTS% %ANT_CMD_LINE_ARGS% org.apache.tools.ant.Main