rubys       01/03/03 19:32:13

  Modified:    proposal/gump gen.sh
               proposal/gump/stylesheet bash.xsl
  Log:
  First stab at cygwin support
  
  Revision  Changes    Path
  1.5       +14 -5     jakarta-alexandria/proposal/gump/gen.sh
  
  Index: gen.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/gen.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gen.sh    2001/03/03 20:16:27     1.4
  +++ gen.sh    2001/03/04 03:32:13     1.5
  @@ -2,7 +2,6 @@
   # export CLASSPATH=$JAXP/crimson.jar:$JAXP/jaxp.jar:$JAXP/xalan.jar:$CLASSPATH
   
   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
  @@ -11,8 +10,18 @@
   fi
   
   test -n "$1" && export SOURCE=$1
  -test -z "$1" && export SOURCE=`hostname -s`.xml
   
  +if test "$OSTYPE" = "cygwin32" -o "$OSTYPE" = "cygwin"; then
  +  test -z "$1" && export SOURCE=`hostname`.xml
  +
  +  export CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
  +  export CLASSPATH=$XALAN/bin/xerces.jar:$XALAN/bin/xalan.jar:$CLASSPATH
  +  export CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
  +else
  +  export CLASSPATH=$XALAN/bin/xerces.jar:$XALAN/bin/xalan.jar:$CLASSPATH
  +  test -z "$1" && export SOURCE=`hostname -s`.xml
  +fi
  +
   test -d work && rm -rf work
   mkdir work
   
  @@ -40,7 +49,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 -PARAM cmd-prefix "$CP" || \
  +java org.apache.xalan.xslt.Process -text -in work/updatesite.xml -xsl 
stylesheet/bash.xsl -out work/update.sh -PARAM cmd-prefix "$CP" -PARAM os-type 
"$OSTYPE" || \
   export FAIL=1
   
   # ********************************************************************
  @@ -57,7 +66,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 -PARAM cmd-prefix "$CP" || \
  +java org.apache.xalan.xslt.Process -EDUMP -text -in work/buildsite.xml -xsl 
stylesheet/bash.xsl -out work/build.sh -PARAM cmd-prefix "$CP" -PARAM os-type 
"$OSTYPE" || \
   export FAIL=1
   
   # ********************************************************************
  @@ -110,7 +119,7 @@
     echo Publishing
     cd work
     chmod +x *.sh
  -  ./puball.sh $SOURCE
  +  sh puball.sh $SOURCE
   fi
   
   test -z "$FAIL" || echo "*** FAILED ***"
  
  
  
  1.8       +27 -1     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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- bash.xsl  2001/03/03 20:16:27     1.7
  +++ bash.xsl  2001/03/04 03:32:13     1.8
  @@ -1,7 +1,20 @@
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
     <xsl:strip-space elements="*"/>
     <xsl:param name="cmd-prefix"/>
  +  <xsl:param name="os-type"/>
   
  +  <xsl:variable name="cygwin">
  +    <xsl:choose>
  +      <xsl:when test="$os-type='cygwinx'">1</xsl:when>
  +      <xsl:when test="$os-type='cygwin32'">1</xsl:when>
  +      <xsl:otherwise>0</xsl:otherwise>
  +    </xsl:choose>
  +  </xsl:variable>
  +
  +  <!-- =================================================================== -->
  +  <!--             parse command line option for project name              -->
  +  <!-- =================================================================== -->
  +
     <xsl:template name="select">
       <xsl:param name="usage"/>
   
  @@ -39,8 +52,15 @@
   
     <xsl:template match="build">
       <xsl:text>#/bin/sh&#10;</xsl:text>
  -    <xsl:text>export CP=$CLASSPATH&#10;</xsl:text>
   
  +    <xsl:if test="$cygwin=1">
  +      <xsl:text>export CP=`cygpath --path --unix "$CLASSPATH"`&#10;</xsl:text>
  +    </xsl:if>
  +
  +    <xsl:if test="$cygwin=0">
  +      <xsl:text>export CP=$CLASSPATH&#10;</xsl:text>
  +    </xsl:if>
  +
       <xsl:call-template name="select">
         <xsl:with-param name="usage">
           Usage: build all \| project [target...]
  @@ -285,6 +305,12 @@
     <xsl:template match="ant">
   
       <xsl:text>if test "$STATUS" = "SUCCESS"; then \&#10;</xsl:text>
  +
  +    <xsl:if test="$cygwin=1">
  +      <xsl:text>export CLASSPATH=</xsl:text>
  +      <xsl:text>`cygpath --path --windows "$CLASSPATH"`&#10;</xsl:text>
  +    </xsl:if>
  +
       <xsl:text>eval </xsl:text>
       <xsl:if test="$cmd-prefix">
          <xsl:text>"</xsl:text>
  
  
  

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

Reply via email to