conor 2003/01/24 06:51:46
Modified: src/script Tag: ANT_15_BRANCH ant ant.bat
Log:
Merge from CVS HEAD
Revision Changes Path
No revision
No revision
1.19.2.11 +5 -5 jakarta-ant/src/script/ant
Index: ant
===================================================================
RCS file: /home/cvs/jakarta-ant/src/script/ant,v
retrieving revision 1.19.2.10
retrieving revision 1.19.2.11
diff -u -w -u -r1.19.2.10 -r1.19.2.11
--- ant 30 Sep 2002 12:19:09 -0000 1.19.2.10
+++ ant 24 Jan 2003 14:51:46 -0000 1.19.2.11
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+# Copyright (c) 2001-2003 The Apache Software Foundation. All rights
# reserved.
# load system-wide ant configuration
@@ -178,15 +178,15 @@
if [ -n "$CYGHOME" ]; then
if [ -n "$JIKESPATH" ]; then
JIKESPATH=`cygpath --path --windows "$JIKESPATH"`
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}"
-Djikes.class.path="$JIKESPATH" -Dcygwin.user.home="$CYGHOME" $ANT_OPTS
org.apache.tools.ant.Main $ANT_ARGS "$@"
+ "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH"
-Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH"
-Dcygwin.user.home="$CYGHOME" org.apache.tools.ant.Main $ANT_ARGS "$@"
else
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}"
-Dcygwin.user.home="$CYGHOME" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
+ "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH"
-Dant.home="${ANT_HOME}" -Dcygwin.user.home="$CYGHOME"
org.apache.tools.ant.Main $ANT_ARGS "$@"
fi
else
if [ -n "$JIKESPATH" ]; then
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}"
-Djikes.class.path="$JIKESPATH" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS
"$@"
+ "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH"
-Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH"
org.apache.tools.ant.Main $ANT_ARGS "$@"
else
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}"
$ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
+ "$JAVACMD" $ANT_OPTS -classpath "$LOCALCLASSPATH"
-Dant.home="${ANT_HOME}" org.apache.tools.ant.Main $ANT_ARGS "$@"
fi
fi
1.18.2.6 +3 -3 jakarta-ant/src/script/ant.bat
Index: ant.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/src/script/ant.bat,v
retrieving revision 1.18.2.5
retrieving revision 1.18.2.6
diff -u -w -u -r1.18.2.5 -r1.18.2.6
--- ant.bat 24 Oct 2002 08:15:04 -0000 1.18.2.5
+++ ant.bat 24 Jan 2003 14:51:46 -0000 1.18.2.6
@@ -1,6 +1,6 @@
@echo off
-REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+REM Copyright (c) 2001-2003 The Apache Software Foundation. All rights
REM reserved.
if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
@@ -77,11 +77,11 @@
if not "%JIKESPATH%"=="" goto runAntWithJikes
:runAnt
-"%_JAVACMD%" -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%"
%ANT_OPTS% org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%"
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS%
goto end
:runAntWithJikes
-"%_JAVACMD%" -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%"
"-Djikes.class.path=%JIKESPATH%" %ANT_OPTS% org.apache.tools.ant.Main
%ANT_ARGS% %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%"
"-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%"
org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS%
goto end
:end
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
