Upgrade to PathTools 3.05

p4raw-id: //depot/perl@24069

4 files changed, 26 insertions, 12 deletions

diff --git a/ext/Cwd/Changes b/ext/Cwd/Changes
index bc6ffde0bb..14f3958770 100644
--- a/ext/Cwd/Changes
+++ b/ext/Cwd/Changes
@@ -1,5 +1,18 @@
 Revision history for Perl distribution PathTools.
 
+3.05  Mon Feb 28 07:22:58 CST 2005
+
+ - Fixed a bug in fast_abs_path() on Win32 in which forward- and
+   backward-slashes were confusing things. [demerphq]
+
+ - Failure to load the XS code in Cwd is no longer a fatal error
+   (though failure to compile it is still a fatal error in the build
+   process).  This lets Cwd work under miniperl in the core. [Rafael
+   Garcia-Suarez]
+
+ - In the t/cwd.t test, don't enforce loading from blib/ if we're
+   testing in the perl core. [Rafael Garcia-Suarez]
+
 3.04  Sun Feb  6 17:27:38 CST 2005
 
  - For perls older than 5.006, the HAS_GETCWD symbol is not available,
diff --git a/ext/Cwd/t/cwd.t b/ext/Cwd/t/cwd.t
index 00b8451a6d..280394b986 100644
--- a/ext/Cwd/t/cwd.t
+++ b/ext/Cwd/t/cwd.t
@@ -26,8 +26,8 @@ $tests += 4 if $EXTRA_ABSPATH_TESTS;
 plan tests => $tests;
 
 SKIP: {
-    skip "not suitable for core perl testing", 1 if $ENV{PERL_CORE};
-    like $INC{'Cwd.pm'}, qr{blib}i, "Cwd should be loaded from blib/ during testing";
+  skip "no need to check for blib/ in the core", 1 if $ENV{PERL_CORE};
+  like $INC{'Cwd.pm'}, qr{blib}i, "Cwd should be loaded from blib/ during testing";
 }
 
 my $IsVMS = $^O eq 'VMS';
diff --git a/lib/Cwd.pm b/lib/Cwd.pm
index c389c385d6..002b7c1183 100644
--- a/lib/Cwd.pm
+++ b/lib/Cwd.pm
@@ -170,7 +170,7 @@ use strict;
 use Exporter;
 use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
 
-$VERSION = '3.04_01';
+$VERSION = '3.05';
 
 @ISA = qw/ Exporter /;
 @EXPORT = qw(cwd getcwd fastcwd fastgetcwd);
@@ -199,15 +199,16 @@ if ($^O eq 'os2') {
     return 1;
 }
 
+# If loading the XS stuff doesn't work, we can fall back to pure perl
 eval {
-if ( $] >= 5.006 ) {
-  require XSLoader;
-  XSLoader::load( __PACKAGE__, $VERSION );
-} else {
-  require DynaLoader;
-  push @ISA, 'DynaLoader';
-  __PACKAGE__->bootstrap( $VERSION );
-}
+  if ( $] >= 5.006 ) {
+    require XSLoader;
+    XSLoader::load( __PACKAGE__, $VERSION );
+  } else {
+    require DynaLoader;
+    push @ISA, 'DynaLoader';
+    __PACKAGE__->bootstrap( $VERSION );
+  }
 };
 
 # Must be after the DynaLoader stuff:
diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm
index 44771c97eb..e1986a96d6 100644
--- a/lib/File/Spec.pm
+++ b/lib/File/Spec.pm
@@ -3,7 +3,7 @@ package File::Spec;
 use strict;
 use vars qw(@ISA $VERSION);
 
-$VERSION = '3.04';
+$VERSION = '3.05';
 $VERSION = eval $VERSION;
 
 my %module = (MacOS   => 'Mac',