From 7b4a065d23a56364788e30713faaa682e9060b2c Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Tue, 5 Sep 2000 14:42:45 +0000 Subject: [PATCH] Problems with the .bat files on Win98. Submitted by: Glenn McAllister git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267965 13f79535-47bb-0310-9956-ffa450edef68 --- build.bat | 11 ++++++++--- src/bin/ant.bat | 9 ++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build.bat b/build.bat index 9beea3cb3..9e0d5d901 100755 --- a/build.bat +++ b/build.bat @@ -6,11 +6,16 @@ if exist lib\ant.jar if exist bin\ant.bat if exist bin\lcp.bat if exist bin\antR call bootstrap.bat :runAnt -set ANT_INSTALL= -if not "%REALANTHOME%" == "" set ANT_INSTALL=-Dant.install %REALANTHOME% -call .\bin\ant.bat %ANT_INSTALL% %1 %2 %3 %4 %5 %6 %7 %8 %9 +if not "%REALANTHOME%" == "" goto install_ant +call .\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 +goto cleanup + +:install_ant +set ANT_INSTALL="-Dant.install%REALANTHOME%" +call .\bin\ant.bat -Dant.install=%REALANTHOME% %1 %2 %3 %4 %5 %6 %7 %8 %9 rem clean up +:cleanup set ANT_HOME=%REALANTHOME% set REALANTHOME= set ANT_INSTALL= diff --git a/src/bin/ant.bat b/src/bin/ant.bat index 069a2ef6b..9ab8f0843 100755 --- a/src/bin/ant.bat +++ b/src/bin/ant.bat @@ -37,11 +37,14 @@ echo to the installation directory of java. echo. :checkJikes -set ANT_OPTS_RUN=%ANT_OPTS% -if not "%JIKESPATH%" == "" set ANT_OPTS_RUN=%ANT_OPTS% -Djikes.class.path=%JIKESPATH% +if not "%JIKESPATH%" == "" goto runAntWithJikes :runAnt -%JAVACMD% -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS_RUN% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 +%JAVACMD% -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 +goto end + +:runAntWithJikes +%JAVACMD% -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" -Djikes.class.path=%JIKESPATH% %ANT_OPTS% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 :end set LOCALCLASSPATH=