From 8a6e5c043e3987ad386f9f3b61130c021c5c1b95 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Wed, 31 Oct 2007 09:40:38 +0000 Subject: [PATCH] Upgrade to ExtUtils::CBuilder 0.21 p4raw-id: //depot/perl@32205 --- lib/ExtUtils/CBuilder.pm | 2 +- lib/ExtUtils/CBuilder/Base.pm | 6 ++++-- lib/ExtUtils/CBuilder/Changes | 12 ++++++++++++ lib/ExtUtils/CBuilder/Platform/Unix.pm | 2 +- lib/ExtUtils/CBuilder/Platform/VMS.pm | 2 +- lib/ExtUtils/CBuilder/Platform/Windows.pm | 2 +- lib/ExtUtils/CBuilder/Platform/aix.pm | 2 +- lib/ExtUtils/CBuilder/Platform/cygwin.pm | 2 +- lib/ExtUtils/CBuilder/Platform/darwin.pm | 2 +- lib/ExtUtils/CBuilder/Platform/dec_osf.pm | 2 +- lib/ExtUtils/CBuilder/Platform/os2.pm | 2 +- 11 files changed, 25 insertions(+), 11 deletions(-) diff --git a/lib/ExtUtils/CBuilder.pm b/lib/ExtUtils/CBuilder.pm index 3ca5034..fae01b1 100644 --- a/lib/ExtUtils/CBuilder.pm +++ b/lib/ExtUtils/CBuilder.pm @@ -5,7 +5,7 @@ use File::Path (); use File::Basename (); use vars qw($VERSION @ISA); -$VERSION = '0.19'; +$VERSION = '0.21'; $VERSION = eval $VERSION; # Okay, this is the brute-force method of finding out what kind of diff --git a/lib/ExtUtils/CBuilder/Base.pm b/lib/ExtUtils/CBuilder/Base.pm index bd60506..0c08ab7 100644 --- a/lib/ExtUtils/CBuilder/Base.pm +++ b/lib/ExtUtils/CBuilder/Base.pm @@ -3,11 +3,12 @@ package ExtUtils::CBuilder::Base; use strict; use File::Spec; use File::Basename; +use Cwd (); use Config; use Text::ParseWords; use vars qw($VERSION); -$VERSION = '0.12'; +$VERSION = '0.21'; sub new { my $class = shift; @@ -252,7 +253,7 @@ sub perl_src { && -f File::Spec->catfile($dir,"lib","Exporter.pm") ) { - return $dir; + return Cwd::realpath( $dir ); } $dir = File::Spec->catdir($dir, $Updir); @@ -271,6 +272,7 @@ sub perl_inc { sub DESTROY { my $self = shift; + local($., $@, $!, $^E, $?); $self->cleanup(); } diff --git a/lib/ExtUtils/CBuilder/Changes b/lib/ExtUtils/CBuilder/Changes index c38a5dd..fbf6f4a 100644 --- a/lib/ExtUtils/CBuilder/Changes +++ b/lib/ExtUtils/CBuilder/Changes @@ -1,5 +1,17 @@ Revision history for Perl extension ExtUtils::CBuilder. + - Clean up perl_src path using Cwd::realpath(). Only affects usage + as part of the perl core. + + - Protect $., $@, $!, $^E, and $? from any clobbering that might + occur in our DESTROY method. [Zefram] + + - From bleadperl, a patch to clean up debug symbol files (.pdb for + VC++, .tds for BCC) when running have_compiler(). [Steve Hay & + Steve Peters] + +0.19 - Sun May 13 14:29:18 2007 + - When building as part of the perl core (so this is irrelevant for people downloading from CPAN) we now try a little harder to find the perl sources. [Jos Boumans] diff --git a/lib/ExtUtils/CBuilder/Platform/Unix.pm b/lib/ExtUtils/CBuilder/Platform/Unix.pm index 1d874d4..3fa7378 100644 --- a/lib/ExtUtils/CBuilder/Platform/Unix.pm +++ b/lib/ExtUtils/CBuilder/Platform/Unix.pm @@ -4,7 +4,7 @@ use strict; use ExtUtils::CBuilder::Base; use vars qw($VERSION @ISA); -$VERSION = '0.12'; +$VERSION = '0.21'; @ISA = qw(ExtUtils::CBuilder::Base); sub link_executable { diff --git a/lib/ExtUtils/CBuilder/Platform/VMS.pm b/lib/ExtUtils/CBuilder/Platform/VMS.pm index 9921f61..467adf3 100644 --- a/lib/ExtUtils/CBuilder/Platform/VMS.pm +++ b/lib/ExtUtils/CBuilder/Platform/VMS.pm @@ -4,7 +4,7 @@ use strict; use ExtUtils::CBuilder::Base; use vars qw($VERSION @ISA); -$VERSION = '0.12'; +$VERSION = '0.21'; @ISA = qw(ExtUtils::CBuilder::Base); sub need_prelink { 0 } diff --git a/lib/ExtUtils/CBuilder/Platform/Windows.pm b/lib/ExtUtils/CBuilder/Platform/Windows.pm index 027d062..7b74ae0 100644 --- a/lib/ExtUtils/CBuilder/Platform/Windows.pm +++ b/lib/ExtUtils/CBuilder/Platform/Windows.pm @@ -9,7 +9,7 @@ use File::Spec; use ExtUtils::CBuilder::Base; use vars qw($VERSION @ISA); -$VERSION = '0.13_01'; +$VERSION = '0.21'; @ISA = qw(ExtUtils::CBuilder::Base); sub new { diff --git a/lib/ExtUtils/CBuilder/Platform/aix.pm b/lib/ExtUtils/CBuilder/Platform/aix.pm index f759404..6ad2a68 100644 --- a/lib/ExtUtils/CBuilder/Platform/aix.pm +++ b/lib/ExtUtils/CBuilder/Platform/aix.pm @@ -5,7 +5,7 @@ use ExtUtils::CBuilder::Platform::Unix; use File::Spec; use vars qw($VERSION @ISA); -$VERSION = '0.12'; +$VERSION = '0.21'; @ISA = qw(ExtUtils::CBuilder::Platform::Unix); sub need_prelink { 1 } diff --git a/lib/ExtUtils/CBuilder/Platform/cygwin.pm b/lib/ExtUtils/CBuilder/Platform/cygwin.pm index 88c979d..623fe0a 100644 --- a/lib/ExtUtils/CBuilder/Platform/cygwin.pm +++ b/lib/ExtUtils/CBuilder/Platform/cygwin.pm @@ -5,7 +5,7 @@ use File::Spec; use ExtUtils::CBuilder::Platform::Unix; use vars qw($VERSION @ISA); -$VERSION = '0.12'; +$VERSION = '0.21'; @ISA = qw(ExtUtils::CBuilder::Platform::Unix); sub link_executable { diff --git a/lib/ExtUtils/CBuilder/Platform/darwin.pm b/lib/ExtUtils/CBuilder/Platform/darwin.pm index 6426601..3b0cfb4 100644 --- a/lib/ExtUtils/CBuilder/Platform/darwin.pm +++ b/lib/ExtUtils/CBuilder/Platform/darwin.pm @@ -4,7 +4,7 @@ use strict; use ExtUtils::CBuilder::Platform::Unix; use vars qw($VERSION @ISA); -$VERSION = '0.12'; +$VERSION = '0.21'; @ISA = qw(ExtUtils::CBuilder::Platform::Unix); sub compile { diff --git a/lib/ExtUtils/CBuilder/Platform/dec_osf.pm b/lib/ExtUtils/CBuilder/Platform/dec_osf.pm index 363a5d1..cb7a9e3 100644 --- a/lib/ExtUtils/CBuilder/Platform/dec_osf.pm +++ b/lib/ExtUtils/CBuilder/Platform/dec_osf.pm @@ -6,7 +6,7 @@ use File::Spec; use vars qw($VERSION @ISA); @ISA = qw(ExtUtils::CBuilder::Platform::Unix); -$VERSION = '0.01'; +$VERSION = '0.21'; sub link_executable { my $self = shift; diff --git a/lib/ExtUtils/CBuilder/Platform/os2.pm b/lib/ExtUtils/CBuilder/Platform/os2.pm index 0683819..4657c59 100644 --- a/lib/ExtUtils/CBuilder/Platform/os2.pm +++ b/lib/ExtUtils/CBuilder/Platform/os2.pm @@ -4,7 +4,7 @@ use strict; use ExtUtils::CBuilder::Platform::Unix; use vars qw($VERSION @ISA); -$VERSION = '0.13'; +$VERSION = '0.21'; @ISA = qw(ExtUtils::CBuilder::Platform::Unix); sub need_prelink { 1 } -- 2.7.4