Changeset 19748

Timestamp:

01/03/07 15:35:40 (2 years ago)

Author:

patrick

Message:

MFT [rev 19747]: Hack around yet another problem with running batch files

from Visual C++ 8.0. This problem may be specific to Visual
C++ 8.0 Express Edition, but the basic issue is that having
a label named "end" causes a lot of problems. This has not
been changed in Ant 1.7.0, so I do not know what to think
about this workaround—other than that it is lame.

Files:

• juggler/branches/2.0/external/ant/bin/ant.bat (modified) (3 diffs)

juggler/branches/2.0/external/ant/bin/ant.bat

@@ -73 +73 @@
-:noAntHome
-echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME.
-
+ant
-
-:checkJava
@@ -93 +93 @@
-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%
-
+ant
-
-: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%
-
+ant
-
-: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%
-
+ant
-
-:runAntWithJikes
@@ -109 +109 @@
-:runAntWithJikesNoClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-
+ant
-
-:runAntWithJikesAndClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%  -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
-
+ant
-
-
+ant
-set _JAVACMD=
-set ANT_CMD_LINE_ARGS=