You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2001/11/23 08:51:00 UTC
cvs commit: embperl/test/html/nochdir nochdir.htm
richter 01/11/22 23:51:00
Modified: . Tag: Embperl2c Changes.pod DOM.xs Embperl.xs ep.h
epcomp.c epmain.c test.pl
Embperl/Recipe Tag: Embperl2c Embperl.pm XSLT.pm
test/cmp Tag: Embperl2c chdir.htm nochdir.htm
test/html Tag: Embperl2c chdir.htm
test/html/nochdir Tag: Embperl2c nochdir.htm
Log:
Embperl 2 - cleanup for win32
Revision Changes Path
No revision
No revision
1.129.4.38 +3 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.37
retrieving revision 1.129.4.38
diff -u -r1.129.4.37 -r1.129.4.38
--- Changes.pod 2001/11/22 11:00:53 1.129.4.37
+++ Changes.pod 2001/11/23 07:50:59 1.129.4.38
@@ -10,6 +10,9 @@
Alan Milligan.
- Fixed compiling problem with very recent versions of libxslt.
Reported by Michael Stevens and Jonathan Stowe.
+ - Fixed make test so it skips session tests if Apache::SessionX isn't
+ installed. Reported by from Jonathan Stowe.
+ - Fixed path problem with Execute ({sub => foo,... }) on win32.
=head1 2.0b4 (BETA) 20. Nov. 2001
1.1.2.21 +2 -2 embperl/DOM.xs
Index: DOM.xs
===================================================================
RCS file: /home/cvs/embperl/DOM.xs,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- DOM.xs 2001/11/08 13:14:02 1.1.2.20
+++ DOM.xs 2001/11/23 07:50:59 1.1.2.21
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: DOM.xs,v 1.1.2.20 2001/11/08 13:14:02 richter Exp $
+# $Id: DOM.xs,v 1.1.2.21 2001/11/23 07:50:59 richter Exp $
#
###################################################################################
@@ -326,7 +326,7 @@
char * sAttrText = NULL ;
tAttrData * pAttr ;
- lprintf (pCurrReq, "xDomTree=%d, xAttr=%d pDomTree=%x\n", xDomTree, xAttr, pDomTree) ;
+ /* lprintf (pCurrReq, "xDomTree=%d, xAttr=%d pDomTree=%x\n", xDomTree, xAttr, pDomTree) ;*/
pAttr = Attr_self(pDomTree, xAttr) ;
Attr_selfValue (pDomTree, pAttr , pCurrReq -> nCurrRepeatLevel, &sAttrText) ;
1.29.4.26 +8 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.25
retrieving revision 1.29.4.26
diff -u -r1.29.4.25 -r1.29.4.26
--- Embperl.xs 2001/10/31 12:04:25 1.29.4.25
+++ Embperl.xs 2001/11/23 07:50:59 1.29.4.26
@@ -576,6 +576,14 @@
RETVAL
int
+embperl_IsImport(r)
+ tReq * r
+CODE:
+ RETVAL = r -> pImportStash?1:0 ;
+OUTPUT:
+ RETVAL
+
+int
embperl_Error(r,...)
tReq * r
CODE:
1.27.4.33 +2 -0 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.27.4.32
retrieving revision 1.27.4.33
diff -u -r1.27.4.32 -r1.27.4.33
--- ep.h 2001/11/16 12:43:37 1.27.4.32
+++ ep.h 2001/11/23 07:50:59 1.27.4.33
@@ -551,6 +551,8 @@
/*in*/ const char * sName,
/*in*/ const char * sPackage) ;
+void ChdirToSource (/*i/o*/ register req * r,
+ /*in*/ char * sInputfile) ;
/* ---- from epeval.c ----- */
1.4.2.82 +2 -2 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.81
retrieving revision 1.4.2.82
diff -u -r1.4.2.81 -r1.4.2.82
--- epcomp.c 2001/11/22 11:00:53 1.4.2.81
+++ epcomp.c 2001/11/23 07:50:59 1.4.2.82
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcomp.c,v 1.4.2.81 2001/11/22 11:00:53 richter Exp $
+# $Id: epcomp.c,v 1.4.2.82 2001/11/23 07:50:59 richter Exp $
#
###################################################################################*/
@@ -1760,8 +1760,8 @@
if (SvIOK (pDomTreeSV))
xOldDomTree = SvIVX (pDomTreeSV) ;
- SvREFCNT_dec (sDomTreeSV) ;
sv_setiv (pDomTreeSV, r -> xCurrDomTree) ;
+ SvREFCNT_dec (sDomTreeSV) ;
av_push (r -> pCleanupAV, newRV_inc (pDomTreeSV)) ;
1.75.4.72 +7 -5 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.71
retrieving revision 1.75.4.72
diff -u -r1.75.4.71 -r1.75.4.72
--- epmain.c 2001/11/16 11:29:02 1.75.4.71
+++ epmain.c 2001/11/23 07:50:59 1.75.4.72
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmain.c,v 1.75.4.71 2001/11/16 11:29:02 richter Exp $
+# $Id: epmain.c,v 1.75.4.72 2001/11/23 07:50:59 richter Exp $
#
###################################################################################*/
@@ -1976,8 +1976,9 @@
if ( olddir[0] )
cache_key_len += strlen( olddir );
- cache_key = _malloc( r, cache_key_len + 3 );
- strcpy( cache_key, sSourcefile );
+ cache_key = _malloc( r, cache_key_len + 5 );
+ strcpy( cache_key, "--" );
+ strcat( cache_key, sSourcefile );
if ( pConf->sPackage )
strcat( cache_key, pConf->sPackage );
@@ -2106,8 +2107,9 @@
if ( olddir[0] )
cache_key_len += strlen( olddir );
- cache_key = malloc(cache_key_len + 3 );
- strcpy( cache_key, sSourcefile );
+ cache_key = malloc(cache_key_len + 5 );
+ strcpy( cache_key, "--" );
+ strcat( cache_key, sSourcefile );
if ( sPackage && *sPackage)
strcat( cache_key, sPackage );
1.70.4.99 +2 -2 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.98
retrieving revision 1.70.4.99
diff -u -r1.70.4.98 -r1.70.4.99
--- test.pl 2001/11/23 04:46:12 1.70.4.98
+++ test.pl 2001/11/23 07:50:59 1.70.4.99
@@ -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.98 2001/11/23 04:46:12 richter Exp $
+# $Id: test.pl,v 1.70.4.99 2001/11/23 07:50:59 richter Exp $
#
###################################################################################
@@ -2372,7 +2372,7 @@
}
- next if ($file eq 'chdir.htm' && $EPWIN32) ;
+ #next if ($file eq 'chdir.htm' && $EPWIN32) ;
next if ($file eq 'notfound.htm' && $loc eq $cgiloc && $EPWIN32) ;
next if ($file =~ /opmask/ && $EPSTARTUP =~ /_dso/) ;
if ($file =~ /sess\.htm/)
No revision
No revision
1.1.2.5 +3 -3 embperl/Embperl/Recipe/Attic/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/Embperl.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Embperl.pm 2001/11/16 11:29:03 1.1.2.4
+++ Embperl.pm 2001/11/23 07:51:00 1.1.2.5
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.1.2.4 2001/11/16 11:29:03 richter Exp $
+# $Id: Embperl.pm,v 1.1.2.5 2001/11/23 07:51:00 richter Exp $
#
###################################################################################
@@ -40,7 +40,7 @@
my $file ;
if (!$param -> {inputfile} && $param->{sub})
{
- ($file) = $r -> Sourcefile =~ /.*\/(.*?)$/ ;
+ ($file) = $r -> Sourcefile =~ /.*(?:\/|\\)(.*?)$/ ;
}
else
{
@@ -89,7 +89,7 @@
}
} ;
- if (!exists $param -> {'import'})
+ if (!$r -> IsImport)
{
my $run =
{
1.1.2.2 +2 -2 embperl/Embperl/Recipe/Attic/XSLT.pm
Index: XSLT.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/XSLT.pm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XSLT.pm 2001/11/16 11:55:32 1.1.2.1
+++ XSLT.pm 2001/11/23 07:51:00 1.1.2.2
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: XSLT.pm,v 1.1.2.1 2001/11/16 11:55:32 richter Exp $
+# $Id: XSLT.pm,v 1.1.2.2 2001/11/23 07:51:00 richter Exp $
#
###################################################################################
@@ -44,7 +44,7 @@
if (!$param -> {inputfile} && $param->{sub})
{
- ($file) = $r -> Sourcefile =~ /.*\/(.*?)$/ ;
+ ($file) = $r -> Sourcefile =~ /.*(?:\/|\\)(.*?)$/ ;
}
else
{
No revision
No revision
1.3.6.1 +3 -2 embperl/test/cmp/chdir.htm
Index: chdir.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/chdir.htm,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- chdir.htm 1999/10/05 06:02:03 1.3
+++ chdir.htm 2001/11/23 07:51:00 1.3.6.1
@@ -11,8 +11,9 @@
^\$0:
^\$0 \(absolut\):
Equal: No<BR>
-Diff CWD: >/test/html<<BR>
-Diff $0: >/test/html/chdir.htm<<BR>
+^Diff CWD:
+^Diff \$0:
+Test/html: yes
<table>
<tr>
1.3.6.1 +3 -2 embperl/test/cmp/nochdir.htm
Index: nochdir.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/nochdir.htm,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- nochdir.htm 1999/10/05 06:02:16 1.3
+++ nochdir.htm 2001/11/23 07:51:00 1.3.6.1
@@ -11,8 +11,9 @@
^Script CWD:
^Embperl CWD:
-Equal: Yes<BR>
-Diff CWD: ><<BR>
+^Equal:
+^Diff CWD:
+Test/html: no
<table></table>
No revision
No revision
1.4.6.2 +2 -1 embperl/test/html/chdir.htm
Index: chdir.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/chdir.htm,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- chdir.htm 2000/12/18 11:38:52 1.4.6.1
+++ chdir.htm 2001/11/23 07:51:00 1.4.6.2
@@ -8,7 +8,7 @@
[- use Cwd -]
-Script CWD: [+ $script = fastcwd +] <BR>
+Script CWD: [+ $script = getcwd +] <BR>
Embperl CWD: [+ $ep = $HTML::Embperl::cwd +] <BR>
$0: [+ $abs = $0 +]
@@ -18,6 +18,7 @@
Equal: [+ $script eq $ep?'Yes':'No' +]<BR>
Diff CWD: [+ do { $script =~ /$ep/ ; ">$'<" } +]<BR>
Diff $0: [+ do { $abs =~ /$ep/ ; ">$'<" } +]<BR>
+Test/html: [+ $script =~ /test(?:\/|\\)html$/?'yes':'no' +]
[- @ks = sort keys %fdat -]
No revision
No revision
1.1.2.1.6.2 +1 -0 embperl/test/html/nochdir/nochdir.htm
Index: nochdir.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/nochdir/nochdir.htm,v
retrieving revision 1.1.2.1.6.1
retrieving revision 1.1.2.1.6.2
diff -u -r1.1.2.1.6.1 -r1.1.2.1.6.2
--- nochdir.htm 2000/12/18 11:39:30 1.1.2.1.6.1
+++ nochdir.htm 2001/11/23 07:51:00 1.1.2.1.6.2
@@ -15,6 +15,7 @@
Equal: [+ $script eq $ep?'Yes':'No' +]<BR>
Diff CWD: [+ do { $script =~ /$ep/ ; ">$'<" } +]<BR>
+Test/html: [+ $script =~ /test(?:\/|\\)html$/?'yes':'no' +]
[- @ks = sort keys %fdat -]
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org