ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@locus.apache.org
Subject cvs commit: jakarta-ant/src/bin ant.bat
Date Tue, 05 Dec 2000 13:30:29 GMT
conor       00/12/05 05:30:28

  Modified:    src/bin  ant.bat
  Log:
  Bring ant.bat into line with changes made to ant.sh by Jon. Specifically
  invoke the java.exe from JAVA_HOME/bin if JAVA_HOME is set and JAVACMD is
  not.
  
  Also make sure the user's %JAVACMD% value is not altered.
  
  Revision  Changes    Path
  1.10      +5 -4      jakarta-ant/src/bin/ant.bat
  
  Index: ant.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/bin/ant.bat,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ant.bat	2000/12/05 10:08:57	1.9
  +++ ant.bat	2000/12/05 13:30:28	1.10
  @@ -8,7 +8,7 @@
   set ANT_CMD_LINE_ARGS=
   
   :setupArgs
  -if %1a==a goto doneArgs
  +if "%1"=="" goto doneArgs
   set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
   shift
   goto setupArgs
  @@ -36,17 +36,18 @@
   goto end
   
   :checkJava
  -if "%JAVACMD%" == "" set JAVACMD=java
  -
  +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 "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
   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
  +if "%_JAVACMD%" == "" set _JAVACMD=java
   echo.
   echo Warning: JAVA_HOME environment variable is not set.
   echo   If build fails because sun.* classes could not be found
  @@ -58,7 +59,7 @@
   if not "%JIKESPATH%" == "" goto runAntWithJikes
   
   :runAnt
  -%JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main
%ANT_CMD_LINE_ARGS%
  +%_JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main
%ANT_CMD_LINE_ARGS%
   goto end
   
   :runAntWithJikes
  
  
  

Mime
View raw message