Attaching the file would be useful I suppose...

> -----Original Message-----
> From: John Morrison [mailto:[EMAIL PROTECTED]]
> Sent: Sunday, 11 March 2001 9:09 am
> To: [EMAIL PROTECTED]
> Subject: RE: Off topic (in part)
>
>
> Hi Sam,
>
> > -----Original Message-----
> > From: Sam Ruby [mailto:[EMAIL PROTECTED]]
> > Sent: Saturday, 10 March 2001 1:12 pm
> > To: [EMAIL PROTECTED]
> > Subject: RE: Off topic (in part)
> >
> >
> > John Morrison wrote:
> > >
> > > Ha, OK.  Will look more closely at this.  I've made the alteration
> > > on my own system (obviously) and have only seen the desired change
> > > in system functionality.  Could you tell me where to look for the
> > > flaw?  I assume it's in the resulting html?
> >
> > /workspace/@logdir doesn't exist in $SOURCE
> >
> > /workspace/@logdir does exist in work/merge.xml, but other things are
> > different.
>
> True, however a (quick) work around is to duplicate the logic
> from merge.xsl
> into bash.xsl (and win2k).  This prob should be extracted into a
> file which
> merge, bash and win2k share with only the appropriate translate being used
> in the win2k version.  But for the moment - I think this fixes it.
>
> > With your change, the puball.sh generated by gen.sh does not
> appear to be
> > workable.
> >
> > > PS Sam, any ideas why I'm getting the problem with JUnit? (see
> > > previous posting)
> >
> > I'm looking into it, but nothing as of yet.  The JUnit build process is
> > still a bit of a puzzle to me.  If I try building it without any special
> > parameters, the zip file is placed into a directory which is to
> > be included
> > in the zip, resulting in a bit of nasty recursion.  I also have never
> > figured out how to get the unit test of JUnit to run.  But
> neither appear
> > to be the problem that you are seeing.  If I figure something
> out, I will
> > let you know.
>
> The only thing that has occured to me is that I'm running on w2k using Sun
> JDK1.3, you are running on (a variation of) unix (?) with (?)
> JDK1(.x)?  And
> that int(255) equiv byte(-1) so maybe it boils down to a OS/JDK dependency
> somewhere?  I've got some time today to experiment - will try and find my
> way around the JUnit source...
>
> John.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>
? diff-u.txt
Index: bash.xsl
===================================================================
RCS file: /home/cvspublic/jakarta-alexandria/proposal/gump/stylesheet/bash.xsl,v
retrieving revision 1.11
diff -u -r1.11 bash.xsl
--- bash.xsl    2001/03/07 15:13:34     1.11
+++ bash.xsl    2001/03/11 08:59:41
@@ -163,6 +163,19 @@
     <xsl:variable name="basedir" select="translate(@basedir, '\', '/')"/>
     <xsl:variable name="cvsdir"  select="translate(@cvsdir,  '\', '/')"/>
 
+    <!-- default log directory, if not present -->
+    <xsl:attribute name="logdir">
+      <xsl:choose>
+        <xsl:when test="not(@logdir)">
+          <xsl:value-of select="$basedir"/>
+          <xsl:text>/log</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="translate(@logdir,  '\', '/')"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:attribute>
+
     <xsl:text>#/bin/sh&#10;</xsl:text>
 
     <xsl:text>test -e </xsl:text>
@@ -172,10 +185,10 @@
     <xsl:text>&#10;</xsl:text>
 
     <xsl:text>test -e </xsl:text>
-    <xsl:value-of select="$basedir"/>
-    <xsl:text>/log || mkdir </xsl:text>
-    <xsl:value-of select="$basedir"/>
-    <xsl:text>/log &#10;</xsl:text>
+    <xsl:value-of select="$logdir"/>
+    <xsl:text> || mkdir </xsl:text>
+    <xsl:value-of select="$logdir"/>
+    <xsl:text>&#10;</xsl:text>
 
     <xsl:text>test -e </xsl:text>
     <xsl:value-of select="$cvsdir"/>
@@ -184,8 +197,8 @@
     <xsl:text>&#10;</xsl:text>
 
     <xsl:text>sh publish.sh $1 </xsl:text>
-    <xsl:value-of select="$basedir"/>
-    <xsl:text>/log/source_index.html&#10;</xsl:text>
+    <xsl:value-of select="$logdir"/>
+    <xsl:text>/source_index.html&#10;</xsl:text>
 
     <xsl:for-each select="project">
       <xsl:sort select="@name"/>
@@ -193,16 +206,16 @@
       <xsl:text>sh publish.sh </xsl:text>
       <xsl:value-of select="translate(@href,'\','/')"/>
       <xsl:text> </xsl:text>
-      <xsl:value-of select="$basedir"/>
-      <xsl:text>/log/source_</xsl:text>
+      <xsl:value-of select="$logdir"/>
+      <xsl:text>/source_</xsl:text>
       <xsl:value-of select="substring-before(substring-after(@href,'/'),'.')"/>
       <xsl:text>.html&#10;</xsl:text>
     </xsl:for-each>
 
     <xsl:text>for i in ../stylesheet/*.xsl; do&#10;</xsl:text>
     <xsl:text>  sh publish.sh stylesheet/`basename $i` </xsl:text>
-    <xsl:value-of select="$basedir"/>
-    <xsl:text>/log/code_`basename $i`.html&#10;</xsl:text>
+    <xsl:value-of select="$logdir"/>
+    <xsl:text>/code_`basename $i`.html&#10;</xsl:text>
     <xsl:text>done&#10;</xsl:text>
 
     <xsl:text>sh xref.sh&#10;</xsl:text>
@@ -288,7 +301,7 @@
   </xsl:template>
 
   <!-- =================================================================== -->
-  <!--                        create the claspath                          -->
+  <!--                        create the classpath                         -->
   <!-- =================================================================== -->
 
   <xsl:template match="classpath">
Index: win2k.xsl
===================================================================
RCS file: /home/cvspublic/jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl,v
retrieving revision 1.4
diff -u -r1.4 win2k.xsl
--- win2k.xsl   2001/03/06 18:11:54     1.4
+++ win2k.xsl   2001/03/11 08:59:42
@@ -132,6 +132,19 @@
     <xsl:variable name="basedir" select="translate(@basedir, '/', '\')"/>
     <xsl:variable name="cvsdir"  select="translate(@cvsdir,  '/', '\')"/>
 
+    <!-- default log directory, if not present -->
+    <xsl:attribute name="logdir">
+      <xsl:choose>
+        <xsl:when test="not(@logdir)">
+          <xsl:value-of select="$basedir"/>
+          <xsl:text>/log</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="translate(@logdir,  '/', '\')"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:attribute>
+
     <xsl:text>@echo off&#10;</xsl:text>
 
     <xsl:text>if not exist </xsl:text>
@@ -141,20 +154,20 @@
     <xsl:text>&#10;</xsl:text>
 
     <xsl:text>if not exist </xsl:text>
-    <xsl:value-of select="$basedir"/>
-    <xsl:text>\log  mkdir </xsl:text>
-    <xsl:value-of select="$basedir"/>
-    <xsl:text>\log &#10;</xsl:text>
+    <xsl:value-of select="$logdir"/>
+    <xsl:text> mkdir </xsl:text>
+    <xsl:value-of select="$logdir"/>
+    <xsl:text>&#10;</xsl:text>
 
     <xsl:text>if not exist </xsl:text>
     <xsl:value-of select="$cvsdir"/>
-    <xsl:text>  mkdir </xsl:text>
+    <xsl:text> mkdir </xsl:text>
     <xsl:value-of select="$cvsdir"/>
     <xsl:text>&#10;</xsl:text>
 
     <xsl:text>call publish.bat %1 </xsl:text>
-    <xsl:value-of select="$basedir"/>
-    <xsl:text>\log\source_index.html&#10;</xsl:text>
+    <xsl:value-of select="$logdir"/>
+    <xsl:text>\source_index.html&#10;</xsl:text>
 
     <xsl:for-each select="project">
       <xsl:sort select="@name"/>
@@ -162,16 +175,16 @@
       <xsl:text>call publish </xsl:text>
       <xsl:value-of select="translate(@href,'/','\\')"/>
       <xsl:text> </xsl:text>
-      <xsl:value-of select="$basedir"/>
-      <xsl:text>\log\source_</xsl:text>
+      <xsl:value-of select="$logdir"/>
+      <xsl:text>\source_</xsl:text>
       <xsl:value-of select="substring-before(substring-after(@href,'/'),'.')"/>
       <xsl:text>.html&#10;</xsl:text>
     </xsl:for-each>
 
     <xsl:text>for %%i in (..\stylesheet\*.xsl) do </xsl:text>
     <xsl:text>call publish stylesheet\%%~nxi </xsl:text>
-    <xsl:value-of select="$basedir"/>
-    <xsl:text>\log\code_%%~ni.html&#10;</xsl:text>
+    <xsl:value-of select="$logdir"/>
+    <xsl:text>\code_%%~ni.html&#10;</xsl:text>
 
     <xsl:text>call xref.bat&#10;</xsl:text>
 

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

Reply via email to