Add cygpath handling of JIKESPATH (PR 6943).

Also remove superfluous if on ANT_OPTS setting.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272279 13f79535-47bb-0310-9956-ffa450edef68

src/script/ant

@@ -128,11 +128,10 @@ fi
 
 # supply JIKESPATH to Ant as jikes.class.path
 if [ -n "$JIKESPATH" ] ; then
-  if [ -n "$ANT_OPTS" ] ; then
-    ANT_OPTS="$ANT_OPTS -Djikes.class.path=$JIKESPATH"
-  else
-    ANT_OPTS=-Djikes.class.path=$JIKESPATH
+  if $cygwin ; then
+    JIKESPATH=`cygpath --path --windows "$JIKESPATH"`
   fi
+  ANT_OPTS="$ANT_OPTS -Djikes.class.path=$JIKESPATH"
 fi
 
 # For Cygwin, switch paths to Windows format before running java