summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorConor MacNeill <conor@apache.org>2003-07-09 13:12:25 +0000
committerConor MacNeill <conor@apache.org>2003-07-09 13:12:25 +0000
commitfb9fb495e7a5565edff6d7074b3e85189fdcdf66 (patch)
treeca776541cef178e9ba0b50d1acd41da9027a46aa /src/script
parentf3939727d9e11188d266beed7e9dfa8e2fd0bc9a (diff)
downloadant-fb9fb495e7a5565edff6d7074b3e85189fdcdf66.tar.gz
Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274794 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/script')
-rwxr-xr-xsrc/script/ant.bat8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/script/ant.bat b/src/script/ant.bat
index a828c8f5c..e5a0472b7 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,13 +55,11 @@ 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
@@ -77,11 +75,11 @@ echo.
if not "%JIKESPATH%"=="" goto runAntWithJikes
:runAnt
-"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %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.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+"%_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%
goto end
:end