New build procedure for Unix based systems

This is the update for the Unix based build scripts. The changes are the
following

Automatic bootstrapping if lib/ant.jar is mising or the bin files
are not present

Removed inclusion of the $HOME/.antrc in the bootstrap.sh although
it is still used in the ant shell script.

Lined up Windows and Unix scripts, including echo statements so it is easier
to make changes affecting both envionments in the future.

Added chmod calls to the install targets so the ant shell scripts are
executable.


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

1 files changed, 8 insertions, 20 deletions

diff --git a/build.sh b/build.sh
index 0217bb413..fc1828b6d 100755
--- a/build.sh
+++ b/build.sh
@@ -1,28 +1,16 @@
 #!/bin/sh
 
-if [ "$ANT_HOME" = "" ] ; then
-  ANT_HOME=`pwd`
-fi
+REALANTHOME=$ANT_HOME
+ANT_HOME=.
 export ANT_HOME
 
-LOCALCLASSPATH=`echo $ANT_HOME/lib/*.jar | tr ' ' ':'`
-
-if [ "$CLASSPATH" != "" ] ; then
-  LOCALCLASSPATH=$CLASSPATH:$LOCALCLASSPATH
-fi
-
-if test -f $JAVA_HOME/lib/tools.jar ; then
-  LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
-fi
+if test ! -f lib/ant.jar -o  ! -x bin/ant -o ! -x bin/antRun ; then
+  ./bootstrap.sh
+fi    
 
-if test -f $JAVA_HOME/lib/classes.zip ; then
-  LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
+if [ "$REALANTHOME" != "" ] ; then
+  ANT_INSTALL="-Dant.install $REALANTHOME"
 fi
 
-echo
-echo Building with classpath: $LOCALCLASSPATH
-echo
-
-chmod 0755 $ANT_HOME/bin/antRun
+bin/ant $ANT_INSTALL $*
 
-java -Dant.home=$ANT_HOME -classpath $LOCALCLASSPATH $ANT_OPTS org.apache.tools.ant.Main $*