r60059 - in /branches/upstream/libextutils-parsexs-perl/current: Changes META.yml lib/ExtUtils/ParseXS.pm

[ansgar-guest at users.alioth.debian.org]

Author: ansgar-guest
Date: Mon Jul  5 02:18:43 2010
New Revision: 60059

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=60059
Log:
[svn-upgrade] new version libextutils-parsexs-perl (2.220600)

Modified:
    branches/upstream/libextutils-parsexs-perl/current/Changes
    branches/upstream/libextutils-parsexs-perl/current/META.yml
    branches/upstream/libextutils-parsexs-perl/current/lib/ExtUtils/ParseXS.pm

Modified: branches/upstream/libextutils-parsexs-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-parsexs-perl/current/Changes?rev=60059&op=diff
==============================================================================
--- branches/upstream/libextutils-parsexs-perl/current/Changes (original)
+++ branches/upstream/libextutils-parsexs-perl/current/Changes Mon Jul  5 02:18:43 2010
@@ -1,4 +1,15 @@
 Revision history for Perl extension ExtUtils::ParseXS.
+
+2.2206 - Sun Jul  4 15:43:21 EDT 2010
+
+ Bug fixes:
+
+ - Make xsubpp accept the _ prototype (RT#57157) [Rafael Garcia-Suarez]
+
+ - INCLUDE_COMMAND portability fixes for VMS (RT#58181) [Craig Berry]
+
+ - INCLUDE_COMMAND fixes to detect non-zero exit codes (RT#52873)
+   [Steffen Mueller]
 
 2.2205 - Wed Mar 10 18:15:36 EST 2010
 

Modified: branches/upstream/libextutils-parsexs-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-parsexs-perl/current/META.yml?rev=60059&op=diff
==============================================================================
--- branches/upstream/libextutils-parsexs-perl/current/META.yml (original)
+++ branches/upstream/libextutils-parsexs-perl/current/META.yml Mon Jul  5 02:18:43 2010
@@ -17,7 +17,7 @@
 provides:
   ExtUtils::ParseXS:
     file: lib/ExtUtils/ParseXS.pm
-    version: 2.2205
+    version: 2.2206
 requires:
   Cwd: 0
   Exporter: 0
@@ -29,4 +29,4 @@
   bugtracker: http://rt.cpan.org/Dist/Display.html?Queue=ExtUtils-ParseXS
   license: http://dev.perl.org/licenses/
   repository: git://github.com/dagolden/extutils-parsexs.git
-version: 2.2205
+version: 2.2206

Modified: branches/upstream/libextutils-parsexs-perl/current/lib/ExtUtils/ParseXS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-parsexs-perl/current/lib/ExtUtils/ParseXS.pm?rev=60059&op=diff
==============================================================================
--- branches/upstream/libextutils-parsexs-perl/current/lib/ExtUtils/ParseXS.pm (original)
+++ branches/upstream/libextutils-parsexs-perl/current/lib/ExtUtils/ParseXS.pm Mon Jul  5 02:18:43 2010
@@ -18,7 +18,7 @@
 my($XSS_work_idx, $cpp_next_tmp);
 
 use vars qw($VERSION);
-$VERSION = '2.2205';
+$VERSION = '2.2206';
 $VERSION = eval $VERSION if $VERSION =~ /_/;
 
 use vars qw(%input_expr %output_expr $ProtoUsed @InitFileCode $FH $proto_re $Overload $errors $Fallback
@@ -74,7 +74,7 @@
   ($XSS_work_idx, $cpp_next_tmp) = (0, "XSubPPtmpAAAA");
   @InitFileCode = ();
   $FH = Symbol::gensym();
-  $proto_re = "[" . quotemeta('\$%&*@;[]') . "]" ;
+  $proto_re = "[" . quotemeta('\$%&*@;[]_') . "]" ;
   $Overload = 0;
   $errors = 0;
   $Fallback = '&PL_sv_undef';
@@ -1488,6 +1488,7 @@
 
 sub PushXSStack
   {
+    my %args = @_;
     # Save the current file context.
     push(@XSStack, {
 		    type            => 'file',
@@ -1498,6 +1499,8 @@
 		    Filename        => $filename,
 		    Filepathname    => $filepathname,
 		    Handle          => $FH,
+                    IsPipe          => scalar($filename =~ /\|\s*$/),
+                    %args,
 		   }) ;
 
   }
@@ -1543,7 +1546,7 @@
 EOF
 
     $filename = $_ ;
-    $filepathname = "$dir/$filename";
+    $filepathname = File::Spec->catfile($dir, $filename);
 
     # Prime the pump by reading the first
     # non-blank line
@@ -1557,19 +1560,31 @@
     $lastline_no = $. ;
   }
 
+sub QuoteArgs {
+    my $cmd = shift;
+    my @args = split /\s+/, $cmd;
+    $cmd = shift @args;
+    for (@args) {
+       $_ = q(").$_.q(") if !/^\"/ && length($_) > 0;
+    }
+    return join (' ', ($cmd, @args));
+  }
+
 sub INCLUDE_COMMAND_handler ()
   {
     # the rest of the current line should contain a valid command
 
     TrimWhitespace($_) ;
 
+    $_ = QuoteArgs($_) if $^O eq 'VMS';
+
     death("INCLUDE_COMMAND: command missing")
       unless $_ ;
 
     death("INCLUDE_COMMAND: pipes are illegal")
       if /^\s*\|/ or /\|\s*$/ ;
 
-    PushXSStack();
+    PushXSStack( IsPipe => 1 );
 
     $FH = Symbol::gensym();
 
@@ -1588,7 +1603,8 @@
 EOF
 
     $filename = $_ ;
-    $filepathname = "$dir/$filename";
+    $filepathname = $filename;
+    $filepathname =~ s/\"/\\"/g;
 
     # Prime the pump by reading the first
     # non-blank line
@@ -1608,7 +1624,7 @@
 
     my $data     = pop @XSStack ;
     my $ThisFile = $filename ;
-    my $isPipe   = ($filename =~ /\|\s*$/) ;
+    my $isPipe   = $data->{IsPipe};
 
     -- $IncludedFiles{$filename}
       unless $isPipe ;