rubys       01/03/03 12:16:27

  Modified:    proposal/gump gen.sh
               proposal/gump/stylesheet bash.xsl
  Log:
  Allow specification of command prefixes - useful for items like socksify
  or timeout programs.
  
  Revision  Changes    Path
  1.4       +8 -2      jakarta-alexandria/proposal/gump/gen.sh
  
  Index: gen.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/gen.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- gen.sh    2001/02/17 17:01:17     1.3
  +++ gen.sh    2001/03/03 20:16:27     1.4
  @@ -4,6 +4,12 @@
   export XALAN=/opt/xalan-j_2_0_0
   export CLASSPATH=$XALAN/bin/xerces.jar:$XALAN/bin/xalan.jar:$CLASSPATH
   
  +if test "$1" = "-cp"; then
  +  shift
  +  export CP="$1"
  +  shift
  +fi
  +
   test -n "$1" && export SOURCE=$1
   test -z "$1" && export SOURCE=`hostname -s`.xml
   
  @@ -34,7 +40,7 @@
   
   echo Generating update script
   test -n "$FAIL" || \
  -java org.apache.xalan.xslt.Process -text -in work/updatesite.xml -xsl 
stylesheet/bash.xsl -out work/update.sh || \
  +java org.apache.xalan.xslt.Process -text -in work/updatesite.xml -xsl 
stylesheet/bash.xsl -out work/update.sh -PARAM cmd-prefix "$CP" || \
   export FAIL=1
   
   # ********************************************************************
  @@ -51,7 +57,7 @@
   
   echo Generating build script
   test -n "$FAIL" || \
  -java org.apache.xalan.xslt.Process -EDUMP -text -in work/buildsite.xml -xsl 
stylesheet/bash.xsl -out work/build.sh || \
  +java org.apache.xalan.xslt.Process -EDUMP -text -in work/buildsite.xml -xsl 
stylesheet/bash.xsl -out work/build.sh -PARAM cmd-prefix "$CP" || \
   export FAIL=1
   
   # ********************************************************************
  
  
  
  1.7       +15 -2     jakarta-alexandria/proposal/gump/stylesheet/bash.xsl
  
  Index: bash.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/bash.xsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- bash.xsl  2001/02/22 16:17:41     1.6
  +++ bash.xsl  2001/03/03 20:16:27     1.7
  @@ -1,5 +1,6 @@
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
     <xsl:strip-space elements="*"/>
  +  <xsl:param name="cmd-prefix"/>
   
     <xsl:template name="select">
       <xsl:param name="usage"/>
  @@ -284,7 +285,13 @@
     <xsl:template match="ant">
   
       <xsl:text>if test "$STATUS" = "SUCCESS"; then \&#10;</xsl:text>
  -    <xsl:text>eval "java org.apache.tools.ant.Main</xsl:text>
  +    <xsl:text>eval </xsl:text>
  +    <xsl:if test="$cmd-prefix">
  +       <xsl:text>"</xsl:text>
  +       <xsl:value-of select="$cmd-prefix"/>
  +       <xsl:text>" </xsl:text>
  +    </xsl:if>
  +    <xsl:text>"java org.apache.tools.ant.Main</xsl:text>
   
       <xsl:if test="@buildfile">
         <xsl:text> -buildfile </xsl:text>
  @@ -469,7 +476,13 @@
   
       <xsl:text>eval "echo $CMD $OUT"&#10;</xsl:text>
       <xsl:text>eval "echo $OUT"&#10;</xsl:text>
  -    <xsl:text>eval "$CMD $OUT 2&gt;&amp;1" ||\&#10;</xsl:text>
  +    <xsl:text>eval </xsl:text>
  +    <xsl:if test="$cmd-prefix">
  +       <xsl:text>"</xsl:text>
  +       <xsl:value-of select="$cmd-prefix"/>
  +       <xsl:text>" </xsl:text>
  +    </xsl:if>
  +    <xsl:text>"$CMD $OUT 2&gt;&amp;1" ||\&#10;</xsl:text>
       <xsl:text>export STATUS=FAILED&#10;</xsl:text>
   
     </xsl:template>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to