sbailliez 2002/08/22 12:23:33
Modified: src/script ant.bat
Log:
More batch hacking. JAVACMD was reset each time and was jumping right off
without
appending tools.jar
Reported by Brian DeWeese <[EMAIL PROTECTED]>
Revision Changes Path
1.20 +12 -11 jakarta-ant/src/script/ant.bat
Index: ant.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/src/script/ant.bat,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ant.bat 16 Aug 2002 15:31:45 -0000 1.19
+++ ant.bat 22 Aug 2002 19:23:33 -0000 1.20
@@ -56,20 +56,21 @@
set LOCALCLASSPATH=%CLASSPATH%
for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" %%i
-if exist "%JAVA_HOME%\bin\java.exe" goto gotJava
-echo
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+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
+echo.
echo Warning: JAVA_HOME environment variable is not set.
echo If build fails because sun.* classes could not be found
echo you will need to set the JAVA_HOME environment variable
echo to the installation directory of java.
-echo
-
-:gotJava
-set _JAVACMD=%JAVA_HOME%\bin\java.exe
-if exist "%_JAVACMD%" goto checkJikes
-set _JAVACMD=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
+echo.
:checkJikes
if not "%JIKESPATH%"=="" goto runAntWithJikes
@@ -87,7 +88,7 @@
set _JAVACMD=
set ANT_CMD_LINE_ARGS=
-if not "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="Windows_NT" @endlocal
:mainEnd
if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
