Add lib/* to CLASSPATH

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

1 files changed, 12 insertions, 7 deletions

diff --git a/build.sh b/build.sh
index 9978ad1d7..462c2b5de 100755
--- a/build.sh
+++ b/build.sh
@@ -5,15 +5,20 @@ if [ "$ANT_HOME" = "" ] ; then
 fi
 export ANT_HOME
 
-ADDL_CLASSPATH=$ANT_HOME/lib/ant.jar
+LOCALCLASSPATH=`echo $ANT_HOME/lib/*.jar | tr ' ' ':'`
 
 if [ "$CLASSPATH" != "" ] ; then
-  CLASSPATH=$CLASSPATH:$ADDL_CLASSPATH
-else
- CLASSPATH=$ADDL_CLASSPATH
+  LOCALCLASSPATH=$CLASSPATH:$LOCALCLASSPATH
 fi
-export CLASSPATH
 
-echo Building with classpath $CLASSPATH
+if test -f $JAVA_HOME/lib/tools.jar ; then
+  LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
+fi
+
+echo
+echo Building with classpath: $LOCALCLASSPATH
+echo
+
+chmod 0755 $ANT_HOME/bin/antRun
 
-java org.apache.tools.ant.Main -Dant.home=$ANT_HOME $*
+java -Dant.home=$ANT_HOME -classpath $LOCALCLASSPATH $ANT_OPTS org.apache.tools.ant.Main $*