ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From meta...@locus.apache.org
Subject cvs commit: jakarta-ant/src/antidote/bin antidote antidote.bat
Date Tue, 14 Nov 2000 18:47:52 GMT
metasim     00/11/14 10:47:52

  Modified:    src/antidote/bin antidote antidote.bat
  Log:
  Removed Ant specific resource checking.
  
  Revision  Changes    Path
  1.2       +1 -24     jakarta-ant/src/antidote/bin/antidote
  
  Index: antidote
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/antidote/bin/antidote,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- antidote	2000/11/14 17:21:22	1.1
  +++ antidote	2000/11/14 18:47:51	1.2
  @@ -43,29 +43,6 @@
     LOCALCLASSPATH=$CLASSPATH:$LOCALCLASSPATH
   fi
   
  -if [ "$JAVA_HOME" != "" ] ; then
  -  if test -f $JAVA_HOME/lib/tools.jar ; then
  -    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
  -  fi
   
  -  if test -f $JAVA_HOME/lib/classes.zip ; then
  -    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
  -  fi
  -else
  -  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."
  -fi
  -
  -# supply JIKESPATH to Ant as jikes.class.path
  -if [ "$JIKESPATH" != "" ] ; then
  -  if [ "$ANT_OPTS" != "" ] ; then
  -    ANT_OPTS="$ANT_OPTS -Djikes.class.path=$JIKESPATH"
  -  else
  -    ANT_OPTS=-Djikes.class.path=$JIKESPATH
  -  fi
  -fi
  -
  -$JAVACMD -classpath $LOCALCLASSPATH -Dant.home=${ANT_HOME} $ANT_OPTS org.apache.tools.ant.gui.Main
$@
  +$JAVACMD -classpath $LOCALCLASSPATH -Dant.home=${ANT_HOME} org.apache.tools.ant.gui.Main
$@
   
  
  
  
  1.2       +1 -24     jakarta-ant/src/antidote/bin/antidote.bat
  
  Index: antidote.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/antidote/bin/antidote.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- antidote.bat	2000/11/14 17:21:22	1.1
  +++ antidote.bat	2000/11/14 18:47:52	1.2
  @@ -36,31 +36,8 @@
   :checkJava
   if "%JAVACMD%" == "" set JAVACMD=java
   
  -set LOCALCLASSPATH="%CLASSPATH%"
  -for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"
  -
  -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%" == "" 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%" org.apache.tools.ant.gui.Main
%ANT_CMD_LINE_ARGS%
   goto end
  -
  -:runAntWithJikes
  -%JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" -Djikes.class.path=%JIKESPATH%
%ANT_OPTS% org.apache.tools.ant.gui.Main %ANT_CMD_LINE_ARGS%
   
   :end
   set LOCALCLASSPATH=
  
  
  

Mime
View raw message