135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update M::I

Browse Source
This commit is contained in:
Oliver Gorwits
2017-01-06 14:33:27 +00:00
parent bf3ffc460b
commit 33a37ffe06
10 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Netdisco/inc/Module/Install.pm
View File

@@ -31,7 +31,7 @@ BEGIN {
# This is not enforced yet, but will be some time in the next few # This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom # releases once we can make sure it won't clash with custom
# Module::Install extensions. # Module::Install extensions.
$VERSION = '1.16'; $VERSION = '1.17';
# Storage for the pseudo-singleton # Storage for the pseudo-singleton
$MAIN = undef; $MAIN = undef;
@@ -244,6 +244,8 @@ sub new {
} }
return $args{_self} if $args{_self}; return $args{_self} if $args{_self};
$base_path = VMS::Filespec::unixify($base_path) if $^O eq 'VMS';
$args{dispatch} ||= 'Admin'; $args{dispatch} ||= 'Admin';
$args{prefix} ||= 'inc'; $args{prefix} ||= 'inc';
$args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author');
@@ -322,7 +324,7 @@ sub find_extensions {
my ($self, $path) = @_; my ($self, $path) = @_;
my @found; my @found;
File::Find::find( sub { File::Find::find( {no_chdir => 1, wanted => sub {
my $file = $File::Find::name; my $file = $File::Find::name;
return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is;
my $subpath = $1; my $subpath = $1;
@@ -336,7 +338,7 @@ sub find_extensions {
# correctly. Otherwise, root through the file to locate the case-preserved # correctly. Otherwise, root through the file to locate the case-preserved
# version of the package name. # version of the package name.
if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
my $content = Module::Install::_read($subpath . '.pm'); my $content = Module::Install::_read($File::Find::name);
my $in_pod = 0; my $in_pod = 0;
foreach ( split /\n/, $content ) { foreach ( split /\n/, $content ) {
$in_pod = 1 if /^=\w/; $in_pod = 1 if /^=\w/;
@@ -351,7 +353,7 @@ sub find_extensions {
} }
push @found, [ $file, $pkg ]; push @found, [ $file, $pkg ];
}, $path ) if -d $path; }}, $path ) if -d $path;
@found; @found;
} }
@@ -373,8 +375,6 @@ sub _caller {
return $call; return $call;
} }
# Done in evals to avoid confusing Perl::MinimumVersion
eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _read { sub _read {
local *FH; local *FH;
open( FH, '<', $_[0] ) or die "open($_[0]): $!"; open( FH, '<', $_[0] ) or die "open($_[0]): $!";
@@ -383,16 +383,6 @@ sub _read {
close FH or die "close($_[0]): $!"; close FH or die "close($_[0]): $!";
return $string; return $string;
} }
END_NEW
sub _read {
local *FH;
open( FH, "< $_[0]" ) or die "open($_[0]): $!";
binmode FH;
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
return $string;
}
END_OLD
sub _readperl { sub _readperl {
my $string = Module::Install::_read($_[0]); my $string = Module::Install::_read($_[0]);
@@ -413,8 +403,6 @@ sub _readpod {
return $string; return $string;
} }
# Done in evals to avoid confusing Perl::MinimumVersion
eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _write { sub _write {
local *FH; local *FH;
open( FH, '>', $_[0] ) or die "open($_[0]): $!"; open( FH, '>', $_[0] ) or die "open($_[0]): $!";
@@ -424,17 +412,6 @@ sub _write {
} }
close FH or die "close($_[0]): $!"; close FH or die "close($_[0]): $!";
} }
END_NEW
sub _write {
local *FH;
open( FH, "> $_[0]" ) or die "open($_[0]): $!";
binmode FH;
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
}
close FH or die "close($_[0]): $!";
}
END_OLD
# _version is for processing module versions (eg, 1.03_05) not # _version is for processing module versions (eg, 1.03_05) not
# Perl versions (eg, 5.8.1). # Perl versions (eg, 5.8.1).

2
Netdisco/inc/Module/Install/Base.pm
View File

@@ -4,7 +4,7 @@ package Module::Install::Base;
use strict 'vars'; use strict 'vars';
use vars qw{$VERSION}; use vars qw{$VERSION};
BEGIN { BEGIN {
$VERSION = '1.16'; $VERSION = '1.17';
} }
# Suspend handler for "redefined" warnings # Suspend handler for "redefined" warnings

13
Netdisco/inc/Module/Install/Can.pm
View File

@@ -8,7 +8,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.16'; $VERSION = '1.17';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }
@@ -121,6 +121,15 @@ END_C
# Can we locate a (the) C compiler # Can we locate a (the) C compiler
sub can_cc { sub can_cc {
my $self = shift; my $self = shift;
if ($^O eq 'VMS') {
require ExtUtils::CBuilder;
my $builder = ExtUtils::CBuilder->new(
quiet => 1,
);
return $builder->have_compiler;
}
my @chunks = split(/ /, $Config::Config{cc}) or return; my @chunks = split(/ /, $Config::Config{cc}) or return;
# $Config{cc} may contain args; try to find out the program part # $Config{cc} may contain args; try to find out the program part
@@ -151,4 +160,4 @@ if ( $^O eq 'cygwin' ) {
__END__ __END__
#line 236 #line 245

2
Netdisco/inc/Module/Install/Fetch.pm
View File

@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.16'; $VERSION = '1.17';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }

2
Netdisco/inc/Module/Install/Makefile.pm
View File

@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.16'; $VERSION = '1.17';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }

2
Netdisco/inc/Module/Install/Metadata.pm
View File

@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.16'; $VERSION = '1.17';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }

2
Netdisco/inc/Module/Install/Scripts.pm
View File

@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.16'; $VERSION = '1.17';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }

2
Netdisco/inc/Module/Install/Share.pm
View File

@@ -8,7 +8,7 @@ use ExtUtils::Manifest ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.16'; $VERSION = '1.17';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }

2
Netdisco/inc/Module/Install/Win32.pm
View File

@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.16'; $VERSION = '1.17';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }

2
Netdisco/inc/Module/Install/WriteAll.pm
View File

@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.16'; $VERSION = '1.17';
@ISA = qw{Module::Install::Base}; @ISA = qw{Module::Install::Base};
$ISCORE = 1; $ISCORE = 1;
} }