git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268182 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -43,29 +43,6 @@ if [ "$CLASSPATH" != "" ] ; then | |||||
| LOCALCLASSPATH=$CLASSPATH:$LOCALCLASSPATH | LOCALCLASSPATH=$CLASSPATH:$LOCALCLASSPATH | ||||
| fi | 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 $@ | |||||
| @@ -36,32 +36,9 @@ goto end | |||||
| :checkJava | :checkJava | ||||
| if "%JAVACMD%" == "" set JAVACMD=java | 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 | 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 | :end | ||||
| set LOCALCLASSPATH= | set LOCALCLASSPATH= | ||||
| set ANT_CMD_LINE_ARGS= | set ANT_CMD_LINE_ARGS= | ||||