User: user57
Date: 01/07/28 19:13:40
Modified:.Tag: jboss_buildmagic build.sh build.xml config.xml
Log:
o updated all modules to use new simplified configuration
Revision ChangesPath
No revision
No revision
1.1.2.2 +45 -15jbossmx/Attic/build.sh
Index: build.sh
===
RCS file: /cvsroot/jboss/jbossmx/Attic/build.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- build.sh 2001/07/28 01:59:11 1.1.2.1
+++ build.sh 2001/07/29 02:13:39 1.1.2.2
@@ -23,14 +23,21 @@
## ##
### == ###
-# $Id: build.sh,v 1.1.2.1 2001/07/28 01:59:11 user57 Exp $
+# $Id: build.sh,v 1.1.2.2 2001/07/29 02:13:39 user57 Exp $
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
GREP=grep
+ROOT=/
-# the default search path for ant
-ANT_SEARCH_PATH=../tools/apache/ant ../tools/ant ./tools/apache/ant ./tools/ant
./ant
+# the default search path for buildmagic/ant
+ANT_SEARCH_PATH=\
+tools/planet57/buildmagic \
+tools/buildmagic \
+buildmagic \
+tools/apache/ant \
+tools/ant \
+ant
# the default build file name
ANT_BUILD_FILE=build.xml
@@ -60,6 +67,19 @@
done
}
+search() {
+search=$*
+for d in $search; do
+ ANT_HOME=`pwd`/$d
+ ANT=$ANT_HOME/bin/ant
+ if [ -x $ANT ]; then
+ # found one
+ echo $ANT
+ break
+ fi
+done
+}
+
#
# Main function.
#
@@ -69,22 +89,32 @@
# try our best to find ANT
if [ x$ANT = x ]; then
- if [ x$ANT_HOME = x ]; then
- search=$ANT_SEARCH_PATH
- else
- search=$ANT_HOME
- fi
-
found=
- for d in $search; do
- ANT_HOME=$d
+
+ if [ x$ANT_HOME != x ]; then
ANT=$d/bin/ant
if [ -x $ANT ]; then
- # found one
found=true
- break
fi
- done
+ 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
# complain if we did not find anything
if [ $found != true ]; then
@@ -105,7 +135,7 @@
fi
fi
-export ANT
+export ANT ANT_HOME
exec $ANT $ANT_OPTIONS $@
}
1.1.2.2 +182 -146 jbossmx/Attic/build.xml
Index: build.xml
===
RCS file: /cvsroot/jboss/jbossmx/Attic/build.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- build.xml 2001/07/28 01:59:11 1.1.2.1
+++ build.xml 2001/07/29 02:13:39 1.1.2.2
@@ -9,25 +9,8 @@
!-- See terms of license at http://www.gnu.org. --
!----
!-- == --
-!----
-!-- Configuration Files (in order of precedence): --
-!----
-!--${module.root}/build.xml* (this file) --
-!--${project.config}/override.properties --
-!--${module.root}/override.properties --
-!--${user.home}/.buildmagic.properties --
-!--${user.home}/.ant.properties--
-!--${project.config}/local.properties --
-!--${module.root}/local.properties --
-!--${project.config}/config.properties --
-!--${module.root}/config.properties--
-!--${module.root}/config.xml* --
-!----
-!--* Required --
-!----
-!-- == --
-!--
