nicolaken 02/04/28 14:12:06
Modified: tools/antipede/bin ant
Log:
Updated Ant scripts to latest versions with numerous fixes.
Revision Changes Path
1.4 +6 -7 jakarta-poi/tools/antipede/bin/ant
Index: ant
===================================================================
RCS file: /home/cvs/jakarta-poi/tools/antipede/bin/ant,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ant 22 Apr 2002 10:59:21 -0000 1.3
+++ ant 28 Apr 2002 21:12:06 -0000 1.4
@@ -85,12 +85,12 @@
fi
# add in the dependency .jar files
-DIRLIBS=${ANT_HOME}/lib/*.jar
-for i in ${DIRLIBS}
+DIRLIBS="${ANT_HOME}"/lib
+for i in "${DIRLIBS}"/*.jar
do
# if the directory is empty, then it will return the input string
# this is stupid, so case for it
- if [ "$i" != "${DIRLIBS}" ] ; then
+ if [ "$i" != "${DIRLIBS}/*.jar" ] ; then
if [ -z "$LOCALCLASSPATH" ] ; then
LOCALCLASSPATH=$i
else
@@ -128,11 +128,10 @@
# 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
