conor 00/08/05 08:30:23
Modified: src/bin ant ant.bat
Log:
Add JIKESPATH and JAVA_HOME warning to the Windows batch files
Revision Changes Path
1.6 +1 -1 jakarta-ant/src/bin/ant
Index: ant
===================================================================
RCS file: /home/cvs/jakarta-ant/src/bin/ant,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ant 2000/07/31 08:24:46 1.5
+++ ant 2000/08/05 15:30:19 1.6
@@ -52,7 +52,7 @@
LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
fi
else
- echo "Warning: JAVA_HOME environment variable not set."
+ 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."
1.4 +13 -1 jakarta-ant/src/bin/ant.bat
Index: ant.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/src/bin/ant.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ant.bat 2000/07/12 15:54:16 1.3
+++ ant.bat 2000/08/05 15:30:20 1.4
@@ -23,9 +23,21 @@
set LOCALCLASSPATH=%CLASSPATH%
for %%i in (%ANT_HOME%\lib\*.jar) do call %ANT_HOME%\bin\lcp.bat %%i
-if "%JAVA_HOME%" == "" goto runAnt
+if "%JAVA_HOME%" == "" goto noJavaHome
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
+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.
+
+:checkJikes
+if not "%JIKESPATH%" == "" set ANT_OPTS=%ANT_OPTS%
-Djikes.class.path=%JIKESPATH%
:runAnt
%JAVACMD% -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS%
org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
