richter 02/03/05 02:56:07
Modified: . Tag: Embperl2c test.pl
driver Tag: Embperl2c epxalan.cpp
test/cmp Tag: Embperl2c pod.asc pod.asc.htm
pod.asc.xalan.htm
Added: test/cmp Tag: Embperl2c pod.asc.htm.win32 pod.asc.win32
pod.asc.xalan.htm.win32
Log:
test fixes
Revision Changes Path
No revision
No revision
1.70.4.123 +32 -5 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.122
retrieving revision 1.70.4.123
diff -u -r1.70.4.122 -r1.70.4.123
--- test.pl 5 Mar 2002 08:07:21 -0000 1.70.4.122
+++ test.pl 5 Mar 2002 10:56:06 -0000 1.70.4.123
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.122 2002/03/05 08:07:21 richter Exp $
+# $Id: test.pl,v 1.70.4.123 2002/03/05 10:56:06 richter Exp $
#
###################################################################################
@@ -734,9 +734,16 @@
'pod/pod.asc' => {
'version' => 2,
'syntax' => 'POD',
- #'condition' => '!$EPWIN32',
+ 'condition' => '!$EPWIN32',
'cgi' => 0,
},
+ 'pod/pod.asc' => {
+ 'version' => 2,
+ 'syntax' => 'POD',
+ 'condition' => '$EPWIN32',
+ 'cmpext' => '.win32',
+ 'cgi' => 0,
+ },
'xml/pod.xml' => {
'version' => 2,
'recipe' => 'EmbperlLibXSLT',
@@ -817,8 +824,18 @@
'cmpext' => '.htm',
'offline' => 1,
'msg' => ' libxslt',
- 'condition' => '$LIBXSLTVERSION',
+ 'condition' => '$LIBXSLTVERSION && !$EPWIN32',
},
+ 'pod/pod.asc' => {
+ 'version' => 2,
+ 'syntax' => 'POD',
+ 'recipe' => 'EmbperlLibXSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'cmpext' => '.htm.win32',
+ 'offline' => 1,
+ 'msg' => ' libxslt',
+ 'condition' => '$LIBXSLTVERSION && $EPWIN32',
+ },
'pod/pod.asc' => {
'version' => 2,
'syntax' => 'POD',
@@ -827,8 +844,18 @@
'cmpext' => '.xalan.htm',
'offline' => 1,
'msg' => ' xalan',
- 'condition' => '$XALANPATH',
+ 'condition' => '$XALANPATH && !$EPWIN32',
},
+ 'pod/pod.asc' => {
+ 'version' => 2,
+ 'syntax' => 'POD',
+ 'recipe' => 'EmbperlXalanXSLT',
+ 'xsltstylesheet' => "$inpath/xml/pod.xsl",
+ 'cmpext' => '.xalan.htm.win32',
+ 'offline' => 1,
+ 'msg' => ' xalan',
+ 'condition' => '$XALANPATH && $EPWIN32',
+ },
'libxslt/pod.xml' => {
'version' => 2,
'modperl' => 1,
@@ -1546,7 +1573,7 @@
$opt_modperl = 1 ;
}
elsif ($EPAPACHEVERSION)
- { $opt_cache = $opt_modperl = $opt_cgi = $opt_offline = $opt_execute = 1 }
+ { $opt_cache = $opt_modperl = $opt_offline = $opt_execute = 1 }
else
{ $opt_cache = $opt_offline = $opt_execute = 1 }
#$opt_ep1 = 1 ;
No revision
No revision
1.1.2.19 +7 -8 embperl/driver/Attic/epxalan.cpp
Index: epxalan.cpp
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/epxalan.cpp,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- epxalan.cpp 1 Mar 2002 19:59:23 -0000 1.1.2.18
+++ epxalan.cpp 5 Mar 2002 10:56:07 -0000 1.1.2.19
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epxalan.cpp,v 1.1.2.18 2002/03/01 19:59:23 richter Exp $
+# $Id: epxalan.cpp,v 1.1.2.19 2002/03/05 10:56:07 richter Exp $
#
###################################################################################*/
@@ -876,18 +876,17 @@
int rc ;
HV * pParamHV ;
- if ((rc = GetHashValueHREF (r, pParam, "param", &pParamHV)) != ok)
- {
- if (!r->errdat1[0])
- strncpy (r -> errdat1, pProvider -> pCache -> sKey, sizeof (r ->
errdat1) -1 ) ;
- return rc ;
- }
+ if ((rc = GetHashValueHREF (r, pParam, "param", &pParamHV)) != ok)
+ {
+ pParamHV = r -> Component.Param.pXsltParam ;
+ }
if (((tProviderXalan *)pProvider) -> pParamHV)
SvREFCNT_dec (((tProviderXalan *)pProvider) -> pParamHV) ;
((tProviderXalan *)pProvider) -> pParamHV = pParamHV ;
- SvREFCNT_inc (((tProviderXalan *)pProvider) -> pParamHV) ;
+ if (pParamHV)
+ SvREFCNT_inc (((tProviderXalan *)pProvider) -> pParamHV) ;
return ok ;
}
No revision
No revision
1.1.2.7 +23 -59 embperl/test/cmp/Attic/pod.asc
Index: pod.asc
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/pod.asc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- pod.asc 3 Mar 2002 20:17:40 -0000 1.1.2.6
+++ pod.asc 5 Mar 2002 10:56:07 -0000 1.1.2.7
@@ -1,60 +1,37 @@
-<pod><head><title>Test pod for Embperl</title>
-</head><sect1><title>HEAD1</title>
+<pod><head><title>Test pod for Embperl</title></head><sect1><title>HEAD1</title>
<para>some text under HEAD1</para>
+
+
<para>more text under HEAD1</para>
<verbatim><![CDATA[ some verbatim
- paragraph]]></verbatim>
-<para>normal text
-wraps around</para>
-<verbatim><![CDATA[ verbatim col 1
+ paragraph]]></verbatim><para>normal text
+wraps around</para><verbatim><![CDATA[ verbatim col 1
line 2
- line 3]]></verbatim>
-<verbatim><![CDATA[ verbatim col 3
+ line 3]]></verbatim><verbatim><![CDATA[ verbatim col 3
lin2
- lin3]]></verbatim>
-<verbatim><![CDATA[ again col 3]]></verbatim>
-<para>para text goes here</para>
-<sect2><title>HEAD2</title>
-<para>some text under HEAD2</para>
-</sect2><sect2><title>second HEAD2 which
-wraps to the next line</title>
-<para>some text under HEAD2 which
-also warps to the next line</para>
-<para>another paragraph is
-this</para>
-<sect3><title>HEAD3</title>
-<para>some text under HEAD3</para>
-</sect3></sect2><sect2><title>third HEAD2 which
-wraps to the next line</title>
-<para>some text under HEAD2 which
-also warps to the next line</para>
-<para>format
+ lin3]]></verbatim><verbatim><![CDATA[ again col 3]]></verbatim><para>para text
goes here</para>
+<sect2><title>HEAD2</title><para>some text under
HEAD2</para></sect2><sect2><title>second HEAD2 which
+wraps to the next line</title><para>some text under HEAD2 which
+also warps to the next line</para><para>another paragraph is
+this</para><sect3><title>HEAD3</title><para>some text under
HEAD3</para></sect3></sect2><sect2><title>third HEAD2 which
+wraps to the next line</title><para>some text under HEAD2 which
+also warps to the next line</para><para>format
<strong>bold</strong>
<code>code</code>
<emphasis>italic</emphasis>
-<underline>underline</underline></para>
-<list><item><itemtext>first item</itemtext>
-<para>text 1</para>
-</item><item><itemtext>second item</itemtext>
-<para>text 2</para>
-</item></list>
+<underline>underline</underline></para><list><item><itemtext>first
item</itemtext><para>text 1</para></item><item><itemtext>second
item</itemtext><para>text 2</para></item></list>
-<list><item><itemtext>* first item</itemtext>
-<para>text 1
-two lines</para>
-</item><item><itemtext>* second item</itemtext>
-<para>text 2
+<list><item><itemtext>* first item</itemtext><para>text 1
+two lines</para></item><item><itemtext>* second item</itemtext><para>text 2
two lines</para>
<list><item><itemtext>nested list item 1</itemtext>
-<para>text 1</para>
-<para>line 2</para>
+<para>text 1</para><para>line 2</para>
</item><item><itemtext>nested list item 2</itemtext>
-<para>text 2</para>
-<para>line 2</para>
+<para>text 2</para><para>line 2</para>
</item></list>
@@ -62,21 +39,8 @@
</item></list>
</sect2></sect1><sect1><title>again HEAD1
-and second line of title</title>
-<para>again some text under HEAD1</para>
-<sect2><title>again HEAD2</title>
-<para>again some text under HEAD2</para>
-</sect2></sect1><sect1><title>restart</title>
-<para>some text</para>
-</sect1><sect1><title>restart 2</title>
-<sect2><title>restart 2 Head 2</title>
-<para>text</para>
-</sect2></sect1><sect1><title>restart 2</title>
-<sect2><title>restart 2 Head 2</title>
-</sect2><sect2><title>restart 3 Head 2</title>
-<para>end</para>
-<para><xlink>test</xlink> <xlink uri="yyy">xxx</xlink>
<xlink>http://www.ecos.de</xlink> <xlink>ftp://ftp.dev.ecos.de</xlink>
-
-<xlink>test</xlink> <xlink uri="yyy 2">xxx 2</xlink>
<xlink>http://www.ecos.de</xlink> <xlink>ftp://ftp.dev.ecos.de</xlink></para>
-
-</sect2></sect1></pod>
+and second line of title</title><para>again some text under HEAD1</para>
+<sect2><title>again HEAD2</title><para>again some text under HEAD2</para>
+</sect2></sect1><sect1><title>restart</title><para>some
text</para></sect1><sect1><title>restart 2</title><sect2><title>restart 2 Head
2</title><para>text</para></sect2></sect1><sect1><title>restart
2</title><sect2><title>restart 2 Head 2</title></sect2><sect2><title>restart 3 Head
2</title><para>end</para><para><xlink>test</xlink> <xlink>xxx|yyy</xlink>
<xlink>http://www.ecos.de</xlink> <xlink>ftp://ftp.dev.ecos.de</xlink>
+<xlink>test</xlink> <xlink>"xxx 2"|"yyy 2"</xlink>
<xlink>http://www.ecos.de</xlink> <xlink>ftp://ftp.dev.ecos.de</xlink></para>
+</sect2></sect1></pod>
1.1.2.6 +22 -67 embperl/test/cmp/Attic/pod.asc.htm
Index: pod.asc.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/pod.asc.htm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- pod.asc.htm 3 Mar 2002 20:17:40 -0000 1.1.2.5
+++ pod.asc.htm 5 Mar 2002 10:56:07 -0000 1.1.2.6
@@ -3,71 +3,40 @@
<head>
<title>Test pod for Embperl</title>
</head>
-<body>Test pod for Embperl
-<h1>HEAD1</h1>
-
+<body>Test pod for Embperl<h1>HEAD1</h1>
<p>some text under HEAD1</p>
-<p>more text under HEAD1</p>
+
+<p>more text under HEAD1</p>
<pre> some verbatim
- paragraph</pre>
-<p>normal text
-wraps around</p>
-<pre> verbatim col 1
+ paragraph</pre><p>normal text
+wraps around</p><pre> verbatim col 1
line 2
- line 3</pre>
-<pre> verbatim col 3
+ line 3</pre><pre> verbatim col 3
lin2
- lin3</pre>
-<pre> again col 3</pre>
-<p>para text goes here</p>
-
-<h2>HEAD2</h2>
-<p>some text under HEAD2</p>
-<h2>second HEAD2 which
-wraps to the next line</h2>
-<p>some text under HEAD2 which
-also warps to the next line</p>
-<p>another paragraph is
-this</p>
-<h2>HEAD3</h2>
-<p>some text under HEAD3</p>
-<h2>third HEAD2 which
-wraps to the next line</h2>
-<p>some text under HEAD2 which
-also warps to the next line</p>
-<p>format
+ lin3</pre><pre> again col 3</pre><p>para text goes here</p>
+<h2>HEAD2</h2><p>some text under HEAD2</p><h2>second HEAD2 which
+wraps to the next line</h2><p>some text under HEAD2 which
+also warps to the next line</p><p>another paragraph is
+this</p><h2>HEAD3</h2><p>some text under HEAD3</p><h2>third HEAD2 which
+wraps to the next line</h2><p>some text under HEAD2 which
+also warps to the next line</p><p>format
<b>bold</b>
<code>code</code>
<i>italic</i>
-<u>underline</u></p>
-<ul><li><b>first item
-<p>text 1</p>
-</b></li><br/><li><b>second item
-<p>text 2</p>
-</b></li><br/></ul>
+<u>underline</u></p><ul><li><b>first item<p>text 1</p></b></li><br/><li><b>second
item<p>text 2</p></b></li><br/></ul>
-<ul><li><b>* first item
-<p>text 1
-two lines</p>
-</b></li><br/><li><b>* second item
-<p>text 2
+<ul><li><b>* first item<p>text 1
+two lines</p></b></li><br/><li><b>* second item<p>text 2
two lines</p>
-
<ul><li><b>nested list item 1
-
-<p>text 1</p>
-<p>line 2</p>
-
+<p>text 1</p><p>line 2</p>
</b></li><br/><li><b>nested list item 2
-
-<p>text 2</p>
-<p>line 2</p>
-
+<p>text 2</p><p>line 2</p>
</b></li><br/></ul>
@@ -75,23 +44,9 @@
</b></li><br/></ul>
<h1>again HEAD1
-and second line of title</h1>
-<p>again some text under HEAD1</p>
-
-<h2>again HEAD2</h2>
-<p>again some text under HEAD2</p>
-
-<h1>restart</h1>
-<p>some text</p>
-<h1>restart 2</h1>
-<h2>restart 2 Head 2</h2>
-<p>text</p>
-<h1>restart 2</h1>
-<h2>restart 2 Head 2</h2>
-<h2>restart 3 Head 2</h2>
-<p>end</p>
-<p><a href="test">test</a> <a href="yyy">xxx</a> <a
href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a>
-<a href="test">test</a> <a href="yyy 2">xxx 2</a> <a
href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a></p>
-
+and second line of title</h1><p>again some text under HEAD1</p>
+<h2>again HEAD2</h2><p>again some text under HEAD2</p>
+<h1>restart</h1><p>some text</p><h1>restart 2</h1><h2>restart 2 Head
2</h2><p>text</p><h1>restart 2</h1><h2>restart 2 Head 2</h2><h2>restart 3 Head
2</h2><p>end</p><p><a href="test">test</a> <a href="xxx|yyy">xxx|yyy</a> <a
href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a>
+<a href="test">test</a> <a href=""xxx 2"|"yyy 2"">"xxx
2"|"yyy 2"</a> <a href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a></p>
</body>
</html>
1.1.2.3 +92 -26 embperl/test/cmp/Attic/pod.asc.xalan.htm
Index: pod.asc.xalan.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/pod.asc.xalan.htm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- pod.asc.xalan.htm 3 Mar 2002 20:17:40 -0000 1.1.2.2
+++ pod.asc.xalan.htm 5 Mar 2002 10:56:07 -0000 1.1.2.3
@@ -1,47 +1,113 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<html xmlns="http://www.w3.org/TR/xhtml1/strict";>
<head>
-<title>POD</title>
+<title>Test pod for Embperl</title>
</head>
-<body>
-<h1>HEAD1</h1>
-some text under HEAD1<br/>
-<br/>
-<h2>
-<img src="sq.gif" width="16" height="16" alt="-"/>HEAD2</h2>
-<p/>
-some text under HEAD2<br/>
-<br/>HEAD3
-some text under HEAD3<br/>
-<br/>format bold <code>code</code> italic underline
+<body>Test pod for Embperl<h1>HEAD1</h1>
+<p>some text under HEAD1</p>
+
+
+<p>more text under HEAD1</p>
+<pre> some verbatim
+ paragraph</pre>
+<p>normal text
+wraps around</p>
+<pre> verbatim col 1
+ line 2
+ line 3</pre>
+<pre> verbatim col 3
+ lin2
+ lin3</pre>
+<pre> again col 3</pre>
+<p>para text goes here</p>
+<h2>HEAD2</h2>
+<p>some text under HEAD2</p>
+<h2>second HEAD2 which
+wraps to the next line</h2>
+<p>some text under HEAD2 which
+also warps to the next line</p>
+<p>another paragraph is
+this</p>
+<h2>HEAD3</h2>
+<p>some text under HEAD3</p>
+<h2>third HEAD2 which
+wraps to the next line</h2>
+<p>some text under HEAD2 which
+also warps to the next line</p>
+<p>format
+<b>bold</b>
+<code>code</code>
+<i>italic</i>
+<u>underline</u>
+</p>
<ul>
<li>
-<b>first item</b>
+<b>first item<p>text 1</p>
+</b>
</li>
<br/>
-text 1<br/>
-<br/>
<li>
-<b>second item</b>
+<b>second item<p>text 2</p>
+</b>
</li>
<br/>
-text 2<br/>
-<br/>
</ul>
+
+<ul>
+<li>
+<b>* first item<p>text 1
+two lines</p>
+</b>
+</li>
<br/>
-<br/>
+<li>
+<b>* second item<p>text 2
+two lines</p>
<ul>
-first item
-text 1<br/>
-<br/>second item
-text 2<br/>
+<li>
+<b>nested list item 1
+
+<p>text 1</p>
+<p>line 2</p>
+
+</b>
+</li>
<br/>
-</ul>
+<li>
+<b>nested list item 2
+
+<p>text 2</p>
+<p>line 2</p>
+
+</b>
+</li>
<br/>
+</ul>
+
+
+</b>
+</li>
<br/>
-<p><a href="test">test</a> <a href="yyy">xxx</a> <a
href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a>
-<a href="test">test</a> <a href="yyy 2">xxx 2</a> <a
href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a></p>
+</ul>
+<h1>again HEAD1
+and second line of title</h1>
+<p>again some text under HEAD1</p>
+<h2>again HEAD2</h2>
+<p>again some text under HEAD2</p>
+<h1>restart</h1>
+<p>some text</p>
+<h1>restart 2</h1>
+<h2>restart 2 Head 2</h2>
+<p>text</p>
+<h1>restart 2</h1>
+<h2>restart 2 Head 2</h2>
+<h2>restart 3 Head 2</h2>
+<p>end</p>
+<p>
+<a href="test">test</a> <a href="xxx|yyy">xxx|yyy</a> <a
href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a>
+<a href="test">test</a> <a href=""xxx 2"|"yyy 2"">"xxx 2"|"yyy
2"</a> <a href="http://www.ecos.de";>http://www.ecos.de</a> <a
href="ftp://ftp.dev.ecos.de";>ftp://ftp.dev.ecos.de</a>
+</p>
</body>
</html>
No revision
No revision
1.1.2.1 +97 -0 embperl/test/cmp/Attic/pod.asc.htm.win32
1.1.2.1 +82 -0 embperl/test/cmp/Attic/pod.asc.win32
1.1.2.1 +47 -0 embperl/test/cmp/Attic/pod.asc.xalan.htm.win32
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
