Change 31382 by [EMAIL PROTECTED] on 2007/06/14 14:12:35
Upgrade to PathTools 3.25
Affected files ...
... //depot/perl/ext/Cwd/Changes#30 edit
... //depot/perl/ext/Cwd/Cwd.xs#38 edit
... //depot/perl/ext/Cwd/Makefile.PL#5 edit
... //depot/perl/lib/Cwd.pm#109 edit
... //depot/perl/lib/File/Spec.pm#57 edit
... //depot/perl/lib/File/Spec/OS2.pm#24 edit
... //depot/perl/lib/File/Spec/t/tmpdir.t#2 edit
Differences ...
==== //depot/perl/ext/Cwd/Changes#30 (text) ====
Index: perl/ext/Cwd/Changes
--- perl/ext/Cwd/Changes#29~29356~ 2006-11-22 19:09:08.000000000 -0800
+++ perl/ext/Cwd/Changes 2007-06-14 07:12:35.000000000 -0700
@@ -1,5 +1,16 @@
Revision history for Perl distribution PathTools.
+ - Added a workaround for auto-vivication-of-function-args Perl bug
+ (triggered by OS/2-specific code). [Ilya Zakharevich]
+
+ - Sync with a bleadperl change: miniperl can no longer use Win32::*
+ functions because it cannot load Win32.dll. [Jan Dubois]
+
+ - We only need to load ppport.h when building outside the core, so we
+ avoid using it when in the core.
+
+3.24 - Sun Nov 19 22:52:49 2006
+
- Fixed a bug in the $ENV{PWD}-updating of Cwd::chdir() when a
dirhandle is passed in. [Steve Peters]
==== //depot/perl/ext/Cwd/Cwd.xs#38 (text) ====
Index: perl/ext/Cwd/Cwd.xs
--- perl/ext/Cwd/Cwd.xs#37~30718~ 2007-03-23 04:59:55.000000000 -0700
+++ perl/ext/Cwd/Cwd.xs 2007-06-14 07:12:35.000000000 -0700
@@ -1,7 +1,7 @@
#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
-#ifdef USE_PPPORT_H
+#ifndef NO_PPPORT_H
# define NEED_sv_2pv_nolen
# include "ppport.h"
#endif
==== //depot/perl/ext/Cwd/Makefile.PL#5 (text) ====
Index: perl/ext/Cwd/Makefile.PL
--- perl/ext/Cwd/Makefile.PL#4~30718~ 2007-03-23 04:59:55.000000000 -0700
+++ perl/ext/Cwd/Makefile.PL 2007-06-14 07:12:35.000000000 -0700
@@ -1,10 +1,7 @@
+# core-only Makefile.PL
use ExtUtils::MakeMaker;
WriteMakefile(
NAME => 'Cwd',
VERSION_FROM => '../../lib/Cwd.pm',
- (
- (grep { $_ eq 'PERL_CORE=1' } @ARGV)
- ? ()
- : ('DEFINE' => '-DUSE_PPPORT_H')
- ),
+ 'DEFINE' => '-DNO_PPPORT_H',
);
==== //depot/perl/lib/Cwd.pm#109 (text) ====
Index: perl/lib/Cwd.pm
--- perl/lib/Cwd.pm#108~30718~ 2007-03-23 04:59:55.000000000 -0700
+++ perl/lib/Cwd.pm 2007-06-14 07:12:35.000000000 -0700
@@ -171,7 +171,7 @@
use Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
-$VERSION = '3.24_01';
+$VERSION = '3.25';
@ISA = qw/ Exporter /;
@EXPORT = qw(cwd getcwd fastcwd fastgetcwd);
==== //depot/perl/lib/File/Spec.pm#57 (text) ====
Index: perl/lib/File/Spec.pm
--- perl/lib/File/Spec.pm#56~29356~ 2006-11-22 19:09:08.000000000 -0800
+++ perl/lib/File/Spec.pm 2007-06-14 07:12:35.000000000 -0700
@@ -3,7 +3,7 @@
use strict;
use vars qw(@ISA $VERSION);
-$VERSION = '3.24';
+$VERSION = '3.25';
$VERSION = eval $VERSION;
my %module = (MacOS => 'Mac',
==== //depot/perl/lib/File/Spec/OS2.pm#24 (text) ====
Index: perl/lib/File/Spec/OS2.pm
--- perl/lib/File/Spec/OS2.pm#23~24407~ 2005-05-06 08:37:30.000000000 -0700
+++ perl/lib/File/Spec/OS2.pm 2007-06-14 07:12:35.000000000 -0700
@@ -37,9 +37,8 @@
my $tmpdir;
sub tmpdir {
return $tmpdir if defined $tmpdir;
- $tmpdir = $_[0]->_tmpdir( @ENV{qw(TMPDIR TEMP TMP)},
- '/tmp',
- '/' );
+ my @d = @ENV{qw(TMPDIR TEMP TMP)}; # function call could autovivivy
+ $tmpdir = $_[0]->_tmpdir( @d, '/tmp', '/' );
}
sub catdir {
==== //depot/perl/lib/File/Spec/t/tmpdir.t#2 (text) ====
Index: perl/lib/File/Spec/t/tmpdir.t
--- perl/lib/File/Spec/t/tmpdir.t#1~26174~ 2005-11-19 05:46:27.000000000
-0800
+++ perl/lib/File/Spec/t/tmpdir.t 2007-06-14 07:12:35.000000000 -0700
@@ -5,7 +5,7 @@
use File::Spec;
use File::Spec::Win32;
-plan tests => 3;
+plan tests => 4;
ok 1, 1, "Loaded";
@@ -13,5 +13,11 @@
File::Spec->tmpdir;
ok scalar keys %ENV, $num_keys, "tmpdir() shouldn't change the contents of
%ENV";
+{
+ local %ENV;
+ File::Spec::Win32->tmpdir;
+ ok scalar keys %ENV, 0, "Win32->tmpdir() shouldn't change the contents of
%ENV";
+}
+
File::Spec::Win32->tmpdir;
ok scalar keys %ENV, $num_keys, "Win32->tmpdir() shouldn't change the contents
of %ENV";
End of Patch.
