Change 33263 by [EMAIL PROTECTED] on 2008/02/09 07:18:35
Upgrade to ExtUtils-CBuilder-0.22
Affected files ...
... //depot/perl/lib/ExtUtils/CBuilder.pm#12 edit
... //depot/perl/lib/ExtUtils/CBuilder/Base.pm#12 edit
... //depot/perl/lib/ExtUtils/CBuilder/Platform/Unix.pm#4 edit
... //depot/perl/lib/ExtUtils/CBuilder/Platform/Windows.pm#14 edit
... //depot/perl/lib/ExtUtils/CBuilder/Platform/aix.pm#4 edit
... //depot/perl/lib/ExtUtils/CBuilder/Platform/cygwin.pm#4 edit
... //depot/perl/lib/ExtUtils/CBuilder/Platform/darwin.pm#4 edit
... //depot/perl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm#4 edit
... //depot/perl/lib/ExtUtils/CBuilder/Platform/os2.pm#6 edit
Differences ...
==== //depot/perl/lib/ExtUtils/CBuilder.pm#12 (text) ====
Index: perl/lib/ExtUtils/CBuilder.pm
--- perl/lib/ExtUtils/CBuilder.pm#11~32205~ 2007-10-31 02:40:38.000000000
-0700
+++ perl/lib/ExtUtils/CBuilder.pm 2008-02-08 23:18:35.000000000 -0800
@@ -5,7 +5,7 @@
use File::Basename ();
use vars qw($VERSION @ISA);
-$VERSION = '0.21';
+$VERSION = '0.22';
$VERSION = eval $VERSION;
# Okay, this is the brute-force method of finding out what kind of
==== //depot/perl/lib/ExtUtils/CBuilder/Base.pm#12 (text) ====
Index: perl/lib/ExtUtils/CBuilder/Base.pm
--- perl/lib/ExtUtils/CBuilder/Base.pm#11~32205~ 2007-10-31
02:40:38.000000000 -0700
+++ perl/lib/ExtUtils/CBuilder/Base.pm 2008-02-08 23:18:35.000000000 -0800
@@ -8,7 +8,7 @@
use Text::ParseWords;
use vars qw($VERSION);
-$VERSION = '0.21';
+$VERSION = '0.22';
sub new {
my $class = shift;
==== //depot/perl/lib/ExtUtils/CBuilder/Platform/Unix.pm#4 (text) ====
Index: perl/lib/ExtUtils/CBuilder/Platform/Unix.pm
--- perl/lib/ExtUtils/CBuilder/Platform/Unix.pm#3~32205~ 2007-10-31
02:40:38.000000000 -0700
+++ perl/lib/ExtUtils/CBuilder/Platform/Unix.pm 2008-02-08 23:18:35.000000000
-0800
@@ -4,7 +4,7 @@
use ExtUtils::CBuilder::Base;
use vars qw($VERSION @ISA);
-$VERSION = '0.21';
+$VERSION = '0.22';
@ISA = qw(ExtUtils::CBuilder::Base);
sub link_executable {
==== //depot/perl/lib/ExtUtils/CBuilder/Platform/Windows.pm#14 (text) ====
Index: perl/lib/ExtUtils/CBuilder/Platform/Windows.pm
--- perl/lib/ExtUtils/CBuilder/Platform/Windows.pm#13~32205~ 2007-10-31
02:40:38.000000000 -0700
+++ perl/lib/ExtUtils/CBuilder/Platform/Windows.pm 2008-02-08
23:18:35.000000000 -0800
@@ -9,7 +9,7 @@
use ExtUtils::CBuilder::Base;
use vars qw($VERSION @ISA);
-$VERSION = '0.21';
+$VERSION = '0.22';
@ISA = qw(ExtUtils::CBuilder::Base);
sub new {
@@ -33,61 +33,14 @@
}
sub split_like_shell {
- # As it turns out, Windows command-parsing is very different from
- # Unix command-parsing. Double-quotes mean different things,
- # backslashes don't necessarily mean escapes, and so on. So we
- # can't use Text::ParseWords::shellwords() to break a command string
- # into words. The algorithm below was bashed out by Randy and Ken
- # (mostly Randy), and there are a lot of regression tests, so we
- # should feel free to adjust if desired.
-
+ # Since Windows will pass the whole command string (not an argument
+ # array) to the target program and make the program parse it itself,
+ # we don't actually need to do any processing here.
(my $self, local $_) = @_;
return @$_ if defined() && UNIVERSAL::isa($_, 'ARRAY');
-
- my @argv;
- return @argv unless defined() && length();
-
- my $arg = '';
- my( $i, $quote_mode ) = ( 0, 0 );
-
- while ( $i < length() ) {
-
- my $ch = substr( $_, $i , 1 );
- my $next_ch = substr( $_, $i+1, 1 );
-
- if ( $ch eq '\\' && $next_ch eq '"' ) {
- $arg .= '"';
- $i++;
- } elsif ( $ch eq '\\' && $next_ch eq '\\' ) {
- $arg .= '\\';
- $i++;
- } elsif ( $ch eq '"' && $next_ch eq '"' && $quote_mode ) {
- $quote_mode = !$quote_mode;
- $arg .= '"';
- $i++;
- } elsif ( $ch eq '"' && $next_ch eq '"' && !$quote_mode &&
- ( $i + 2 == length() ||
- substr( $_, $i + 2, 1 ) eq ' ' )
- ) { # for cases like: a"" => [ 'a' ]
- push( @argv, $arg );
- $arg = '';
- $i += 2;
- } elsif ( $ch eq '"' ) {
- $quote_mode = !$quote_mode;
- } elsif ( $ch eq ' ' && !$quote_mode ) {
- push( @argv, $arg ) if $arg;
- $arg = '';
- ++$i while substr( $_, $i + 1, 1 ) eq ' ';
- } else {
- $arg .= $ch;
- }
-
- $i++;
- }
-
- push( @argv, $arg ) if defined( $arg ) && length( $arg );
- return @argv;
+ return unless defined() && length();
+ return ($_);
}
sub arg_defines {
@@ -119,7 +72,7 @@
cflags => [
$self->split_like_shell($cf->{ccflags}),
$self->split_like_shell($cf->{cccdlflags}),
- $self->split_like_shell($cf->{extra_compiler_flags}),
+ $self->split_like_shell($args{extra_compiler_flags}),
],
optimize => [ $self->split_like_shell($cf->{optimize}) ],
defines => [EMAIL PROTECTED],
==== //depot/perl/lib/ExtUtils/CBuilder/Platform/aix.pm#4 (text) ====
Index: perl/lib/ExtUtils/CBuilder/Platform/aix.pm
--- perl/lib/ExtUtils/CBuilder/Platform/aix.pm#3~32205~ 2007-10-31
02:40:38.000000000 -0700
+++ perl/lib/ExtUtils/CBuilder/Platform/aix.pm 2008-02-08 23:18:35.000000000
-0800
@@ -5,7 +5,7 @@
use File::Spec;
use vars qw($VERSION @ISA);
-$VERSION = '0.21';
+$VERSION = '0.22';
@ISA = qw(ExtUtils::CBuilder::Platform::Unix);
sub need_prelink { 1 }
==== //depot/perl/lib/ExtUtils/CBuilder/Platform/cygwin.pm#4 (text) ====
Index: perl/lib/ExtUtils/CBuilder/Platform/cygwin.pm
--- perl/lib/ExtUtils/CBuilder/Platform/cygwin.pm#3~32205~ 2007-10-31
02:40:38.000000000 -0700
+++ perl/lib/ExtUtils/CBuilder/Platform/cygwin.pm 2008-02-08
23:18:35.000000000 -0800
@@ -5,7 +5,7 @@
use ExtUtils::CBuilder::Platform::Unix;
use vars qw($VERSION @ISA);
-$VERSION = '0.21';
+$VERSION = '0.22';
@ISA = qw(ExtUtils::CBuilder::Platform::Unix);
sub link_executable {
==== //depot/perl/lib/ExtUtils/CBuilder/Platform/darwin.pm#4 (text) ====
Index: perl/lib/ExtUtils/CBuilder/Platform/darwin.pm
--- perl/lib/ExtUtils/CBuilder/Platform/darwin.pm#3~32205~ 2007-10-31
02:40:38.000000000 -0700
+++ perl/lib/ExtUtils/CBuilder/Platform/darwin.pm 2008-02-08
23:18:35.000000000 -0800
@@ -4,7 +4,7 @@
use ExtUtils::CBuilder::Platform::Unix;
use vars qw($VERSION @ISA);
-$VERSION = '0.21';
+$VERSION = '0.22';
@ISA = qw(ExtUtils::CBuilder::Platform::Unix);
sub compile {
==== //depot/perl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm#4 (text) ====
Index: perl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm
--- perl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm#3~32205~ 2007-10-31
02:40:38.000000000 -0700
+++ perl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm 2008-02-08
23:18:35.000000000 -0800
@@ -6,7 +6,7 @@
use vars qw($VERSION @ISA);
@ISA = qw(ExtUtils::CBuilder::Platform::Unix);
-$VERSION = '0.21';
+$VERSION = '0.22';
sub link_executable {
my $self = shift;
==== //depot/perl/lib/ExtUtils/CBuilder/Platform/os2.pm#6 (text) ====
Index: perl/lib/ExtUtils/CBuilder/Platform/os2.pm
--- perl/lib/ExtUtils/CBuilder/Platform/os2.pm#5~32205~ 2007-10-31
02:40:38.000000000 -0700
+++ perl/lib/ExtUtils/CBuilder/Platform/os2.pm 2008-02-08 23:18:35.000000000
-0800
@@ -4,7 +4,7 @@
use ExtUtils::CBuilder::Platform::Unix;
use vars qw($VERSION @ISA);
-$VERSION = '0.21';
+$VERSION = '0.22';
@ISA = qw(ExtUtils::CBuilder::Platform::Unix);
sub need_prelink { 1 }
End of Patch.
