From d1c81b1a62ed4ba76e27dfc92a63e80fb3ac6019 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Wed, 9 Jul 2003 13:14:51 +0000 Subject: [PATCH] Rollback - not tested yet git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274795 13f79535-47bb-0310-9956-ffa450edef68 --- src/script/ant.bat | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/script/ant.bat b/src/script/ant.bat index e5a0472b7..a828c8f5c 100755 --- a/src/script/ant.bat +++ b/src/script/ant.bat @@ -23,7 +23,7 @@ if ""%1""=="""" goto doneStart set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1 shift goto setupArgs -rem This label provides a place for the argument list loop to break out +rem This label provides a place for the argument list loop to break out rem and for NT handling to skip to. :doneStart @@ -55,11 +55,13 @@ goto end :checkJava set _JAVACMD=%JAVACMD% set LOCALCLASSPATH=%CLASSPATH% +for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" %%i if "%JAVA_HOME%" == "" goto noJavaHome if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe if exist "%JAVA_HOME%\lib\tools.jar" set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%LOCALCLASSPATH% +if exist "%JAVA_HOME%\lib\classes.zip" set LOCALCLASSPATH=%JAVA_HOME%\lib\classes.zip;%LOCALCLASSPATH% goto checkJikes :noJavaHome @@ -75,11 +77,11 @@ echo. if not "%JIKESPATH%"=="" goto runAntWithJikes :runAnt -"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% +"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS% goto end :runAntWithJikes -"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% +"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS% goto end :end