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 2004/07/08 10:31:00 UTC
cvs commit: embperl/test/conf startup.pl
richter 2004/07/08 01:31:00
Modified: . Changes.pod Makefile.PL ep.h epio.c
test/conf startup.pl
Log:
fixed win32 compiler/test problems
Revision Changes Path
1.241 +1 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- Changes.pod 21 Apr 2004 06:11:11 -0000 1.240
+++ Changes.pod 8 Jul 2004 08:31:00 -0000 1.241
@@ -10,6 +10,7 @@
object is only available in case of a file upload
- Fixed make test problem on RedHat, which reported wrong number of errors
due to escaping in Apache error log.
+ - Fixed test and compile problems on Windows with Perl 5.8.3
=head1 2.0b11 15. March 2004
1.69 +15 -6 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Makefile.PL 23 Jan 2004 07:37:12 -0000 1.68
+++ Makefile.PL 8 Jul 2004 08:31:00 -0000 1.69
@@ -90,8 +90,13 @@
{
my ($txt) = shift -> MM::test_via_harness (@_) ;
$txt =~ s/PERL_DL_NONLAZY=1/PERL_DL_NONLAZY=0/ ;
- #$txt =~ s/\$\(FULLPERL\)/\$\(FULLPERL\) \-T / ;
- $txt =~ s/\$\(FULLPERL\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERL\)/ if ($win32) ;
+ if ($win32)
+ {
+ if (!($txt =~ s/\$\(FULLPERL\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERL\)/ ))
+ {
+ $txt =~ s/\$\(FULLPERLRUN\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERLRUN\)/
+ }
+ }
return $txt ;
}
@@ -99,9 +104,13 @@
{
my ($txt) = shift -> MM::test_via_script (@_) ;
$txt =~ s/PERL_DL_NONLAZY=1/PERL_DL_NONLAZY=0/ ;
- #$txt =~ s/\$\(FULLPERL\)/\$\(FULLPERL\) \-T / ;
- $txt =~ s/\$\(FULLPERL\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERL\)/ if ($win32) ;
-
+ if ($win32)
+ {
+ if (!($txt =~ s/\$\(FULLPERL\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERL\)/ ))
+ {
+ $txt =~ s/\$\(FULLPERLRUN\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERLRUN\)/
+ }
+ }
$txt =~ s/\$\(TEST_FILE\)/\$(TEST_FILE) \$(TESTARGS)/g ;
return $txt ;
1.42 +2 -1 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ep.h 22 Oct 2002 05:29:04 -0000 1.41
+++ ep.h 8 Jul 2004 08:31:00 -0000 1.42
@@ -133,10 +133,12 @@
#undef crypt
#endif
+#ifndef WIN32
#ifdef errno
#define apache_errno errno
#undef errno
#endif
+#endif
#endif /* endif PERL_VERSION >= 6 */
@@ -165,7 +167,6 @@
#ifndef PATH_MAX
#define PATH_MAX 512
#endif
-
#include "eptypes.h"
1.27 +2 -1 embperl/epio.c
Index: epio.c
===================================================================
RCS file: /home/cvs/embperl/epio.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- epio.c 17 Feb 2004 06:39:05 -0000 1.26
+++ epio.c 8 Jul 2004 08:31:00 -0000 1.27
@@ -20,6 +20,7 @@
#include "crypto/epcrypto.h"
+
#ifndef PerlIO
1.21 +6 -1 embperl/test/conf/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- startup.pl 16 Jan 2004 08:24:26 -0000 1.20
+++ startup.pl 8 Jul 2004 08:31:00 -0000 1.21
@@ -2,6 +2,7 @@
BEGIN {
use lib qw{ . } ;
use ExtUtils::testlib ;
+ use Cwd ;
$ENV{MOD_PERL} =~ m#/(\d+)\.(\d+)# ;
$mp2 = 1 if ($1 == 2 || ($1 == 1 && $2 >= 99)) ;
@@ -11,13 +12,17 @@
$ENV{PERL5LIB} =~ /^(.*)$/ ;
eval 'use lib split (/:/, $1) ;' ;
}
-
+ my $dir = Cwd::fastcwd ;
+ $dir =~ s#/#\\#g ;
+ $dir =~ /^(.+)$/ ;
+ $dir = $1 ; # untaint
$ENV{EMBPERL_SRC} =~ /^(.*?)$/;
my $cwd = $1 ; # untaint
my $i = 0 ;
foreach (@INC)
{
$INC[$i] = "$cwd/$_" if (/^\.?\/?blib/) ;
+ $INC[$i] = "$cwd/$1" if (/^\Q$dir\E\\(blib\\.+)$/i) ;
$INC[$i] =~ s#//#/#g ;
$i++ ;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org