bodewig 2002/10/24 01:15:52 Modified: src/script ant.bat Log: 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 <shorntolley at yahoo.co.uk> Revision Changes Path 1.23 +3 -2 jakarta-ant/src/script/ant.bat Index: ant.bat =================================================================== RCS file: /home/cvs/jakarta-ant/src/script/ant.bat,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ant.bat 8 Oct 2002 08:11:39 -0000 1.22 +++ ant.bat 24 Oct 2002 08:15:52 -0000 1.23 @@ -53,18 +53,19 @@ 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
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>