User: user57
Date: 01/08/27 21:53:07
Modified: . build.sh
Log:
o docbook files have been moved to thirdparty
o xalanj1compat.jar does not appear to be needed anymore
o updated build.sh to set ANT_HOME & support using xerces via JAXP="xerces"
o added xerces.jar (2.0.0 b2) & batik.jar for fop (still doesn't work)
o moved stylesheets from src/docs to src/stylesheets
o setup compile tasks to make use of property filtering
o changed printable-html to html-printable & html to html-default
Revision Changes Path
1.6 +50 -40 admin/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/jboss/admin/build.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.sh 2001/08/28 00:55:52 1.5
+++ build.sh 2001/08/28 04:53:07 1.6
@@ -8,7 +8,7 @@
## ##
### ====================================================================== ###
-# $Id: build.sh,v 1.5 2001/08/28 00:55:52 user57 Exp $
+# $Id: build.sh,v 1.6 2001/08/28 04:53:07 user57 Exp $
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
@@ -28,13 +28,12 @@
# the default arguments
ANT_OPTIONS="-find $ANT_BUILD_FILE"
-# don't check versions (too slow)
-ANT_VERSION=""
+# the jaxp parser to use
+if [ "x$JAXP" = "x" ]; then
+ # Default to crimson
+ JAXP="crimson"
+fi
-# specify the jaxp parsers to use
-JAXP_DOM_FACTORY="org.apache.crimson.jaxp.DocumentBuilderFactoryImpl"
-JAXP_SAX_FACTORY="org.apache.crimson.jaxp.SAXParserFactoryImpl"
-
#
# Helper to complain.
#
@@ -61,7 +60,7 @@
ANT="$ANT_HOME/bin/ant"
if [ -x "$ANT" ]; then
# found one
- echo $ANT
+ echo $ANT_HOME
break
fi
done
@@ -75,52 +74,63 @@
maybe_source "$DIRNAME/build.conf" "$HOME/.build.conf"
# 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
+ ANT_HOME=`search $ANT_SEARCH_PATH`
- # make sure we get back
- cd $_cwd
+ # try looking up to root
+ if [ "x$ANT_HOME" = "x" ]; then
+ target="build"
+ _cwd=`pwd`
+
+ while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do
+ cd ..
+ cwd=`pwd`
+ ANT_HOME=`search $ANT_SEARCH_PATH`
+ done
- if [ "$cwd" != "$ROOT" ]; then
- found="true"
- 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."
+ # complain if we did not find anything
+ if [ "$found" != "true" ]; then
+ die "Could not locate Ant; check \$ANT or \$ANT_HOME."
+ fi
fi
# make sure we have one
+ ANT=$ANT_HOME/bin/ant
if [ ! -x "$ANT" ]; then
die "Ant file is not executable: $ANT"
fi
- # perhaps check the version
- if [ "x$ANT_VERSION" != "x" ] && [ "x$ANT_VERSION_CHECK" != "x" ]; then
- result="`$ANT -version 2>&1 | $GREP $ANT_VERSION`x"
- if [ "$result" = "x" ]; then
- die "Ant version $ANT_VERSION is required to build."
- fi
+ # specify the jaxp parser impls to use
+ case "$JAXP" in
+ crimson)
+ JAXP_DOM_FACTORY="org.apache.crimson.jaxp.DocumentBuilderFactoryImpl"
+ JAXP_SAX_FACTORY="org.apache.crimson.jaxp.SAXParserFactoryImpl"
+ ;;
+
+ xerces)
+ JAXP_DOM_FACTORY="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"
+ JAXP_SAX_FACTORY="org.apache.xerces.jaxp.SAXParserFactoryImpl"
+ ;;
+ esac
+
+ if [ "x$JAXP_DOM_FACTORY" != "x" ]; then
+ ANT_OPTS="$ANT_OPTS
-Djavax.xml.parsers.DocumentBuilderFactory=$JAXP_DOM_FACTORY"
+ fi
+ if [ "x$JAXP_SAX_FACTORY" != "x" ]; then
+ ANT_OPTS="$ANT_OPTS -Djavax.xml.parsers.SAXParserFactory=$JAXP_SAX_FACTORY"
fi
- # Specify the JAXP parser impls to use
- ANT_OPTS="$ANT_OPTS
-Djavax.xml.parsers.DocumentBuilderFactory=$JAXP_DOM_FACTORY"
- ANT_OPTS="$ANT_OPTS -Djavax.xml.parsers.SAXParserFactory=$JAXP_SAX_FACTORY"
- export ANT_OPTS
-
- # change to the directory where the script lives so folks do not have
- # to be in the same dir to run the build without specifying the build
- # file.
+ # change to the directory where the script lives so users are not forced
+ # to be in the same directory as build.xml
cd $DIRNAME
- export ANT ANT_HOME
+ export ANT ANT_HOME ANT_OPTS
exec $ANT $ANT_OPTIONS "$@"
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
