[perl.git] branch blead, updated. v5.15.1-64-g747627e

[Steffen Mueller]

In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/747627ec455e0765e07733ece1545aa3f728a00a?hp=db147d7ee1c1aca547b1d63ef7141e56821a3ae2>

- Log -----------------------------------------------------------------
commit 747627ec455e0765e07733ece1545aa3f728a00a
Author: Steffen Mueller <smuel...@cpan.org>
Date:   Wed Jul 27 12:45:09 2011 +0200

    EU::ParseXS: Fix CPAN RT #53938, #61908
    
    Both of these are attempts to fix win32 problems:
    
    Bug #61908 for ExtUtils-ParseXS: MSWin compilers and back-slashed paths
    Bug #53938 for ExtUtils-ParseXS: MinGW Broken after 2.21
    
    Also bumps the version to 3.00_04.
-----------------------------------------------------------------------

Summary of changes:
 dist/ExtUtils-ParseXS/Changes                 |    7 +++++++
 dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm |    9 ++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/dist/ExtUtils-ParseXS/Changes b/dist/ExtUtils-ParseXS/Changes
index 476132d..f7d3213 100644
--- a/dist/ExtUtils-ParseXS/Changes
+++ b/dist/ExtUtils-ParseXS/Changes
@@ -1,5 +1,12 @@
 Revision history for Perl extension ExtUtils::ParseXS.
 
+3.00_04 -
+
+  - Patches from CPAN RT #53938, #61908
+    Both of these are attempts to fix win32 problems:
+    Bug #61908 for ExtUtils-ParseXS: MSWin compilers and back-slashed paths
+    Bug #53938 for ExtUtils-ParseXS: MinGW Broken after 2.21
+
 3.00_03 - Fri Jul 22 20:13:00 CET 2011
 
   - Add some diagnostics when xsubpp fails to load a current-enough
diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm 
b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
index 52f3c21..0fcae56 100644
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
@@ -35,7 +35,7 @@ our @EXPORT_OK = qw(
   process_file
   report_error_count
 );
-our $VERSION = '3.00_03';
+our $VERSION = '3.00_04';
 $VERSION = eval $VERSION if $VERSION =~ /_/;
 
 # The scalars in the line below remain as 'our' variables because pulling
@@ -1494,7 +1494,9 @@ sub INCLUDE_handler {
 EOF
 
   $self->{filename} = $_;
-  $self->{filepathname} = File::Spec->catfile($self->{dir}, $self->{filename});
+  $self->{filepathname} = ( $^O =~ /^mswin/i )
+                          ? qq($self->{dir}/$self->{filename}) # See CPAN RT 
#61908: gcc doesn't like backslashes on win32?
+                          : File::Spec->catfile($self->{dir}, 
$self->{filename});
 
   # Prime the pump by reading the first
   # non-blank line
@@ -1553,7 +1555,8 @@ EOF
 
   $self->{filename} = $_;
   $self->{filepathname} = $self->{filename};
-  $self->{filepathname} =~ s/\"/\\"/g;
+  #$self->{filepathname} =~ s/\"/\\"/g; # Fails? See CPAN RT #53938: MinGW 
Broken after 2.21
+  $self->{filepathname} =~ s/\\/\\\\/g; # Works according to reporter of #53938
 
   # Prime the pump by reading the first
   # non-blank line

--
Perl5 Master Repository