From dcba4b34366cde2807fe472c6a67bd68cf8afec6 Mon Sep 17 00:00:00 2001
From: metasim <dev-null@apache.org>
Date: Tue, 14 Nov 2000 18:47:52 +0000
Subject: [PATCH] Removed Ant specific resource checking.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268182 13f79535-47bb-0310-9956-ffa450edef68
---
 src/antidote/bin/antidote     | 25 +------------------------
 src/antidote/bin/antidote.bat | 25 +------------------------
 2 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/src/antidote/bin/antidote b/src/antidote/bin/antidote
index 7c79de7aa..22e167a80 100755
--- a/src/antidote/bin/antidote
+++ b/src/antidote/bin/antidote
@@ -43,29 +43,6 @@ if [ "$CLASSPATH" != "" ] ; then
   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 $@
 
diff --git a/src/antidote/bin/antidote.bat b/src/antidote/bin/antidote.bat
index 0e6a6b2f2..6169b2ce2 100644
--- a/src/antidote/bin/antidote.bat
+++ b/src/antidote/bin/antidote.bat
@@ -36,32 +36,9 @@ goto end
 :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=
 set ANT_CMD_LINE_ARGS=