Attach is a patch that handles $JIKESPATH if it has spaces and leaves
the jikes.class.path system property null when $JIKESPATH is undefined.
Patrick
--
________________________________________________________________
Patrick Luby Email: [EMAIL PROTECTED]
Sun Microsystems Phone: 408-276-7471
901 San Antonio Road, USCA14-303
Palo Alto, CA 94303-4900
________________________________________________________________
Index: src/script/ant
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/script/ant,v
retrieving revision 1.25
diff -u -r1.25 ant
--- src/script/ant 9 Aug 2002 07:57:05 -0000 1.25
+++ src/script/ant 9 Aug 2002 08:24:31 -0000
@@ -178,8 +178,20 @@
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+ ANT_OPTS="$ANT_OPTS -Dcygwin.user.home="`cygpath --path --windows "$HOME"`
CYGHOME=`cygpath --path --windows "$HOME"`
- exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}"
-Djikes.class.path="$JIKESPATH" $ANT_OPTS -Dcygwin.user.home="$CYGHOME"
org.apache.tools.ant.Main $ANT_ARGS "$@"
+fi
+
+if [ -n "$CYGHOME" ]; then
+ if [ -n "$JIKESPATH" ]; then
+ exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}"
-Djikes.class.path="$JIKESPATH" -Dcygwin.user.home="$CYGHOME" $ANT_OPTS
org.apache.tools.ant.Main $ANT_ARGS "$@"
+ else
+ exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}"
-Dcygwin.user.home="$CYGHOME" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
+ fi
else
- exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}"
-Djikes.class.path="$JIKESPATH" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS
"$@"
-fi
\ No newline at end of file
+ if [ -n "$JIKESPATH" ]; then
+ exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}"
-Djikes.class.path="$JIKESPATH" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS
"$@"
+ else
+ exec "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}"
$ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
+ fi
+fi
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
