ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sbaill...@apache.org
Subject cvs commit: jakarta-ant/src/script ant.bat
Date Thu, 22 Aug 2002 19:25:06 GMT
sbailliez    2002/08/22 12:25:06

  Modified:    src/script Tag: ANT_15_BRANCH ant.bat
  Log:
  More batch hacking. JAVACMD was reset each time and was jumping right off without
  appending tools.jar
  
  Reported by Brian DeWeese <brd1_reuters@yahoo.com>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.18.2.2  +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.18.2.1
  retrieving revision 1.18.2.2
  diff -u -r1.18.2.1 -r1.18.2.2
  --- ant.bat	19 Aug 2002 17:55:13 -0000	1.18.2.1
  +++ ant.bat	22 Aug 2002 19:25:06 -0000	1.18.2.2
  @@ -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:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message