bodewig 00/09/05 07:42:46
Modified: . build.bat
src/bin ant.bat
Log:
Problems with the .bat files on Win98.
Submitted by: Glenn McAllister <[EMAIL PROTECTED]>
Revision Changes Path
1.12 +8 -3 jakarta-ant/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/build.bat,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.bat 2000/07/15 06:31:41 1.11
+++ build.bat 2000/09/05 14:42:43 1.12
@@ -6,11 +6,16 @@
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=
1.6 +6 -3 jakarta-ant/src/bin/ant.bat
Index: ant.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/src/bin/ant.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ant.bat 2000/08/06 10:19:15 1.5
+++ ant.bat 2000/09/05 14:42:45 1.6
@@ -37,11 +37,14 @@
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=
