diff --git a/WHATSNEW b/WHATSNEW index 30df9545f..19490679d 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -371,6 +371,9 @@ Fixed bugs: * Jar task was not including manifest files when duplicate="preserve" was chosen. Bugzilla 32802. +* ant.bat was missing runAntNoClasspath label for goto. + Bugzilla 34510 + * Classpath was treated in the same way as -lib options. Bugzilla 28046. * Manual page for cvsversion contained incorrect attributes and did not diff --git a/src/script/ant.bat b/src/script/ant.bat index d78839092..e2dafabdd 100755 --- a/src/script/ant.bat +++ b/src/script/ant.bat @@ -1,6 +1,6 @@ @echo off -REM Copyright 2001,2004 The Apache Software Foundation +REM Copyright 2001,2004-2005 The Apache Software Foundation REM REM Licensed under the Apache License, Version 2.0 (the "License"); REM you may not use this file except in compliance with the License. @@ -94,6 +94,10 @@ if not "%CLASSPATH%"=="" goto runAntWithClasspath "%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% goto end +:runAntNoClasspath +"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% +goto end + :runAntWithClasspath "%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS% goto end