From b002eddf94ec3b320791999adbd905f99afc2884 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 17 Jan 2012 10:15:55 +0000
Subject: [PATCH] Fix OPENDJ-407: Upgrade version of Ant included in OpenDJ server sources
---
opends/ext/ant/bin/ant | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/opends/ext/ant/bin/ant b/opends/ext/ant/bin/ant
index bcc63c8..0dc84e0 100755
--- a/opends/ext/ant/bin/ant
+++ b/opends/ext/ant/bin/ant
@@ -80,6 +80,7 @@
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
+mingw=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
Darwin*) darwin=true
@@ -87,6 +88,7 @@
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
;;
+ MINGW*) mingw=true ;;
esac
if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
@@ -108,16 +110,23 @@
ANT_HOME=`dirname "$PRG"`/..
# make it fully qualified
- ANT_HOME=`cd "$ANT_HOME" && pwd`
+ ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd`
fi
-# For Cygwin, ensure paths are in UNIX format before anything is touched
+# For Cygwin and Mingw, ensure paths are in UNIX format before
+# anything is touched
if $cygwin ; then
[ -n "$ANT_HOME" ] &&
ANT_HOME=`cygpath --unix "$ANT_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
+if $mingw ; then
+ [ -n "$ANT_HOME" ] &&
+ ANT_HOME="`(cd "$ANT_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
# set ANT_LIB location
ANT_LIB="${ANT_HOME}/lib"
@@ -251,9 +260,9 @@
else
format=windows
fi
- ANT_HOME=`cygpath --$format "$ANT_HOME"`
+ [ -n "$ANT_HOME" ] && ANT_HOME=`cygpath --$format "$ANT_HOME"`
ANT_LIB=`cygpath --$format "$ANT_LIB"`
- JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
if [ -n "$CLASSPATH" ] ; then
@@ -319,8 +328,8 @@
ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
fi
fi
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
+ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\""
if $ant_exec_debug ; then
- echo $ant_exec_command
+ echo $ant_exec_command $ant_exec_args
fi
-eval $ant_exec_command
+eval $ant_exec_command "$ant_exec_args"
--
Gitblit v1.10.0