From e758ff801eef61a4ab2952184268d76d5d33264e Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 24 Oct 2002 08:15:52 +0000 Subject: [PATCH] re-add support for JAVACMD environment variable to ant.bat which has been lost in revision 1.19 of that file. Reported by: Shorn Tolley git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273459 13f79535-47bb-0310-9956-ffa450edef68 --- src/script/ant.bat | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/script/ant.bat b/src/script/ant.bat index 41d8b9f65..31cbc3455 100755 --- a/src/script/ant.bat +++ b/src/script/ant.bat @@ -53,18 +53,19 @@ echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOM 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 -set _JAVACMD=%JAVA_HOME%\bin\java.exe +if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe if exist "%JAVA_HOME%\lib\tools.jar" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\tools.jar" if exist "%JAVA_HOME%\lib\classes.zip" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\classes.zip" goto checkJikes :noJavaHome -set _JAVACMD=java.exe +if "%_JAVACMD%" == "" set _JAVACMD=java.exe echo. echo Warning: JAVA_HOME environment variable is not set. echo If build fails because sun.* classes could not be found