User: user57 Date: 01/08/01 20:45:33 Modified: planet57/buildmagic/bin Tag: jboss_buildmagic build Removed: planet57/buildmagic/bin Tag: jboss_buildmagic ant ant.bat antRun antRun.bat lcp.bat runant.pl Log: o testsuite can now run junit tasks again. o classpath usage has been expaned to allow standard ant v1.3 clients to work against the build files. o optional tasks is not assumed to be in the path anymore o reverting to the standard xml parser that comes with ant to avoid any odd class loading problems that might occur. Revision Changes Path No revision No revision 1.1.2.2 +21 -36 tools/planet57/buildmagic/bin/Attic/build Index: build =================================================================== RCS file: /cvsroot/jboss/tools/planet57/buildmagic/bin/Attic/build,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- build 2001/07/29 04:57:41 1.1.2.1 +++ build 2001/08/02 03:45:33 1.1.2.2 @@ -23,7 +23,7 @@ ## ## ### ====================================================================== ### -# $Id: build,v 1.1.2.1 2001/07/29 04:57:41 user57 Exp $ +# $Id: build,v 1.1.2.2 2001/08/02 03:45:33 user57 Exp $ PROGNAME=`basename $0` DIRNAME=`dirname $0` @@ -32,9 +32,6 @@ # the default search path for buildmagic/ant ANT_SEARCH_PATH="\ - tools/planet57/buildmagic \ - tools/buildmagic \ - buildmagic \ tools/apache/ant \ tools/ant \ ant" @@ -87,39 +84,27 @@ # if there is a build config file. then source it maybe_source "$DIRNAME/build.conf" "$HOME/.build.conf" - # try our best to find ANT - if [ "x$ANT" = "x" ]; then - found="" - - if [ "x$ANT_HOME" != "x" ]; then - ANT="$d/bin/ant" - if [ -x "$ANT" ]; then - found="true" - fi - else - # try the search path - ANT=`search $ANT_SEARCH_PATH` - target="build" - _cwd=`pwd` - - while [ "x$ANT" = "x" ] && [ "$cwd" != "$ROOT" ]; do - cd .. - cwd=`pwd` - ANT=`search $ANT_SEARCH_PATH` - done - - # make sure we get back - cd $_cwd - - if [ "$cwd" != "$ROOT" ]; then - found="true" - fi - fi + # try the search path + ANT=`search $ANT_SEARCH_PATH` + target="build" + _cwd=`pwd` + + while [ "x$ANT" = "x" ] && [ "$cwd" != "$ROOT" ]; do + cd .. + cwd=`pwd` + ANT=`search $ANT_SEARCH_PATH` + done - # complain if we did not find anything - if [ "$found" != "true" ]; then - die "Could not locate Ant; check \$ANT or \$ANT_HOME." - fi + # make sure we get back + cd $_cwd + + if [ "$cwd" != "$ROOT" ]; then + found="true" + fi + + # complain if we did not find anything + if [ "$found" != "true" ]; then + die "Could not locate Ant; check \$ANT or \$ANT_HOME." fi # make sure we have one _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development