From: Adam Di Carlo Date: Thu, 19 Dec 2002 22:10:17 +0000 (+0000) Subject: identify and split out common shell functions for finding jaxp, X-Git-Tag: release/1.79.1~6^2~5054 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3156c1c5c758f1af35be25845105d405c387855b;p=docbook-dsssl identify and split out common shell functions for finding jaxp, xerces, and the resolver --- diff --git a/cvstools/common-functions.sh b/cvstools/common-functions.sh new file mode 100644 index 000000000..bdc6174bd --- /dev/null +++ b/cvstools/common-functions.sh @@ -0,0 +1,46 @@ +findxerces () { + if [ ! "$XERCES" ]; then + for path in "/projects/apache/xml-xerces/java/build/classes" \ + "/usr/local/share/java/xerces.jar" \ + "/usr/local/java/xerces.jar" \ + "/usr/share/java/xerces.jar"; do + if [ -f "$path" -o -d "$path" ]; then + XERCES="$path" + break + fi + done + fi + echo $XERCES +} + +findjaxp () { + if [ ! "$JAXP" ]; then + for path in "/usr/local/share/java/jaxp.jar" \ + "/usr/local/java/jaxp.jar" \ + "/usr/local/jaxp-1.1/jaxp.jar" \ + "/usr/local/share/java/jaxp-1.1/jaxp.jar" \ + "/usr/share/java/jaxp.jar" \ + "/usr/share/java/xercesImpl.jar"; do + if [ -f "$path" -o -d "$path" ]; then + JAXP="$path" + break + fi + done + fi + echo $JAXP +} + +findresolver () { + if [ ! "$RESOLVER" ]; then + for path in "/projects/apache/xml-commons/java/build/classes" \ + "/projects/sun/resolver/.classes" \ + "/usr/share/java/sun-resolver.jar"; do + if [ -f "$path" -o -d "$path" ]; then + RESOLVER="$path" + echo found $path 1>&2 + break + fi + done + fi + echo $RESOLVER +} diff --git a/cvstools/saxon b/cvstools/saxon index 1be653d77..7e07d1884 100755 --- a/cvstools/saxon +++ b/cvstools/saxon @@ -10,16 +10,19 @@ DONE=0 VERSION=652 EXTVERSION=643 DEBUG=0 -JAR=0 XARG="" YARG="" RARG="" MEMORY="" QUIET=0 + +MYDIR=`dirname $0` +. $MYDIR/common-functions.sh + # identify the directory for DocBook XSL for dir in "/sourceforge/docbook/xsl" \ - `dirname $0/../xsl` \ + "$MYDIR/xsl" \ "/usr/share/sgml/docbook/stylesheet/xsl/nwalsh" ; do if [ -d "$dir" ]; then DOCBOOKXSL="$dir" @@ -32,9 +35,6 @@ while [ "$DONE" = "0" ]; do -d) DEBUG=1; shift; ;; - -j) JAR=1; - shift; - ;; -652) VERSION=652; shift; ;; @@ -129,21 +129,20 @@ if [ ! -f "$SAXON" ]; then echo "warning: cannot locate Saxon JAR file" 1>&2 fi - ## ## DocBook extensions ## -if [ "$JAR" = "1" ]; then - NDWEXT="$DOCBOOKXSL/extensions/saxon$EXTVERSION.jar" - - if [ ! -f "$NDWEXT" ]; then - echo "warning: cannot locate DocBook XSL Saxon extensions ($NDWEXT)" 1>&2 - fi -else - NDWEXT="$DOCBOOKXSL/extensions/saxon$EXTVERSION/.classes"; - - if [ ! -d "$NDWEXT" ]; then - echo "warning: cannot locate DocBook XSL Saxon extensions ($NDWEXT)" 1>&2 +if [ ! "$NDWEXT" ]; then + for ext in "$DOCBOOKXSL/extensions/saxon$EXTVERSION/.classes" \ + "$DOCBOOKXSL/extensions/saxon$EXTVERSION.jar" \ + "/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/extensions/saxon$EXTVERSION.jar" ; do + if [ -d $ext -o -f $ext ]; then + NDWEXT=$ext; + break + fi + done + if [ ! "$NDWEXT" ]; then + echo "warning: cannot locate DocBook XSL Saxon extensions" 1>&2 fi fi @@ -163,34 +162,16 @@ fi ## ## locate Xerces classpath ## -if [ ! "$XERCES" ]; then - for path in "/projects/apache/xml-xerces/java/build/classes" \ - "/usr/local/share/java/xerces.jar" \ - "/usr/local/java/xerces.jar" \ - "/usr/share/java/xerces.jar"; do - if [ -f "$path" -o -d "$path" ]; then - XERCES="$path" - fi - done -fi +XERCES=`findxerces` if [ ! "$XERCES" ]; then echo "warning: cannot locate Xerces (xerces.jar)" 1>&2 fi + ## ## locate JAXP classpath ## -if [ ! "$JAXP" ]; then - for path in "/usr/local/share/java/jaxp.jar" \ - "/usr/local/java/jaxp.jar" \ - "/usr/local/jaxp-1.1/jaxp.jar" \ - "/usr/local/share/java/jaxp-1.1/jaxp.jar" \ - "/usr/share/java/jaxp.jar"; do - if [ -f "$path" -o -d "$path" ]; then - JAXP="$path" - fi - done -fi +JAXP=`findjaxp` if [ ! "$JAXP" ]; then echo "warning: cannot locate JAXP (jaxp.jar)" 1>&2 fi @@ -207,7 +188,7 @@ for path in $RESOLVER \ fi done if [ -f "$RESOLVER" -o -d "$RESOLVER" ]; then - # use the sun resolver + # use the apache resolver if [ ! "$XARG" ]; then XARG="-x org.apache.xml.resolver.tools.ResolvingXMLReader" fi @@ -244,10 +225,3 @@ exec java $MEMORY $FOO \ -Djavax.xml.transform.TransformerFactory=$TRANSFACTORY \ com.icl.saxon.StyleSheet \ $XARG $YARG $RARG $OUTPUT $XMLSRC $XMLSTY "$@" - -if [ $? != 0 ]; then - echo "" - echo FAILED - echo "" - exit 1 -fi diff --git a/cvstools/xjparse b/cvstools/xjparse index 4b281c0bb..f102988e6 100755 --- a/cvstools/xjparse +++ b/cvstools/xjparse @@ -1,45 +1,29 @@ #!/bin/bash -# This shell script will definitely need to be hacked to run on your system! # # Usage: xjparse [opts] src.xml # -for path in $RESOLVER \ - "/projects/apache/xml-commons/java/build/classes" \ - "/projects/sun/resolver/.classes" ; do - if [ -f "$path" -o -d "$path" ]; then - RESOLVER="$path" - break - fi -done +MYDIR=`dirname $0` +. $MYDIR/common-functions.sh + + +JAXP=`findjaxp` +XERCES=`findxerces` +RESOLVER=`findresolver` if [ ! "$RESOLVER" ]; then - echo "cannot find sun/resolver classes" 1>&2 + echo "cannot find resolver classes" 1>&2 exit 1 fi - -for path in "/usr/local/jaxp-1.1/jaxp.jar" \ - "/usr/local/java/jaxp-1.1/jaxp.jar" \ - "/usr/local/share/java/jaxp-1.1/jaxp.jar" \ - "/usr/share/java/jaxp.jar"; do - if [ -f "$path" -o -d "$path" ]; then - JAXP="$path" - break - fi -done - -XERCES="${XERCES:-/projects/apache/xml-xerces/java/build/classes}:" +if [ ${RESOLVER/sun/} != ${RESOLVER} ]; then + # guess this is the sun resolver + XREAD=com.sun.resolver.apps.xread +else + # guess this is the Apache resolver + XREAD=org.apache.xml.resolver.apps.xread +fi CLASSPATH=$JAXP:$RESOLVER:$XERCES:$CLASSPATH -#echo $CLASSPATH - -java -cp $CLASSPATH \ - org.apache.xml.resolver.apps.xread $* +exec java -cp $CLASSPATH $XREAD $* -if [ $? != 0 ]; then - echo "" - echo FAILED - echo "" - exit 1 -fi