diff options
| author | Nicola Ken Barozzi <nicolaken@apache.org> | 2002-04-28 21:12:06 +0000 |
|---|---|---|
| committer | Nicola Ken Barozzi <nicolaken@apache.org> | 2002-04-28 21:12:06 +0000 |
| commit | 386d0a8a669c52ebc2cadea1e87f70f0a72cad6f (patch) | |
| tree | 0972a24027dd5e98c7ef05057fc5ba141185af97 | |
| parent | 13d10c73c432b9759405cc451a16b7d794439355 (diff) | |
| download | poi-386d0a8a669c52ebc2cadea1e87f70f0a72cad6f.tar.gz poi-386d0a8a669c52ebc2cadea1e87f70f0a72cad6f.zip | |
Updated Ant scripts to latest versions with numerous fixes.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352542 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | tools/antipede/bin/ant | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tools/antipede/bin/ant b/tools/antipede/bin/ant index b79123dfe9..94d5a7bfc0 100644 --- a/tools/antipede/bin/ant +++ b/tools/antipede/bin/ant @@ -85,12 +85,12 @@ if [ -n "$CLASSPATH" ] ; then 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 @@ 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 |