diff options
| author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2013-07-24 08:04:25 +0100 |
|---|---|---|
| committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2013-07-24 09:28:41 +0100 |
| commit | eb7cfb310cbb07e1385c0580a4ee80816e35043b (patch) | |
| tree | f0b3824a4d929a6646cac31fda906bb189c29af0 /cpan/ExtUtils-MakeMaker | |
| parent | e3f631a2ef048ba2143d89876faec9463d40382b (diff) | |
| download | perl-eb7cfb310cbb07e1385c0580a4ee80816e35043b.tar.gz | |
Update ExtUtils-MakeMaker to CPAN version 6.70
[DELTA]
6.70 Tue Jul 23 21:55:23 BST 2013
No changes from 6.69_09
6.69_09 Sun Jul 21 09:22:40 BST 2013
Bug Fixes:
* RT#86976 Fix version parsing bug introduced in 6.69_05
Part Deux :)
6.69_08 Wed Jul 17 00:36:28 BST 2013
Bug Fixes:
* RT#86976 Fix version parsing bug introduced in 6.69_05
6.69_07 Tue Jul 16 15:32:25 BST 2013
New features:
* RT#4550 report the file created after make dist
Bug Fixes:
* RT#66113 strip control characters from ABSTRACT
* RT#20662 Don't check for config.h if it doesn't exist
6.69_06 Fri Jul 12 14:49:32 BST 2013
Bug Fixes:
* RT#64163 clean_subdirs infinite loop if subdir already gone
* RT#79348 doesn't support miniperl in installation paths
Doc Fixes:
* Fix META_MERGE example
* RT#31053 Mention configure_requires in PREREQ_FATAL documentation
* RT#14680 Document TEST_FILES usage with 'make test'
* RT#21285 Document 'make veryclean'
6.69_05 Thu Jul 11 22:10:10 BST 2013
Bug Fixes:
* Resolve RT#9452 regression with
parse_version() (Victor Efimov)
* RT#28632 use LD and OPTIMIZE in recursive Makefile.PL
invocations (Niko Tyni)
6.69_04 Wed Jul 10 11:48:22 BST 2013
Cygwin Fixes:
* Revert RT#54703 and apply patch from RT#69401 to
resolve /cygdrive issues (Reini Urban)
6.69_03 Tue Jul 9 22:39:54 BST 2013
Bug Fixes:
* RT#61419 Avoid invisible interactive question when
rebuilding Makefile (Slaven Rezic)
* VERSION also now really handles v-strings correctly.
Cygwin Fixes:
* RT#54703 - Don't hardcode /cygdrive (Jerry Hedden)
Misc:
* Install into site when 5.12 or above
6.69_02 Tue Jul 2 13:12:51 BST 2013
Bug Fixes:
* [RT#86609] VERSION_FROM now handles v-strings correctly.
* VERSION also now handles v-strings correctly.
Misc:
* Updated bundled CPAN::Meta and removed Version::Requirements
6.69_01 Thu Jun 20 12:49:45 BST 2013
Win32 Fixes:
* resolve regression on Win32 introduced in 6.67_01
(bingos)
Diffstat (limited to 'cpan/ExtUtils-MakeMaker')
71 files changed, 598 insertions, 449 deletions
diff --git a/cpan/ExtUtils-MakeMaker/Changes b/cpan/ExtUtils-MakeMaker/Changes index 3ebedcf0d9..e785d906a8 100644 --- a/cpan/ExtUtils-MakeMaker/Changes +++ b/cpan/ExtUtils-MakeMaker/Changes @@ -1,3 +1,71 @@ +6.70 Tue Jul 23 21:55:23 BST 2013 + No changes from 6.69_09 + +6.69_09 Sun Jul 21 09:22:40 BST 2013 + Bug Fixes: + * RT#86976 Fix version parsing bug introduced in 6.69_05 + Part Deux :) + +6.69_08 Wed Jul 17 00:36:28 BST 2013 + Bug Fixes: + * RT#86976 Fix version parsing bug introduced in 6.69_05 + +6.69_07 Tue Jul 16 15:32:25 BST 2013 + New features: + * RT#4550 report the file created after make dist + + Bug Fixes: + * RT#66113 strip control characters from ABSTRACT + * RT#20662 Don't check for config.h if it doesn't exist + +6.69_06 Fri Jul 12 14:49:32 BST 2013 + Bug Fixes: + * RT#64163 clean_subdirs infinite loop if subdir already gone + * RT#79348 doesn't support miniperl in installation paths + + Doc Fixes: + * Fix META_MERGE example + * RT#31053 Mention configure_requires in PREREQ_FATAL documentation + * RT#14680 Document TEST_FILES usage with 'make test' + * RT#21285 Document 'make veryclean' + +6.69_05 Thu Jul 11 22:10:10 BST 2013 + Bug Fixes: + * Resolve RT#9452 regression with + parse_version() (Victor Efimov) + * RT#28632 use LD and OPTIMIZE in recursive Makefile.PL + invocations (Niko Tyni) + +6.69_04 Wed Jul 10 11:48:22 BST 2013 + Cygwin Fixes: + * Revert RT#54703 and apply patch from RT#69401 to + resolve /cygdrive issues (Reini Urban) + +6.69_03 Tue Jul 9 22:39:54 BST 2013 + Bug Fixes: + * RT#61419 Avoid invisible interactive question when + rebuilding Makefile (Slaven Rezic) + * VERSION also now really handles v-strings correctly. + + Cygwin Fixes: + * RT#54703 - Don't hardcode /cygdrive (Jerry Hedden) + + Misc: + * Install into site when 5.12 or above + +6.69_02 Tue Jul 2 13:12:51 BST 2013 + Bug Fixes: + * [RT#86609] VERSION_FROM now handles v-strings correctly. + * VERSION also now handles v-strings correctly. + + Misc: + * Updated bundled CPAN::Meta and removed Version::Requirements + +6.69_01 Thu Jun 20 12:49:45 BST 2013 + Win32 Fixes: + * resolve regression on Win32 introduced in 6.67_01 + (bingos) + 6.68 Fri Jun 14 23:26:11 BST 2013 No changes from 6.67_05 diff --git a/cpan/ExtUtils-MakeMaker/MANIFEST b/cpan/ExtUtils-MakeMaker/MANIFEST index e470faaa20..18704a625f 100644 --- a/cpan/ExtUtils-MakeMaker/MANIFEST +++ b/cpan/ExtUtils-MakeMaker/MANIFEST @@ -6,6 +6,7 @@ bundled/CPAN-Meta/CPAN/Meta/Converter.pm bundled/CPAN-Meta/CPAN/Meta/Feature.pm bundled/CPAN-Meta/CPAN/Meta/History.pm bundled/CPAN-Meta/CPAN/Meta/Prereqs.pm +bundled/CPAN-Meta/CPAN/Meta/Requirements.pm bundled/CPAN-Meta/CPAN/Meta/Spec.pm bundled/CPAN-Meta/CPAN/Meta/Validator.pm bundled/ExtUtils-Command/ExtUtils/Command.pm @@ -25,7 +26,6 @@ bundled/Scalar-List-Utils/List/Util.pm bundled/Scalar-List-Utils/List/Util/PP.pm bundled/Scalar-List-Utils/Scalar/Util.pm bundled/Scalar-List-Utils/Scalar/Util/PP.pm -bundled/Version-Requirements/Version/Requirements.pm bundled/version/version.pm bundled/version/version.pod bundled/version/version/Internals.pod diff --git a/cpan/ExtUtils-MakeMaker/bin/instmodsh b/cpan/ExtUtils-MakeMaker/bin/instmodsh index 5874aa61c7..8b9aa95ae7 100644 --- a/cpan/ExtUtils-MakeMaker/bin/instmodsh +++ b/cpan/ExtUtils-MakeMaker/bin/instmodsh @@ -82,8 +82,8 @@ sub list_installed { print("$class files in $module are:\n ", join("\n ", @files), "\n"); } - else { - print($@); + else { + print($@); } }; @@ -99,8 +99,8 @@ sub list_directories { print("$class directories in $module are:\n ", join("\n ", @dirs), "\n"); } - else { - print($@); + else { + print($@); } } diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm index dcedd2cf1d..aaa38fcbf6 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm @@ -8,9 +8,9 @@ use warnings; require Exporter; our @ISA = qw(Exporter); -our @EXPORT = qw(test_harness pod2man perllocal_install uninstall +our @EXPORT = qw(test_harness pod2man perllocal_install uninstall warn_if_old_packlist); -our $VERSION = '6.68'; +our $VERSION = '6.70'; my $Is_VMS = $^O eq 'VMS'; @@ -108,7 +108,7 @@ sub pod2man { # our arguments into @ARGV. Should be safe. my %options = (); Getopt::Long::config ('bundling_override'); - Getopt::Long::GetOptions (\%options, + Getopt::Long::GetOptions (\%options, 'section|s=s', 'release|r=s', 'center|c=s', 'date|d=s', 'fixed=s', 'fixedbold=s', 'fixeditalic=s', 'fixedbolditalic=s', 'official|o', 'quotes|q=s', 'lax|l', @@ -174,7 +174,7 @@ PACKLIST_WARNING =item B<perllocal_install> - perl "-MExtUtils::Command::MM" -e perllocal_install + perl "-MExtUtils::Command::MM" -e perllocal_install <type> <module name> <key> <value> ... # VMS only, key|value pairs come on STDIN @@ -193,7 +193,7 @@ Key/value pairs are extra information about the module. Fields include: installed into which directory your module was out into LINKTYPE dynamic or static linking VERSION module version number - EXE_FILES any executables installed in a space seperated + EXE_FILES any executables installed in a space seperated list =cut @@ -209,9 +209,9 @@ sub perllocal_install { my $pod; $pod = sprintf <<POD, scalar localtime; =head2 %s: C<$type> L<$name|$name> - + =over 4 - + POD do { @@ -219,9 +219,9 @@ POD $pod .= <<POD =item * - + C<$key: $val> - + POD } while(@mod_info); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm index 9abb959139..1f97785e94 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm @@ -2,7 +2,7 @@ package ExtUtils::Liblist; use strict; -our $VERSION = '6.68'; +our $VERSION = '6.70'; use File::Spec; require ExtUtils::Liblist::Kid; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm index 48509d548a..a026e44102 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm @@ -11,7 +11,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '6.68'; +our $VERSION = '6.70'; use ExtUtils::MakeMaker::Config; use Cwd 'cwd'; @@ -152,7 +152,7 @@ sub _unix_os2_ext { } elsif ( -f ( $fullname = "$thispth/lib$thislib.dll$Config_libext" ) ) { } - elsif ( -f ( $fullname = "$thispth/$thislib.dll" ) ) { + elsif ( $^O eq 'cygwin' && -f ( $fullname = "$thispth/$thislib.dll" ) ) { } elsif ( -f ( $fullname = "$thispth/Slib$thislib$Config_libext" ) ) { } diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm index f2cb557016..e310c6fd09 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm @@ -3,7 +3,7 @@ package ExtUtils::MM; use strict; use ExtUtils::MakeMaker::Config; -our $VERSION = '6.68'; +our $VERSION = '6.70'; require ExtUtils::Liblist; require ExtUtils::MakeMaker; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm index 21caf79276..5558e4ca08 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_AIX; use strict; -our $VERSION = '6.68'; +our $VERSION = '6.70'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm index 7f8dfcbbae..93769e8b11 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_Any; use strict; -our $VERSION = '6.68'; +our $VERSION = '6.70'; use Carp; use File::Spec; @@ -66,7 +66,7 @@ These are methods which help writing cross-platform code. my @os_flavor = $mm->os_flavor; @os_flavor is the style of operating system this is, usually -corresponding to the MM_*.pm file we're using. +corresponding to the MM_*.pm file we're using. The first element of @os_flavor is the major family (ie. Unix, Windows, VMS, OS/2, etc...) and the rest are sub families. @@ -80,7 +80,7 @@ Some examples: MacOS X ('Unix', 'Darwin', 'MacOS', 'MacOS X') OS/2 ('OS/2') -This is used to write code for styles of operating system. +This is used to write code for styles of operating system. See os_flavor_is() for use. @@ -236,7 +236,7 @@ sub echo { $opts->{allow_variables} = 0 unless defined $opts->{allow_variables}; my $ql_opts = { allow_variables => $opts->{allow_variables} }; - my @cmds = map { '$(NOECHO) $(ECHO) '.$self->quote_literal($_, $ql_opts) } + my @cmds = map { '$(NOECHO) $(ECHO) '.$self->quote_literal($_, $ql_opts) } split /\n/, $text; if( $file ) { my $redirect = $opts->{append} ? '>>' : '>'; @@ -578,6 +578,7 @@ clean :: clean_subdirs # Leave Makefile.old around for realclean push @m, <<'MAKE'; + - $(NOECHO) $(RM_F) $(MAKEFILE_OLD) - $(MV) $(FIRST_MAKEFILE) $(MAKEFILE_OLD) $(DEV_NULL) MAKE @@ -610,7 +611,7 @@ NOOP_FRAG for my $dir (@{$self->{DIR}}) { my $subclean = $self->oneliner(sprintf <<'CODE', $dir); -chdir '%s'; system '$(MAKE) clean' if -f '$(FIRST_MAKEFILE)'; +exit 0 unless chdir '%s'; system '$(MAKE) clean' if -f '$(FIRST_MAKEFILE)'; CODE $clean .= "\t$subclean\n"; @@ -822,13 +823,13 @@ MAKE_FRAG $self->{META_ADD} || {}, $self->{META_MERGE} || {}, ); - + _fix_metadata_before_conversion( \%metadata ); # paper over validation issues, but still complain, necessary because # there's no guarantee that the above will fix ALL errors my $meta = eval { CPAN::Meta->create( \%metadata, { lazy_validation => 1 } ) }; - warn $@ if $@ and + warn $@ if $@ and $@ !~ /encountered CODE.*, but JSON can only represent references to arrays or hashes/; # use the original metadata straight if the conversion failed @@ -925,7 +926,7 @@ sub _fix_metadata_before_conversion { my @pairs = _sort_pairs($sort_sub, \%hash); -Sorts the pairs of a hash based on keys ordered according +Sorts the pairs of a hash based on keys ordered according to C<$sort_sub>. =end private @@ -986,7 +987,7 @@ sub metafile_data { generated_by => "ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION", 'meta-spec' => { - url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', + url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', version => 1.4 }, ); @@ -1126,24 +1127,24 @@ sub _normalize_version { Implements a fake YAML dumper for a hash given as a list of pairs. No quoting/escaping is done. Keys -are supposed to be strings. Values are undef, strings, +are supposed to be strings. Values are undef, strings, hash refs or array refs of strings. Supported options are: delta => STR - indentation delta use_header => BOOL - whether to include a YAML header - indent => STR - a string of spaces + indent => STR - a string of spaces default: '' max_key_length => INT - maximum key length used to align keys and values of the same hash default: 20 - key_sort => CODE - a sort sub + key_sort => CODE - a sort sub It may be undef, which means no sorting by keys default: sub { lc $a cmp lc $b } - customs => HASH - special options for certain keys + customs => HASH - special options for certain keys (whose values are hashes themselves) may contain: max_key_length, key_sort, customs @@ -1159,8 +1160,8 @@ sub _dump_hash { # Use a list to preserve order. my @pairs; - my $k_sort - = exists $options->{key_sort} ? $options->{key_sort} + my $k_sort + = exists $options->{key_sort} ? $options->{key_sort} : sub { lc $a cmp lc $b }; if ($k_sort) { croak "'key_sort' should be a coderef" unless ref $k_sort eq 'CODE'; @@ -1196,7 +1197,7 @@ sub _dump_hash { $k_options{$k} = $k_custom{$k} if exists $k_custom{$k}; } } - $yaml .= $indent . "$key:\n" + $yaml .= $indent . "$key:\n" . _dump_hash(\%k_options, %$val); } else { @@ -1256,8 +1257,8 @@ sub metafile_file { my $self = shift; my %dump_options = ( - use_header => 1, - delta => ' ' x 4, + use_header => 1, + delta => ' ' x 4, key_sort => undef, ); return _dump_hash(\%dump_options, @_); @@ -1388,7 +1389,7 @@ sub write_mymeta { return unless _has_cpan_meta(); _fix_metadata_before_conversion( $mymeta ); - + # this can still blow up # not sure if i should just eval this and skip file creation if it # blows up @@ -1434,9 +1435,9 @@ sub realclean { { my(%f) = map { ($_ => 1) } @files; @files = keys %f; } { my(%d) = map { ($_ => 1) } @dirs; @dirs = keys %d; } - my $rm_cmd = join "\n\t", map { "$_" } + my $rm_cmd = join "\n\t", map { "$_" } $self->split_command('- $(RM_F)', @files); - my $rmf_cmd = join "\n\t", map { "$_" } + my $rmf_cmd = join "\n\t", map { "$_" } $self->split_command('- $(RM_RF)', @dirs); my $m = sprintf <<'MAKE', $rm_cmd, $rmf_cmd; @@ -1522,7 +1523,7 @@ sub distsignature_target { my $self = shift; my $add_sign = $self->oneliner(<<'CODE', ['-MExtUtils::Manifest=maniadd']); -eval { maniadd({q{SIGNATURE} => q{Public-key signature (added by MakeMaker)}}) } +eval { maniadd({q{SIGNATURE} => q{Public-key signature (added by MakeMaker)}}) } or print "Could not add SIGNATURE to MANIFEST: $${'@'}\n" CODE @@ -1597,6 +1598,13 @@ sub init_ABSTRACT { carp "WARNING: Setting ABSTRACT via file ". "'$self->{ABSTRACT_FROM}' failed\n"; } + + if ($self->{ABSTRACT} && $self->{ABSTRACT} =~ m![[:cntrl:]]+!) { + warn "WARNING: ABSTRACT contains control character(s),". + " they will be removed\n"; + $self->{ABSTRACT} =~ s![[:cntrl:]]+!!g; + return; + } } =head3 init_INST @@ -1620,7 +1628,7 @@ sub init_INST { unless ($self->{INST_LIB}){ if ($self->{PERL_CORE}) { if (defined $Cross::platform) { - $self->{INST_LIB} = $self->{INST_ARCHLIB} = + $self->{INST_LIB} = $self->{INST_ARCHLIB} = $self->catdir($self->{PERL_LIB},"..","xlib", $Cross::platform); } @@ -1635,7 +1643,7 @@ sub init_INST { my @parentdir = split(/::/, $self->{PARENT_NAME}); $self->{INST_LIBDIR} = $self->catdir('$(INST_LIB)', @parentdir); $self->{INST_ARCHLIBDIR} = $self->catdir('$(INST_ARCHLIB)', @parentdir); - $self->{INST_AUTODIR} = $self->catdir('$(INST_LIB)', 'auto', + $self->{INST_AUTODIR} = $self->catdir('$(INST_LIB)', 'auto', '$(FULLEXT)'); $self->{INST_ARCHAUTODIR} = $self->catdir('$(INST_ARCHLIB)', 'auto', '$(FULLEXT)'); @@ -1685,7 +1693,7 @@ sub init_INSTALL_from_PREFIX { $self->init_lib2arch; - # There are often no Config.pm defaults for these new man variables so + # There are often no Config.pm defaults for these new man variables so # we fall back to the old behavior which is to use installman*dir foreach my $num (1, 3) { my $k = 'installsiteman'.$num.'dir'; @@ -1710,7 +1718,7 @@ sub init_INSTALL_from_PREFIX { unless $Config{installsitescript}; unless( $Config{installvendorbin} ) { - $self->{INSTALLVENDORBIN} ||= $Config{usevendorprefix} + $self->{INSTALLVENDORBIN} ||= $Config{usevendorprefix} ? $Config{installbin} : ''; } @@ -1721,7 +1729,7 @@ sub init_INSTALL_from_PREFIX { } - my $iprefix = $Config{installprefixexp} || $Config{installprefix} || + my $iprefix = $Config{installprefixexp} || $Config{installprefix} || $Config{prefixexp} || $Config{prefix} || ''; my $vprefix = $Config{usevendorprefix} ? $Config{vendorprefixexp} : ''; my $sprefix = $Config{siteprefixexp} || ''; @@ -1765,7 +1773,7 @@ sub init_INSTALL_from_PREFIX { unless $Config{'installman'.$num.'dir'}; } - my %bin_layouts = + my %bin_layouts = ( bin => { s => $iprefix, t => 'perl', @@ -1786,7 +1794,7 @@ sub init_INSTALL_from_PREFIX { t => 'site', d => 'bin' }, ); - + my %man_layouts = ( man1dir => { s => $iprefix, @@ -1830,7 +1838,7 @@ sub init_INSTALL_from_PREFIX { t => 'site', d => 'site_perl', style => $libstyle, }, - + archlib => { s => $iprefix, t => 'perl', d => "$version/$arch", @@ -1852,7 +1860,7 @@ sub init_INSTALL_from_PREFIX { my $Installvar = uc "install$var"; if( $var =~ /arch/ ) { - $self->{$Installvar} ||= + $self->{$Installvar} ||= $self->catdir($self->{LIB}, $Config{archname}); } else { @@ -1880,7 +1888,7 @@ sub init_INSTALL_from_PREFIX { $d = "$style/$d" if $style; $self->prefixify($installvar, $s, $r, $d); - warn " $Installvar == $self->{$Installvar}\n" + warn " $Installvar == $self->{$Installvar}\n" if $Verbose >= 2; } @@ -1910,7 +1918,7 @@ $map{script} = $map{bin}; sub init_INSTALL_from_INSTALL_BASE { my $self = shift; - @{$self}{qw(PREFIX VENDORPREFIX SITEPREFIX PERLPREFIX)} = + @{$self}{qw(PREFIX VENDORPREFIX SITEPREFIX PERLPREFIX)} = '$(INSTALL_BASE)'; my %install; @@ -1919,7 +1927,7 @@ sub init_INSTALL_from_INSTALL_BASE { my $uc_thing = uc $thing; my $key = "INSTALL".$dir.$uc_thing; - $install{$key} ||= + $install{$key} ||= $self->catdir('$(INSTALL_BASE)', @{$map{$thing}}); } } @@ -1946,7 +1954,7 @@ MAKEMAKER: path to the MakeMaker module. MM_VERSION: ExtUtils::MakeMaker Version -MM_REVISION: ExtUtils::MakeMaker version control revision (for backwards +MM_REVISION: ExtUtils::MakeMaker version control revision (for backwards compat) VERSION: version of your module @@ -1983,8 +1991,12 @@ sub init_VERSION { } } - # strip blanks if (defined $self->{VERSION}) { + if ( $self->{VERSION} !~ /^\s*v?[\d_\.]+\s*$/ ) { + require version; + my $normal = eval { version->parse( $self->{VERSION} ) }; + $self->{VERSION} = $normal if defined $normal; + } $self->{VERSION} =~ s/^\s+//; $self->{VERSION} =~ s/\s+$//; } @@ -2029,12 +2041,12 @@ Defines at least these macros. SHELL Program used to run shell commands ECHO Print text adding a newline on the end - RM_F Remove a file - RM_RF Remove a directory - TOUCH Update a file's timestamp - TEST_F Test for a file's existence - CP Copy a file - MV Move a file + RM_F Remove a file + RM_RF Remove a directory + TOUCH Update a file's timestamp + TEST_F Test for a file's existence + CP Copy a file + MV Move a file CHMOD Change permissions on a file FALSE Exit with non-zero TRUE Exit with zero @@ -2063,13 +2075,13 @@ sub init_tools { $self->{CP} ||= $self->oneliner('cp', ["-MExtUtils::Command"]); $self->{MV} ||= $self->oneliner('mv', ["-MExtUtils::Command"]); - $self->{MOD_INSTALL} ||= + $self->{MOD_INSTALL} ||= $self->oneliner(<<'CODE', ['-MExtUtils::Install']); install([ from_to => {@ARGV}, verbose => '$(VERBINST)', uninstall_shadows => '$(UNINST)', dir_mode => '$(PERM_DIR)' ]); CODE $self->{DOC_INSTALL} ||= $self->oneliner('perllocal_install', ["-MExtUtils::Command::MM"]); $self->{UNINSTALL} ||= $self->oneliner('uninstall', ["-MExtUtils::Command::MM"]); - $self->{WARN_IF_OLD_PACKLIST} ||= + $self->{WARN_IF_OLD_PACKLIST} ||= $self->oneliner('warn_if_old_packlist', ["-MExtUtils::Command::MM"]); $self->{FIXIN} ||= $self->oneliner('MY->fixin(shift)', ["-MExtUtils::MY"]); $self->{EQUALIZE_TIMESTAMP} ||= $self->oneliner('eqtime', ["-MExtUtils::Command"]); @@ -2097,7 +2109,7 @@ CODE # Not everybody uses -f to indicate "use this Makefile instead" $self->{USEMAKEFILE} ||= '-f'; - # Some makes require a wrapper around macros passed in on the command + # Some makes require a wrapper around macros passed in on the command # line. $self->{MACROSTART} ||= ''; $self->{MACROEND} ||= ''; @@ -2131,7 +2143,7 @@ sub init_others { my(@libs) = $self->extliblist($libs); if ($libs[0] or $libs[1] or $libs[2]){ # LD_RUN_PATH now computed by ExtUtils::Liblist - ($self->{EXTRALIBS}, $self->{BSLOADLIBS}, + ($self->{EXTRALIBS}, $self->{BSLOADLIBS}, $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs; last; } @@ -2169,7 +2181,7 @@ sub init_others { sub _fix_libs { my($self, $libs) = @_; - return !defined $libs ? [''] : + return !defined $libs ? [''] : !ref $libs ? [$libs] : !defined $libs->[0] ? [''] : $libs ; @@ -2180,7 +2192,7 @@ sub _fix_libs { my $make_frag = $MM->tools_other; -Returns a make fragment containing definitions for the macros init_others() +Returns a make fragment containing definitions for the macros init_others() initializes. =cut @@ -2191,7 +2203,7 @@ sub tools_other { # We set PM_FILTER as late as possible so it can see all the earlier # on macro-order sensitive makes such as nmake. - for my $tool (qw{ SHELL CHMOD CP MV NOOP NOECHO RM_F RM_RF TEST_F TOUCH + for my $tool (qw{ SHELL CHMOD CP MV NOOP NOECHO RM_F RM_RF TEST_F TOUCH UMASK_NULL DEV_NULL MKPATH EQUALIZE_TIMESTAMP FALSE TRUE ECHO ECHO_N @@ -2202,7 +2214,7 @@ sub tools_other { USEMAKEFILE PM_FILTER FIXIN - } ) + } ) { next unless defined $self->{$tool}; push @m, "$tool = $self->{$tool}\n"; @@ -2387,7 +2399,7 @@ pm_to_blib soon. sub tool_autosplit { my($self, %attribs) = @_; - my $maxlen = $attribs{MAXLEN} ? '$$AutoSplit::Maxlen=$attribs{MAXLEN};' + my $maxlen = $attribs{MAXLEN} ? '$$AutoSplit::Maxlen=$attribs{MAXLEN};' : ''; my $asplit = $self->oneliner(sprintf <<'PERL_CODE', $maxlen); @@ -2444,11 +2456,11 @@ sub arch_check { my $arch = (grep length, $self->splitdir($pthinks))[-1]; print <<END unless $self->{UNINSTALLED_PERL}; -Your perl and your Config.pm seem to have different ideas about the +Your perl and your Config.pm seem to have different ideas about the architecture they are running on. Perl thinks: [$arch] Config says: [$Config{archname}] -This may or may not cause problems. Please check your installation of perl +This may or may not cause problems. Please check your installation of perl if you have problems building this extension. END } @@ -2509,7 +2521,7 @@ addition to the usual set. =cut # An empty method here tickled a perl 5.8.1 bug and would return its object. -sub extra_clean_files { +sub extra_clean_files { return; } @@ -2550,7 +2562,7 @@ installation. sub libscan { my($self,$path) = @_; my($dirs,$file) = ($self->splitpath($path))[1,2]; - return '' if grep /^(?:RCS|CVS|SCCS|\.svn|_darcs)$/, + return '' if grep /^(?:RCS|CVS|SCCS|\.svn|_darcs)$/, $self->splitdir($dirs), $file; return $path; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm index a47d08e66d..d5f83a8346 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm @@ -26,7 +26,7 @@ require ExtUtils::MM_Any; require ExtUtils::MM_Unix; our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -our $VERSION = '6.68'; +our $VERSION = '6.70'; =item os_flavor @@ -48,7 +48,7 @@ libperl.a equivalent to be linked to dynamic extensions. sub init_linker { my($self) = shift; - $self->{PERL_ARCHIVE} ||= + $self->{PERL_ARCHIVE} ||= File::Spec->catdir('$(PERL_INC)',$Config{libperl}); $self->{PERL_ARCHIVE_AFTER} ||= ''; $self->{EXPORT_LIST} ||= ''; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm index b7ae60670e..e7cdaf9e59 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm @@ -9,7 +9,7 @@ require ExtUtils::MM_Unix; require ExtUtils::MM_Win32; our @ISA = qw( ExtUtils::MM_Unix ); -our $VERSION = '6.68'; +our $VERSION = '6.70'; =head1 NAME @@ -90,7 +90,7 @@ sub init_linker { } $self->{PERL_ARCHIVE} = $libperl; } else { - $self->{PERL_ARCHIVE} = + $self->{PERL_ARCHIVE} = '$(PERL_INC)' .'/'. ("$Config{libperl}" or "libperl.a"); } @@ -100,20 +100,22 @@ sub init_linker { =item maybe_command -If our path begins with F</cygdrive/> then we use C<ExtUtils::MM_Win32> -to determine if it may be a command. Otherwise we use the tests -from C<ExtUtils::MM_Unix>. +Determine whether a file is native to Cygwin by checking whether it +resides inside the Cygwin installation (using Windows paths). If so, +use C<ExtUtils::MM_Unix> to determine if it may be a command. +Otherwise use the tests from C<ExtUtils::MM_Win32>. =cut sub maybe_command { my ($self, $file) = @_; - if ($file =~ m{^/cygdrive/}i) { - return ExtUtils::MM_Win32->maybe_command($file); - } + my $cygpath = Cygwin::posix_to_win_path('/', 1); + my $filepath = Cygwin::posix_to_win_path($file, 1); - return $self->SUPER::maybe_command($file); + return (substr($filepath,0,length($cygpath)) eq $cygpath) + ? $self->SUPER::maybe_command($file) # Unix + : ExtUtils::MM_Win32->maybe_command($file); # Win32 } =item dynamic_lib diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm index 20e71936c2..64ab19065c 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_DOS; use strict; -our $VERSION = '6.68'; +our $VERSION = '6.70'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm index f1f35c2634..138bd21dba 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm @@ -7,7 +7,7 @@ BEGIN { our @ISA = qw( ExtUtils::MM_Unix ); } -our $VERSION = '6.68'; +our $VERSION = '6.70'; =head1 NAME @@ -33,14 +33,14 @@ Turn off Apple tar's tendency to copy resource forks as "._foo" files. sub init_dist { my $self = shift; - + # Thank you, Apple, for breaking tar and then breaking the work around. # 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE while 10.5 wants # COPYFILE_DISABLE. I'm not going to push my luck and instead just # set both. - $self->{TAR} ||= + $self->{TAR} ||= 'COPY_EXTENDED_ATTRIBUTES_DISABLE=1 COPYFILE_DISABLE=1 tar'; - + $self->SUPER::init_dist(@_); } diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm index 835e318b83..64edce4cbc 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_MacOS; use strict; -our $VERSION = '6.68'; +our $VERSION = '6.70'; sub new { die <<'UNSUPPORTED'; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm index a52c351153..922c2e049e 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm @@ -16,13 +16,13 @@ the semantics. =over -=cut +=cut use strict; use ExtUtils::MakeMaker::Config; use File::Basename; -our $VERSION = '6.68'; +our $VERSION = '6.70'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); @@ -66,7 +66,7 @@ sub init_platform { # To get Win32's setup. $self->SUPER::init_platform; - # incpath is copied to makefile var INCLUDE in constants sub, here just + # incpath is copied to makefile var INCLUDE in constants sub, here just # make it empty my $libpth = $Config{'libpth'}; $libpth =~ s( )(;); @@ -78,7 +78,7 @@ sub init_platform { if($self->{'base_import'}) { $self->{'BASE_IMPORT'} .= ', ' . $self->{'base_import'}; } - + $self->{'NLM_VERSION'} = $Config{'nlm_version'}; $self->{'MPKTOOL'} = $Config{'mpktool'}; $self->{'TOOLPATH'} = $Config{'toolpath'}; @@ -110,7 +110,7 @@ sub platform_constants { # Setup Win32's constants. $make_frag .= $self->SUPER::platform_constants; - foreach my $macro (qw(LIBPTH BASE_IMPORT NLM_VERSION MPKTOOL + foreach my $macro (qw(LIBPTH BASE_IMPORT NLM_VERSION MPKTOOL TOOLPATH BOOT_SYMBOL NLM_SHORT_NAME INCLUDE PATH MM_NW5_VERSION )) @@ -231,7 +231,7 @@ MAKE_FRAG # Taking care of long names like FileHandle, ByteLoader, SDBM_File etc if($self->{NLM_SHORT_NAME}) { - # In case of nlms with names exceeding 8 chars, build nlm in the + # In case of nlms with names exceeding 8 chars, build nlm in the # current dir, rename and move to auto\lib. $m .= q{ -o $(NLM_SHORT_NAME).$(DLEXT)} } else { @@ -245,7 +245,7 @@ MAKE_FRAG if($self->{NLM_SHORT_NAME}) { $m .= <<'MAKE_FRAG'; - if exist $(INST_AUTODIR)\$(NLM_SHORT_NAME).$(DLEXT) del $(INST_AUTODIR)\$(NLM_SHORT_NAME).$(DLEXT) + if exist $(INST_AUTODIR)\$(NLM_SHORT_NAME).$(DLEXT) del $(INST_AUTODIR)\$(NLM_SHORT_NAME).$(DLEXT) move $(NLM_SHORT_NAME).$(DLEXT) $(INST_AUTODIR) MAKE_FRAG } @@ -264,6 +264,6 @@ __END__ =back -=cut +=cut diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm index 376f5fa9b5..430bcaa6b4 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm @@ -5,7 +5,7 @@ use strict; use ExtUtils::MakeMaker qw(neatvalue); use File::Spec; -our $VERSION = '6.68'; +our $VERSION = '6.70'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; @@ -81,12 +81,12 @@ $self->{BASEEXT}.def: Makefile.PL } close $imp or die "Can't close tmpimp.imp"; # print "emximp -o tmpimp$Config::Config{lib_ext} tmpimp.imp\n"; - system "emximp -o tmpimp$Config::Config{lib_ext} tmpimp.imp" + system "emximp -o tmpimp$Config::Config{lib_ext} tmpimp.imp" and die "Cannot make import library: $!, \$?=$?"; # May be running under miniperl, so have no glob... eval { unlink <tmp_imp/*>; 1 } or system "rm tmp_imp/*"; - system "cd tmp_imp; $Config::Config{ar} x ../tmpimp$Config::Config{lib_ext}" - and die "Cannot extract import objects: $!, \$?=$?"; + system "cd tmp_imp; $Config::Config{ar} x ../tmpimp$Config::Config{lib_ext}" + and die "Cannot extract import objects: $!, \$?=$?"; } join('',@m); } @@ -95,7 +95,7 @@ sub static_lib { my($self) = @_; my $old = $self->ExtUtils::MM_Unix::static_lib(); return $old unless $self->{IMPORTS} && %{$self->{IMPORTS}}; - + my @chunks = split /\n{2,}/, $old; shift @chunks unless length $chunks[0]; # Empty lines at the start $chunks[0] .= <<'EOC'; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm index be8a2c38c8..26e9e6e4c4 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_QNX; use strict; -our $VERSION = '6.68'; +our $VERSION = '6.70'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm index 17ba6f95bb..88fbad8087 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_UWIN; use strict; -our $VERSION = '6.68'; +our $VERSION = '6.70'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm index 36397bff50..1bcbf47d48 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm @@ -15,14 +15,14 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue); # If we make $VERSION an our variable parse_version() breaks use vars qw($VERSION); -$VERSION = '6.68'; +$VERSION = '6.70'; $VERSION = eval $VERSION; ## no critic [BuiltinFunctions::ProhibitStringyEval] require ExtUtils::MM_Any; our @ISA = qw(ExtUtils::MM_Any); my %Is; -BEGIN { +BEGIN { $Is{OS2} = $^O eq 'os2'; $Is{Win32} = $^O eq 'MSWin32' || $Config{osname} eq 'NetWare'; $Is{Dos} = $^O eq 'dos'; @@ -129,10 +129,10 @@ sub c_o { my($self) = shift; return '' unless $self->needs_linking(); my(@m); - + my $command = '$(CCCMD)'; my $flags = '$(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE)'; - + if (my $cpp = $Config{cpprun}) { my $cpp_cmd = $self->const_cccmd; $cpp_cmd =~ s/^CCCMD\s*=\s*\$\(CC\)/$cpp/; @@ -372,7 +372,7 @@ sub constants { for my $macro (qw( AR_STATIC_ARGS DIRFILESEP DFSEP - NAME NAME_SYM + NAME NAME_SYM VERSION VERSION_MACRO VERSION_SYM DEFINE_VERSION XS_VERSION XS_VERSION_MACRO XS_DEFINE_VERSION INST_ARCHLIB INST_SCRIPT INST_BIN INST_LIB @@ -385,18 +385,18 @@ sub constants { "DESTINSTALL".$_) } $self->installvars), qw( - PERL_LIB + PERL_LIB PERL_ARCHLIB LIBPERL_A MYEXTLIB - FIRST_MAKEFILE MAKEFILE_OLD MAKE_APERL_FILE - PERLMAINCC PERL_SRC PERL_INC + FIRST_MAKEFILE MAKEFILE_OLD MAKE_APERL_FILE + PERLMAINCC PERL_SRC PERL_INC PERL FULLPERL ABSPERL PERLRUN FULLPERLRUN ABSPERLRUN PERLRUNINST FULLPERLRUNINST ABSPERLRUNINST PERL_CORE PERM_DIR PERM_RW PERM_RWX - ) ) + ) ) { next unless defined $self->{$macro}; @@ -423,7 +423,7 @@ MM_REVISION = $self->{MM_REVISION} MAKE FULLEXT BASEEXT PARENT_NAME DLBASE VERSION_FROM INC DEFINE OBJECT LDFROM LINKTYPE BOOTDEP - / ) + / ) { next unless defined $self->{$macro}; push @m, "$macro = $self->{$macro}\n"; @@ -443,7 +443,7 @@ MAN3PODS = ".$self->wraplist(sort keys %{$self->{MAN3PODS}})." push @m, q{ # Where is the Config information that we are using/depend on CONFIGDEP = $(PERL_ARCHLIB)$(DFSEP)Config.pm $(PERL_INC)$(DFSEP)config.h -}; +} if -e File::Spec->catfile( $self->{PERL_INC}, 'config.h' ); push @m, qq{ @@ -533,18 +533,18 @@ Defines a lot of macros for distribution support. COMPRESS compression command to gzip --best use for tarfiles - SUFFIX suffix to put on .gz + SUFFIX suffix to put on .gz compressed files SHAR shar command to use shar PREOP extra commands to run before - making the archive + making the archive POSTOP extra commands to run after making the archive TO_UNIX a command to convert linefeeds - to Unix style in your archive + to Unix style in your archive CI command to checkin your ci -u sources to version control @@ -601,7 +601,7 @@ sub dist { my($self, %attribs) = @_; my $make = ''; - foreach my $key (qw( + foreach my $key (qw( TAR TARFLAGS ZIP ZIPFLAGS COMPRESS SUFFIX SHAR PREOP POSTOP TO_UNIX CI RCS_LABEL DIST_CP DIST_DEFAULT @@ -638,7 +638,7 @@ manifest : $(PERLRUN) "-MExtUtils::Manifest=mkmanifest" -e mkmanifest veryclean : realclean - $(RM_F) *~ */*~ *.orig */*.orig *.bak */*.bak *.old */*.old + $(RM_F) *~ */*~ *.orig */*.orig *.bak */*.bak *.old */*.old MAKE_FRAG @@ -674,7 +674,7 @@ sub dist_core { my($self) = shift; my $make_frag = ''; - foreach my $target (qw(dist tardist uutardist tarfile zipdist zipfile + foreach my $target (qw(dist tardist uutardist tarfile zipdist zipfile shdist)) { my $method = $target.'_target'; @@ -768,6 +768,7 @@ $(DISTVNAME).tar$(SUFFIX) : distdir $(TAR) $(TARFLAGS) $(DISTVNAME).tar $(DISTVNAME) $(RM_RF) $(DISTVNAME) $(COMPRESS) $(DISTVNAME).tar + $(NOECHO) $(ECHO) 'Created $(DISTVNAME).tar$(SUFFIX)' $(POSTOP) MAKE_FRAG } @@ -790,6 +791,7 @@ $(DISTVNAME).zip : distdir $(PREOP) $(ZIP) $(ZIPFLAGS) $(DISTVNAME).zip $(DISTVNAME) $(RM_RF) $(DISTVNAME) + $(NOECHO) $(ECHO) 'Created $(DISTVNAME).zip' $(POSTOP) MAKE_FRAG } @@ -808,6 +810,7 @@ sub uutardist_target { return <<'MAKE_FRAG'; uutardist : $(DISTVNAME).tar$(SUFFIX) uuencode $(DISTVNAME).tar$(SUFFIX) $(DISTVNAME).tar$(SUFFIX) > $(DISTVNAME).tar$(SUFFIX)_uu + $(NOECHO) $(ECHO) 'Created $(DISTVNAME).tar$(SUFFIX)_uu' MAKE_FRAG } @@ -828,6 +831,7 @@ shdist : distdir $(PREOP) $(SHAR) $(DISTVNAME) > $(DISTVNAME).shar $(RM_RF) $(DISTVNAME) + $(NOECHO) $(ECHO) 'Created $(DISTVNAME).shar' $(POSTOP) MAKE_FRAG } @@ -919,7 +923,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). $ldfrom = "-all $ldfrom -none" if $Is{OSF}; # The IRIX linker doesn't use LD_RUN_PATH - my $ldrun = $Is{IRIX} && $self->{LD_RUN_PATH} ? + my $ldrun = $Is{IRIX} && $self->{LD_RUN_PATH} ? qq{-rpath "$self->{LD_RUN_PATH}"} : ''; # For example in AIX the shared objects/libraries from previous builds @@ -1025,7 +1029,7 @@ WARNING my ($abs, $val); if ($self->file_name_is_absolute($name)) { # /foo/bar $abs = $name; - } elsif ($self->canonpath($name) eq + } elsif ($self->canonpath($name) eq $self->canonpath(basename($name))) { # foo $abs = $self->catfile($dir, $name); } else { # foo/bar @@ -1162,7 +1166,7 @@ sub _fixin_replace_shebang { my (@absdirs) = reverse grep { $self->file_name_is_absolute($_) } $self->path; $interpreter = ''; - + foreach my $dir (@absdirs) { if ( $self->maybe_command($cmd) ) { warn "Ignoring $interpreter in $file\n" @@ -1173,7 +1177,7 @@ sub _fixin_replace_shebang { } # Figure out how to invoke interpreter on this machine. - + my ($does_shbang) = $Config{'sharpbang'} =~ /^\s*\#\!/; my ($shb) = ""; if ($interpreter) { @@ -1301,7 +1305,7 @@ sub init_dirscan { # --- File and Directory Lists (.xs .pm .pod etc) ($pl_files{$name} = $name) =~ s/[._]pl\z//i ; } else { - $pm{$name} = $self->catfile($self->{INST_LIBDIR},$name); + $pm{$name} = $self->catfile($self->{INST_LIBDIR},$name); } } elsif ($name =~ /\.(p[ml]|pod)\z/){ $pm{$name} = $self->catfile($self->{INST_LIBDIR},$name); @@ -1380,7 +1384,7 @@ sub init_MAN1PODS { next unless $self->_has_pod($name); $self->{MAN1PODS}->{$name} = - $self->catfile("\$(INST_MAN1DIR)", + $self->catfile("\$(INST_MAN1DIR)", basename($name).".\$(MAN1EXT)"); } } @@ -1412,7 +1416,7 @@ sub init_MAN3PODS { my $parentlibs_re = join '|', @{$self->{PMLIBPARENTDIRS}}; # Remove "Configure.pm" and similar, if it's not the only pod listed - # To force inclusion, just name it "Configure.pod", or override + # To force inclusion, just name it "Configure.pod", or override # MAN3PODS foreach my $name (keys %manifypods) { if ($self->{PERL_CORE} and $name =~ /(config|setup).*\.pm/is) { @@ -1517,7 +1521,7 @@ sub init_PM { my $striplibpath; my $parentlibs_re = join '|', @{$self->{PMLIBPARENTDIRS}}; - $prefix = $self->{INST_LIB} + $prefix = $self->{INST_LIB} if ($striplibpath = $path) =~ s{^(\W*)($parentlibs_re)\W} {$1}i; @@ -1543,7 +1547,7 @@ sub init_DIRFILESEP { $self->{DIRFILESEP} = '/'; } - + =item init_main @@ -1621,15 +1625,15 @@ sub init_main { $self->{PERL_LIB} ||= $self->catdir("$self->{PERL_SRC}","lib"); if (defined $Cross::platform) { - $self->{PERL_ARCHLIB} = + $self->{PERL_ARCHLIB} = $self->catdir("$self->{PERL_SRC}","xlib",$Cross::platform); - $self->{PERL_INC} = - $self->catdir("$self->{PERL_SRC}","xlib",$Cross::platform, + $self->{PERL_INC} = + $self->catdir("$self->{PERL_SRC}","xlib",$Cross::platform, $Is{Win32}?("CORE"):()); } else { $self->{PERL_ARCHLIB} = $self->{PERL_LIB}; - $self->{PERL_INC} = ($Is{Win32}) ? + $self->{PERL_INC} = ($Is{Win32}) ? $self->catdir($self->{PERL_LIB},"CORE") : $self->{PERL_SRC}; } @@ -1688,7 +1692,7 @@ from the perl source tree. EOP } } - } + } } # We get SITELIBEXP and SITEARCHEXP directly via @@ -1806,7 +1810,7 @@ sub init_lib2arch { # architecture. If not we take it as a sign that it should be the # same as the requested installation directory. Otherwise we take # the found one. - for my $libpair ({l=>"privlib", a=>"archlib"}, + for my $libpair ({l=>"privlib", a=>"archlib"}, {l=>"sitelib", a=>"sitearch"}, {l=>"vendorlib", a=>"vendorarch"}, ) @@ -1820,7 +1824,7 @@ sub init_lib2arch { $self->prefixify($Arch,$ilib,$self->{$Lib}); unless (-d $self->{$Arch}) { - print "Directory $self->{$Arch} not found\n" + print "Directory $self->{$Arch} not found\n" if $Verbose; $self->{$Arch} = $self->{$Lib}; } @@ -1854,15 +1858,15 @@ sub init_PERL { my($self) = shift; my @defpath = (); - foreach my $component ($self->{PERL_SRC}, $self->path(), - $Config{binexp}) + foreach my $component ($self->{PERL_SRC}, $self->path(), + $Config{binexp}) { push @defpath, $component if defined $component; } # Build up a set of file names (not command names). my $thisperl = $self->canonpath($^X); - $thisperl .= $Config{exe_ext} unless + $thisperl .= $Config{exe_ext} unless # VMS might have a file version # at the end $Is{VMS} ? $thisperl =~ m/$Config{exe_ext}(;\d+)?$/i : $thisperl =~ m/$Config{exe_ext}$/i; @@ -1891,13 +1895,13 @@ sub init_PERL { # When built for debugging, VMS doesn't create perl.exe but ndbgperl.exe. my $perl_name = 'perl'; - $perl_name = 'ndbgperl' if $Is{VMS} && + $perl_name = 'ndbgperl' if $Is{VMS} && defined $Config{usevmsdebug} && $Config{usevmsdebug} eq 'define'; # XXX This logic is flawed. If "miniperl" is anywhere in the path # it will get confused. It should be fixed to work only on the filename. # Define 'FULLPERL' to be a non-miniperl (used in test: target) - ($self->{FULLPERL} = $self->{PERL}) =~ s/miniperl/$perl_name/i + ($self->{FULLPERL} = $self->{PERL}) =~ s/\Q$miniperl\E$/$perl_name$Config{exe_ext}/i unless $self->{FULLPERL}; # Little hack to get around VMS's find_perl putting "MCR" in front @@ -1928,10 +1932,10 @@ sub init_PERL { $self->{$run} = "\$($perl)"; # Make sure perl can find itself before it's installed. - $self->{$run} .= q{ "-I$(PERL_LIB)" "-I$(PERL_ARCHLIB)"} + $self->{$run} .= q{ "-I$(PERL_LIB)" "-I$(PERL_ARCHLIB)"} if $self->{UNINSTALLED_PERL} || $self->{PERL_CORE}; - $self->{$perl.'RUNINST'} = + $self->{$perl.'RUNINST'} = sprintf q{$(%sRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"}, $perl; } @@ -2003,18 +2007,18 @@ sub init_xs { my $self = shift; if ($self->has_link_code()) { - $self->{INST_STATIC} = + $self->{INST_STATIC} = $self->catfile('$(INST_ARCHAUTODIR)', '$(BASEEXT)$(LIB_EXT)'); - $self->{INST_DYNAMIC} = + $self->{INST_DYNAMIC} = $self->catfile('$(INST_ARCHAUTODIR)', '$(DLBASE).$(DLEXT)'); - $self->{INST_BOOT} = + $self->{INST_BOOT} = $self->catfile('$(INST_ARCHAUTODIR)', '$(BASEEXT).bs'); } else { $self->{INST_STATIC} = ''; $self->{INST_DYNAMIC} = ''; $self->{INST_BOOT} = ''; } -} +} =item install (o) @@ -2332,7 +2336,7 @@ $(MAKE_APERL_FILE) : $(FIRST_MAKEFILE) pm_to_blib # Skip perl's libraries. return if m/^libperl/ or m/^perl\Q$self->{LIB_EXT}\E$/; - # Skip purified versions of libraries + # Skip purified versions of libraries # (e.g., DynaLoader_pure_p1_c0_032.a) return if m/_pure_\w+_\w+_\w+\.\w+$/ and -f "$File::Find::dir/.pure"; @@ -2563,7 +2567,7 @@ sub needs_linking { my($self) = shift; my $caller = (caller(0))[3]; - confess("needs_linking called too early") if + confess("needs_linking called too early") if $caller =~ /^ExtUtils::MakeMaker::/; return $self->{NEEDS_LINKING} if defined $self->{NEEDS_LINKING}; if ($self->has_link_code or $self->{MAKEAPERL}){ @@ -2641,33 +2645,16 @@ sub parse_version { next if $inpod || /^\s*#/; chop; next if /^\s*(if|unless|elsif)/; + s{\;\s*(?<![\\\$])\#.+?$}{}g; if ( m{^ \s* package \s+ \w[\w\:\']* \s+ (v?[0-9._]+) \s* ; }x ) { local $^W = 0; $result = $1; } + elsif ( m{(?<!\\) ([\$*]) (([\w\:\']*) \bVERSION)\b .* [!><=][!><=]}x ) { + next; + } elsif ( m{(?<!\\) ([\$*]) (([\w\:\']*) \bVERSION)\b .* =}x ) { - my $eval = qq{ - package ExtUtils::MakeMaker::_version; - no strict; - BEGIN { eval { - # Ensure any version() routine which might have leaked - # into this package has been deleted. Interferes with - # version->import() - undef *version; - require version; - "version"->import; - } } - - local $1$2; - \$$2=undef; - do { - $_ - }; - \$$2; - }; - local $^W = 0; - $result = eval($eval); ## no critic - warn "Could not eval '$eval' in $parsefile: $@" if $@; + $result = $self->get_version($parsefile, $1, $2); } else { next; @@ -2676,10 +2663,43 @@ sub parse_version { } close $fh; + if ( defined $result && $result !~ /^v?[\d_\.]+$/ ) { + require version; + my $normal = eval { version->parse( $result ) }; + $result = $normal if defined $normal; + } $result = "undef" unless defined $result; return $result; } +sub get_version +{ + my ($self, $parsefile, $sigil, $name) = @_; + my $eval = qq{ + package ExtUtils::MakeMaker::_version; + no strict; + BEGIN { eval { + # Ensure any version() routine which might have leaked + # into this package has been deleted. Interferes with + # version->import() + undef *version; + require version; + "version"->import; + } } + + local $sigil$name; + \$$name=undef; + do { + $_ + }; + \$$name; + }; + local $^W = 0; + my $result = eval($eval); ## no critic + warn "Could not eval '$eval' in $parsefile: $@" if $@; + $result; +} + =item pasthru (o) @@ -2698,7 +2718,7 @@ sub pasthru { foreach my $key (qw(LIB LIBPERL_A LINKTYPE OPTIMIZE PREFIX INSTALL_BASE) - ) + ) { next unless defined $self->{$key}; push @pasthru, "$key=\"\$($key)\""; @@ -2907,7 +2927,7 @@ PPD_OUT $self->{PPM_INSTALL_EXEC}, $self->{PPM_INSTALL_SCRIPT}; } else { - $ppd_xml .= sprintf qq{ <INSTALL>%s</INSTALL>\n}, + $ppd_xml .= sprintf qq{ <INSTALL>%s</INSTALL>\n}, $self->{PPM_INSTALL_SCRIPT}; } } @@ -2936,7 +2956,7 @@ PPD_OUT $MM->prefixify($var, $prefix, $new_prefix, $default); Using either $MM->{uc $var} || $Config{lc $var}, it will attempt to -replace it's $prefix with a $new_prefix. +replace it's $prefix with a $new_prefix. Should the $prefix fail to match I<AND> a PREFIX was given as an argument to WriteMakefile() it will set it to the $new_prefix + @@ -2960,7 +2980,7 @@ simply use '/home/foo/man/man1'. sub prefixify { my($self,$var,$sprefix,$rprefix,$default) = @_; - my $path = $self->{uc $var} || + my $path = $self->{uc $var} || $Config_Override{lc $var} || $Config{lc $var} || ''; $rprefix .= '/' if $sprefix =~ m|/$|; @@ -2969,7 +2989,7 @@ sub prefixify { warn " from $sprefix to $rprefix\n" if $Verbose >= 2; if( $self->{ARGS}{PREFIX} && - $path !~ s{^\Q$sprefix\E\b}{$rprefix}s ) + $path !~ s{^\Q$sprefix\E\b}{$rprefix}s ) { warn " cannot prefix, using default.\n" if $Verbose >= 2; @@ -3103,7 +3123,7 @@ sub oneliner { $switches = join ' ', @$switches; - return qq{\$(ABSPERLRUN) $switches -e $cmd --}; + return qq{\$(ABSPERLRUN) $switches -e $cmd --}; } @@ -3201,10 +3221,10 @@ END $(CP) $(MYEXTLIB) $@ MAKE_FRAG - my $ar; + my $ar; if (exists $self->{FULL_AR} && -x $self->{FULL_AR}) { # Prefer the absolute pathed ar if available so that PATH - # doesn't confuse us. Perl itself is built with the full_ar. + # doesn't confuse us. Perl itself is built with the full_ar. $ar = 'FULL_AR'; } else { $ar = 'AR'; @@ -3274,7 +3294,7 @@ Helper subroutine for subdirs sub subdir_x { my($self, $subdir) = @_; - my $subdir_cmd = $self->cd($subdir, + my $subdir_cmd = $self->cd($subdir, '$(MAKE) $(USEMAKEFILE) $(FIRST_MAKEFILE) all $(PASTHRU)' ); return sprintf <<'EOT', $subdir_cmd; @@ -3361,14 +3381,14 @@ END push(@m, "\n"); push(@m, "test_dynamic :: pure_all\n"); - push(@m, $self->test_via_harness('$(FULLPERLRUN)', '$(TEST_FILES)')) + push(@m, $self->test_via_harness('$(FULLPERLRUN)', '$(TEST_FILES)')) if $tests; - push(@m, $self->test_via_script('$(FULLPERLRUN)', '$(TEST_FILE)')) + push(@m, $self->test_via_script('$(FULLPERLRUN)', '$(TEST_FILE)')) if -f "test.pl"; push(@m, "\n"); push(@m, "testdb_dynamic :: pure_all\n"); - push(@m, $self->test_via_script('$(FULLPERLRUN) $(TESTDB_SW)', + push(@m, $self->test_via_script('$(FULLPERLRUN) $(TESTDB_SW)', '$(TEST_FILE)')); push(@m, "\n"); @@ -3456,10 +3476,10 @@ sub tool_xsubpp { } if ($Is{VMS} && - $Config{'ldflags'} && + $Config{'ldflags'} && $Config{'ldflags'} =~ m!/Debug!i && (!exists($self->{XSOPT}) || $self->{XSOPT} !~ /linenumbers/) - ) + ) { unshift(@tmargs,'-nolinenumbers'); } @@ -3474,7 +3494,7 @@ XSUBPPRUN = \$(PERLRUN) \$(XSUBPP) XSPROTOARG = $self->{XSPROTOARG} XSUBPPDEPS = @tmdeps \$(XSUBPP) XSUBPPARGS = @tmargs -XSUBPP_EXTRA_ARGS = +XSUBPP_EXTRA_ARGS = }; }; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm index 922a1a7da4..2287d74f6d 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm @@ -15,7 +15,7 @@ BEGIN { use File::Basename; -our $VERSION = '6.68'; +our $VERSION = '6.70'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; @@ -120,10 +120,10 @@ sub guess_name { if (@pm == 1) { ($defpm = $pm[0]) =~ s/.pm$//; } elsif (@pm) { %xs = map { s/.xs$//; ($_,1) } glob('*.xs'); ## no critic - if (keys %xs) { - foreach my $pm (@pm) { - $defpm = $pm, last if exists $xs{$pm}; - } + if (keys %xs) { + foreach my $pm (@pm) { + $defpm = $pm, last if exists $xs{$pm}; + } } } } @@ -200,8 +200,8 @@ sub find_perl { $inabs++ if $self->file_name_is_absolute($dir); if ($inabs == 1) { # We've covered relative dirs; everything else is an absolute - # dir (probably an installed location). First, we'll try - # potential command names, to see whether we can avoid a long + # dir (probably an installed location). First, we'll try + # potential command names, to see whether we can avoid a long # MCR expression. foreach my $name (@snames) { push(@cand,$name) if $name =~ /^[\w\-\$]+$/; @@ -217,7 +217,7 @@ sub find_perl { print "Checking $name\n" if $trace >= 2; # If it looks like a potential command, try it without the MCR if ($name =~ /^[\w\-\$]+$/) { - open(my $tcf, ">", "temp_mmvms.com") + open(my $tcf, ">", "temp_mmvms.com") or die('unable to open temp file'); print $tcf "\$ set message/nofacil/nosever/noident/notext\n"; print $tcf "\$ $name -e \"require $ver; print \"\"VER_OK\\n\"\"\"\n"; @@ -438,11 +438,11 @@ sub init_main { } $self->{DEFINE} = ''; - if (@defs) { - $self->{DEFINE} = '/Define=(' . join(',',@defs) . ')'; + if (@defs) { + $self->{DEFINE} = '/Define=(' . join(',',@defs) . ')'; } - if (@udefs) { - $self->{DEFINE} .= '/Undef=(' . join(',',@udefs) . ')'; + if (@udefs) { + $self->{DEFINE} .= '/Undef=(' . join(',',@udefs) . ')'; } } } @@ -487,7 +487,7 @@ sub init_tools { $self->{EQUALIZE_TIMESTAMP} ||= '$(ABSPERLRUN) -we "open F,qq{>>$ARGV[1]};close F;utime(0,(stat($ARGV[0]))[9]+1,$ARGV[1])"'; - $self->{MOD_INSTALL} ||= + $self->{MOD_INSTALL} ||= $self->oneliner(<<'CODE', ['-MExtUtils::Install']); install([ from_to => {split(' ', <STDIN>)}, verbose => '$(VERBINST)', uninstall_shadows => '$(UNINST)', dir_mode => '$(PERM_DIR)' ]); CODE @@ -578,11 +578,11 @@ sub constants { # Cleanup paths for directories in MMS macros. foreach my $macro ( qw [ - INST_BIN INST_SCRIPT INST_LIB INST_ARCHLIB + INST_BIN INST_SCRIPT INST_LIB INST_ARCHLIB PERL_LIB PERL_ARCHLIB PERL_INC PERL_SRC ], (map { 'INSTALL'.$_ } $self->installvars) - ) + ) { next unless defined $self->{$macro}; next if $macro =~ /MAN/ && $self->{$macro} eq 'none'; @@ -590,8 +590,8 @@ sub constants { } # Cleanup paths for files in MMS macros. - foreach my $macro ( qw[LIBPERL_A FIRST_MAKEFILE MAKEFILE_OLD - MAKE_APERL_FILE MYEXTLIB] ) + foreach my $macro ( qw[LIBPERL_A FIRST_MAKEFILE MAKEFILE_OLD + MAKE_APERL_FILE MYEXTLIB] ) { next unless defined $self->{$macro}; $self->{$macro} = $self->fixpath($self->{$macro},0); @@ -630,7 +630,7 @@ sub constants { next unless $self ne " " && defined $self->{$macro}; my %tmp = (); for my $key (keys %{$self->{$macro}}) { - $tmp{$self->fixpath($key,0)} = + $tmp{$self->fixpath($key,0)} = $self->fixpath($self->{$macro}{$key},0); } $self->{$macro} = \%tmp; @@ -843,7 +843,7 @@ VMSish defaults for some values. COMPRESS compression command to gzip use for tarfiles - SUFFIX suffix to put on -gz + SUFFIX suffix to put on -gz compressed files SHAR shar command to use vms_share @@ -930,7 +930,7 @@ sub xs_o { # many makes are too dumb to use xs_c then c_o =item dlsyms (override) Create VMS linker options files specifying universal symbols for this -extension's shareable image, and listing other shareable images or +extension's shareable image, and listing other shareable images or libraries to which it should be linked. =cut @@ -969,7 +969,7 @@ $(BASEEXT).opt : Makefile.PL push @m, ' $(PERL) -e "print ""$(INST_STATIC)/Include='; if ($self->{OBJECT} =~ /\bBASEEXT\b/ or - $self->{OBJECT} =~ /\b$self->{BASEEXT}\b/i) { + $self->{OBJECT} =~ /\b$self->{BASEEXT}\b/i) { push @m, ($Config{d_vms_case_sensitive_symbols} ? uc($self->{BASEEXT}) :'$(BASEEXT)'); } @@ -1080,7 +1080,7 @@ $(INST_STATIC) : $(OBJECT) $(MYEXTLIB) } else { push(@m,"\t",'Library/Object/Replace $(MMS$TARGET) $(MMS$SOURCE_LIST)',"\n"); } - + push @m, "\t\$(NOECHO) \$(PERL) -e 1 >\$(INST_ARCHAUTODIR)extralibs.ld\n"; foreach my $lib (split ' ', $self->{EXTRALIBS}) { push(@m,"\t",'$(NOECHO) $(PERL) -e "print qq{',$lib,'\n}" >>$(INST_ARCHAUTODIR)extralibs.ld',"\n"); @@ -1347,7 +1347,7 @@ our %olbs; # needs to be localized sub makeaperl { my($self, %attribs) = @_; - my($makefilename, $searchdirs, $static, $extra, $perlinc, $target, $tmpdir, $libperl) = + my($makefilename, $searchdirs, $static, $extra, $perlinc, $target, $tmpdir, $libperl) = @attribs{qw(MAKE DIRS STAT EXTRA INCL TARGET TMP LIBPERL)}; my(@m); push @m, " @@ -1428,7 +1428,7 @@ $(MAP_TARGET) :: $(MAKE_APERL_FILE) # We trust that what has been handed in as argument will be buildable $static = [] unless $static; @olbs{@{$static}} = (1) x @{$static}; - + $extra = [] unless $extra && ref $extra eq 'ARRAY'; # Sort the object libraries in inverse order of # filespec length to try to insure that dependent extensions @@ -1621,12 +1621,12 @@ sub prefixify { $rprefix = vmspath($rprefix) if $rprefix; $sprefix = vmspath($sprefix) if $sprefix; - $default = vmsify($default) + $default = vmsify($default) unless $default =~ /\[.*\]/; (my $var_no_install = $var) =~ s/^install//; - my $path = $self->{uc $var} || - $ExtUtils::MM_Unix::Config_Override{lc $var} || + my $path = $self->{uc $var} || + $ExtUtils::MM_Unix::Config_Override{lc $var} || $Config{lc $var} || $Config{lc $var_no_install}; if( !$path ) { @@ -1764,7 +1764,7 @@ sub echo { my $ql_opts = { allow_variables => $opts->{allow_variables} }; my @cmds = ("\$(NOECHO) $opencmd MMECHOFILE $file "); - push @cmds, map { '$(NOECHO) Write MMECHOFILE '.$self->quote_literal($_, $ql_opts) } + push @cmds, map { '$(NOECHO) Write MMECHOFILE '.$self->quote_literal($_, $ql_opts) } split /\n/, $text; push @cmds, '$(NOECHO) Close MMECHOFILE'; return @cmds; @@ -1931,7 +1931,7 @@ sub eliminate_macros { my($head,$macro,$tail); # perform m##g in scalar context so it acts as an iterator - while ($npath =~ m#(.*?)\$\((\S+?)\)(.*)#gs) { + while ($npath =~ m#(.*?)\$\((\S+?)\)(.*)#gs) { if (defined $self->{$2}) { ($head,$macro,$tail) = ($1,$2,$3); if (ref $self->{$macro}) { @@ -1987,7 +1987,7 @@ sub fixpath { split /[ \t]+/, $path; } - if ($path =~ m#^\$\([^\)]+\)\Z(?!\n)#s || $path =~ m#[/:>\]]#) { + if ($path =~ m#^\$\([^\)]+\)\Z(?!\n)#s || $path =~ m#[/:>\]]#) { if ($force_path or $path =~ /(?:DIR\)|\])\Z(?!\n)/) { $fixedpath = vmspath($self->eliminate_macros($path)); } diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm index cedb593821..53658e8f05 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_VOS; use strict; -our $VERSION = '6.68'; +our $VERSION = '6.70'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm index 3b09330993..1214ba31eb 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm @@ -17,7 +17,7 @@ See ExtUtils::MM_Unix for a documentation of the methods provided there. This package overrides the implementation of these methods, not the semantics. -=cut +=cut use ExtUtils::MakeMaker::Config; use File::Basename; @@ -27,7 +27,7 @@ use ExtUtils::MakeMaker qw( neatvalue ); require ExtUtils::MM_Any; require ExtUtils::MM_Unix; our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -our $VERSION = '6.68'; +our $VERSION = '6.70'; $ENV{EMXSHELL} = 'sh'; # to run `commands` @@ -153,8 +153,8 @@ sub init_tools { $self->{NOOP} ||= 'rem'; $self->{DEV_NULL} ||= '> NUL'; - $self->{FIXIN} ||= $self->{PERL_CORE} ? - "\$(PERLRUN) $self->{PERL_SRC}/win32/bin/pl2bat.pl" : + $self->{FIXIN} ||= $self->{PERL_CORE} ? + "\$(PERLRUN) $self->{PERL_SRC}/win32/bin/pl2bat.pl" : 'pl2bat.bat'; $self->SUPER::init_tools; @@ -349,7 +349,7 @@ INST_DYNAMIC_DEP = '.$inst_dynamic_dep.' $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPORT_LIST) $(PERL_ARCHIVE) $(INST_DYNAMIC_DEP) '); if ($GCC) { - push(@m, + push(@m, q{ }.$DLLTOOL.q{ --def $(EXPORT_LIST) --output-exp dll.exp $(LD) -o $@ -Wl,--base-file -Wl,dll.base $(LDDLFLAGS) }.$ldfrom.q{ $(OTHERLDFLAGS) $(MYEXTLIB) $(PERL_ARCHIVE) $(LDLOADLIBS) dll.exp }.$DLLTOOL.q{ --def $(EXPORT_LIST) --base-file dll.base --output-exp dll.exp @@ -513,7 +513,7 @@ sub quote_literal { # $(MACRO)s in makefiles. s{([<>|&^@!])}{^$1}g foreach grep { !/^"[^"]*"$/ } @text; $text = join('', @text); - + # dmake expands {{ to { and }} to }. if( $self->is_make_type('dmake') ) { $text =~ s/{/{{/g; @@ -632,6 +632,6 @@ __END__ =back -=cut +=cut diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm index 7863f2fab9..5bdfb7ff44 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_Win95; use strict; -our $VERSION = '6.68'; +our $VERSION = '6.70'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); @@ -62,7 +62,7 @@ sub xs_cpp { '; } -=item xs_o +=item xs_o The && problem. diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm index 857e17d6c4..ee18fb3b13 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm @@ -3,7 +3,7 @@ package ExtUtils::MY; use strict; require ExtUtils::MM; -our $VERSION = '6.68'; +our $VERSION = '6.70'; our @ISA = qw(ExtUtils::MM); { diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm index 7ca7c2c4e6..a7680a8e72 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm @@ -18,7 +18,7 @@ our @Overridable; my @Prepend_parent; my %Recognized_Att_Keys; -our $VERSION = '6.68'; +our $VERSION = '6.70'; $VERSION = eval $VERSION; ## no critic [BuiltinFunctions::ProhibitStringyEval] # Emulate something resembling CVS $Revision$ @@ -32,7 +32,7 @@ our @EXPORT = qw(&WriteMakefile &writeMakefile $Verbose &prompt); our @EXPORT_OK = qw($VERSION &neatvalue &mkbootstrap &mksymlists &WriteEmptyMakefile); -# These will go away once the last of the Win32 & VMS specific code is +# These will go away once the last of the Win32 & VMS specific code is # purged. my $Is_VMS = $^O eq 'VMS'; my $Is_Win32 = $^O eq 'MSWin32'; @@ -54,7 +54,7 @@ sub WriteMakefile { my %att = @_; _convert_compat_attrs(\%att); - + _verify_att(\%att); my $mm = MM->new(\%att); @@ -168,7 +168,7 @@ sub _is_of_type { sub _format_att { my $given = shift; - + return $given eq '' ? "string/number" : uc $given eq $given ? "$given reference" : "$given object" @@ -178,7 +178,7 @@ sub _format_att { sub prompt ($;$) { ## no critic my($mess, $def) = @_; - confess("prompt function called without an argument") + confess("prompt function called without an argument") unless defined $mess; my $isa_tty = -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT)) ; @@ -269,8 +269,8 @@ sub full_setup { INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR INSTALLVENDORMAN1DIR INSTALLVENDORMAN3DIR INSTALLSCRIPT INSTALLSITESCRIPT INSTALLVENDORSCRIPT - PERL_LIB PERL_ARCHLIB - SITELIBEXP SITEARCHEXP + PERL_LIB PERL_ARCHLIB + SITELIBEXP SITEARCHEXP INC INCLUDE_EXT LDFROM LIB LIBPERL_A LIBS LICENSE LINKTYPE MAKE MAKEAPERL MAKEFILE MAKEFILE_OLD MAN1PODS MAN3PODS MAP_TARGET @@ -300,11 +300,11 @@ sub full_setup { # in Overridable we have subroutines that are used indirectly - @MM_Sections = + @MM_Sections = qw( - post_initialize const_config constants platform_constants - tool_autosplit tool_xsubpp tools_other + post_initialize const_config constants platform_constants + tool_autosplit tool_xsubpp tools_other makemakerdflt @@ -318,7 +318,7 @@ sub full_setup { top_targets blibdirs linkext dlsyms dynamic dynamic_bs dynamic_lib static static_lib manifypods processPL installbin subdirs - clean_subdirs clean realclean_subdirs realclean + clean_subdirs clean realclean_subdirs realclean metafile signature dist_basics dist_core distdir dist_test dist_ci distmeta distsignature install force perldepend makefile staticmake test ppd @@ -329,7 +329,7 @@ sub full_setup { push @Overridable, qw[ libscan makeaperl needs_linking - subdir_x test_via_harness test_via_script + subdir_x test_via_harness test_via_script init_VERSION init_dist init_INST init_INSTALL init_DEST init_dirscan init_PM init_MANPODS init_xs init_PERL init_DIRFILESEP init_linker @@ -349,10 +349,10 @@ sub full_setup { @Recognized_Att_Keys{@MM_Sections} = (1) x @MM_Sections; # we will use all these variables in the Makefile - @Get_from_Config = + @Get_from_Config = qw( - ar cc cccdlflags ccdlflags dlext dlsrc exe_ext full_ar ld - lddlflags ldflags libc lib_ext obj_ext osname osvers ranlib + ar cc cccdlflags ccdlflags dlext dlsrc exe_ext full_ar ld + lddlflags ldflags libc lib_ext obj_ext osname osvers ranlib sitelibexp sitearchexp so ); @@ -447,7 +447,7 @@ sub new { } my $perl_version_ok = eval { - local $SIG{__WARN__} = sub { + local $SIG{__WARN__} = sub { # simulate "use warnings FATAL => 'all'" for vintage perls die @_; }; @@ -490,7 +490,7 @@ END $pr_version =~ s/(\d+)\.(\d+)_(\d+)/$1.$2$3/; if (!$installed_file) { - warn sprintf "Warning: prerequisite %s %s not found.\n", + warn sprintf "Warning: prerequisite %s %s not found.\n", $prereq, $required_version unless $self->{PREREQ_FATAL} or $ENV{PERL_CORE}; @@ -499,7 +499,7 @@ END } elsif ($pr_version < $required_version ){ warn sprintf "Warning: prerequisite %s %s not found. We have %s.\n", - $prereq, $required_version, ($pr_version || 'unknown version') + $prereq, $required_version, ($pr_version || 'unknown version') unless $self->{PREREQ_FATAL} or $ENV{PERL_CORE}; @@ -508,7 +508,7 @@ END } if (%unsatisfied && $self->{PREREQ_FATAL}){ - my $failedprereqs = join "\n", map {" $_ $unsatisfied{$_}"} + my $failedprereqs = join "\n", map {" $_ $unsatisfied{$_}"} sort { $a cmp $b } keys %unsatisfied; die <<"END"; MakeMaker FATAL: prerequisites not found. @@ -517,7 +517,7 @@ $failedprereqs Please install these modules first and rerun 'perl Makefile.PL'. END } - + if (defined $self->{CONFIGURE}) { if (ref $self->{CONFIGURE} eq 'CODE') { %configure_att = %{&{$self->{CONFIGURE}}}; @@ -574,7 +574,7 @@ END } if ($self->{PARENT}) { $self->{PARENT}->{CHILDREN}->{$newclass} = $self; - foreach my $opt (qw(POLLUTE PERL_CORE LINKTYPE)) { + foreach my $opt (qw(POLLUTE PERL_CORE LINKTYPE LD OPTIMIZE)) { if (exists $self->{PARENT}->{$opt} and not exists $self->{$opt}) { @@ -941,9 +941,9 @@ sub mv_all_methods { # still trying to reduce the list to some reasonable minimum -- # because I want to make it easier for the user. A.K. - local $SIG{__WARN__} = sub { + local $SIG{__WARN__} = sub { # can't use 'no warnings redefined', 5.6 only - warn @_ unless $_[0] =~ /^Subroutine .* redefined/ + warn @_ unless $_[0] =~ /^Subroutine .* redefined/ }; foreach my $method (@Overridable) { @@ -1237,6 +1237,11 @@ C<TEST_VERBOSE> variable to true. make test TEST_VERBOSE=1 +If you want to run particular test files, set the C<TEST_FILES> variable. +It is possible to use globbing with this mechanism. + + make test TEST_FILES='t/foobar.t t/dagobah*.t' + =head2 make testdb A useful variation of the above is the target C<testdb>. It runs the @@ -1291,7 +1296,7 @@ searched by perl, run perl -le 'print join $/, @INC' Sometimes older versions of the module you're installing live in other -directories in @INC. Because Perl loads the first version of a module it +directories in @INC. Because Perl loads the first version of a module it finds, not the newest, you might accidentally get one of these older versions even after installing a brand new version. To delete I<all other versions of the module you're installing> (not simply older ones) set the @@ -1379,8 +1384,8 @@ relatives, then the defaults for INSTALLPRIVLIB, INSTALLARCHLIB, INSTALLSCRIPT, etc. will be appropriate, and this incantation will be the best: - perl Makefile.PL; - make; + perl Makefile.PL; + make; make test make install @@ -1520,7 +1525,11 @@ recommends it (or you know what you're doing). =head2 Using Attributes and Parameters The following attributes may be specified as arguments to WriteMakefile() -or as NAME=VALUE pairs on the command line. +or as NAME=VALUE pairs on the command line. Attributes that became +available with later versions of MakeMaker are indicated. + +In order to maintain portability of attributes with older versions of +MakeMaker you may want to use L<App::EUMM::Upgrade> with your C<Makefile.PL>. =over 2 @@ -1553,6 +1562,8 @@ located in the C<x86> directory relative to the PPD itself. =item BUILD_REQUIRES +Available in version 6.5503 and above. + A hash of modules that are needed to build your module but not run it. This will go into the C<build_requires> field of your CPAN Meta file. @@ -1600,6 +1611,8 @@ be determined by some evaluation method. =item CONFIGURE_REQUIRES +Available in version 6.52 and above. + A hash of modules that are required to run Makefile.PL itself, but not to run your distribution. @@ -1633,7 +1646,7 @@ in ext/SDBM_File =item DISTNAME -A safe filename for the package. +A safe filename for the package. Defaults to NAME below but with :: replaced with -. @@ -1812,7 +1825,7 @@ directory if INSTALLDIRS is set to site (default). =item INSTALLSITEMAN3DIR These directories get the man pages at 'make install' time if -INSTALLDIRS=site (default). Defaults to +INSTALLDIRS=site (default). Defaults to $(SITEPREFIX)/man/man$(MAN*EXT). If set to 'none', no man pages will be installed. @@ -1936,6 +1949,8 @@ MakeMaker will turn it into an array with one element. =item LICENSE +Available in version 6.31 and above. + The licensing terms of your distribution. Generally it's "perl" for the same license as Perl itself. @@ -2019,6 +2034,8 @@ may hold a name for that binary. Defaults to perl =item META_MERGE +Available in version 6.46 and above. + A hashref of items to add to the CPAN Meta file (F<META.yml> or F<META.json>). @@ -2037,16 +2054,22 @@ you want to use. "meta-spec" => { version => 2 }, - repository => { - type => 'git', - url => 'git://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker.git', - web => 'https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker', + resources => { + + repository => { + type => 'git', + url => 'git://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker.git', + web => 'https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker', + }, + }, }, =item MIN_PERL_VERSION +Available in version 6.48 and above. + The minimum required version of Perl for this distribution. Either the 5.006001 or the 5.6.1 format is acceptable. @@ -2341,6 +2364,9 @@ will C<die> instead of simply informing the user of the missing dependencies. It is I<extremely> rare to have to use C<PREREQ_FATAL>. Its use by module authors is I<strongly discouraged> and should never be used lightly. +For dependencies that are required in order to run C<Makefile.PL>, +see C<CONFIGURE_REQUIRES>. + Module installation tools have ways of resolving unmet dependencies but to do that they need a F<Makefile>. Using C<PREREQ_FATAL> breaks this. That's bad. @@ -2496,7 +2522,7 @@ but these will fail: L<version> objects are fine. As of MakeMaker 6.35 version.pm will be automatically loaded, but you must declare the dependency on version.pm. -For compatibility with older MakeMaker you should load on the same line +For compatibility with older MakeMaker you should load on the same line as $VERSION is declared. # All on one line @@ -2723,6 +2749,11 @@ does a realclean first and then the distcheck. Note that this is not needed to build a new distribution as long as you are sure that the MANIFEST file is ok. +=item make veryclean + +does a realclean first and then removes backup files such as C<*~>, +C<*.bak>, C<*.old> and C<*.orig> + =item make manifest rewrites the MANIFEST file, adding all remaining files found (See @@ -2876,7 +2907,7 @@ function returns the $value selected by the user. If C<prompt()> detects that it is not running interactively and there is nothing on STDIN or if the PERL_MM_USE_DEFAULT environment variable is set to true, the $default will be used without prompting. This -prevents automated processes from blocking on user input. +prevents automated processes from blocking on user input. If no $default is provided an empty string will be used instead. diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm index 454ae3a37c..e09ce9811a 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm @@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Config; use strict; -our $VERSION = '6.68'; +our $VERSION = '6.70'; use Config (); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod index 71db660cf8..f1e792f33b 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod @@ -1,6 +1,6 @@ package ExtUtils::MakeMaker::FAQ; -our $VERSION = '6.68'; +our $VERSION = '6.70'; 1; __END__ @@ -261,9 +261,9 @@ to delete the files. But you have to be careful. Here's a script to do that. Use at your own risk. Have fun blowing holes in your foot. #!/usr/bin/perl -w - + use strict; - + use File::Spec; use File::Find; use ExtUtils::Manifest qw(maniread); @@ -295,7 +295,7 @@ do that. Use at your own risk. Have fun blowing holes in your foot. =item Which tar should I use on Windows? -We recommend ptar from Archive::Tar not older than 1.66 with '-C' option. +We recommend ptar from Archive::Tar not older than 1.66 with '-C' option. =item Which zip should I use on Windows for '[nd]make zipdist'? diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod index 0e07f3fcb6..a45dd2bd04 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod @@ -1,6 +1,6 @@ package ExtUtils::MakeMaker::Tutorial; -our $VERSION = '6.68'; +our $VERSION = '6.70'; =head1 NAME diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm index 4188eb7371..a12567357b 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm @@ -3,7 +3,7 @@ package ExtUtils::Mkbootstrap; # There's just too much Dynaloader incest here to turn on strict vars. use strict 'refs'; -our $VERSION = '6.68'; +our $VERSION = '6.70'; require Exporter; our @ISA = ('Exporter'); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm index 0af324870c..037641d671 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm @@ -10,7 +10,7 @@ use Config; our @ISA = qw(Exporter); our @EXPORT = qw(&Mksymlists); -our $VERSION = '6.68'; +our $VERSION = '6.70'; sub Mksymlists { my(%spec) = @_; @@ -86,7 +86,7 @@ sub _write_os2 { my $distname = $data->{DISTNAME} || $data->{NAME}; $distname = "Distribution $distname"; my $patchlevel = " pl$Config{perl_patchlevel}" || ''; - my $comment = sprintf "Perl (v%s%s%s) module %s", + my $comment = sprintf "Perl (v%s%s%s) module %s", $Config::Config{version}, $threaded, $patchlevel, $data->{NAME}; chomp $comment; if ($data->{INSTALLDIRS} and $data->{INSTALLDIRS} eq 'perl') { @@ -197,7 +197,7 @@ sub _write_vms { if ($isvax) { print $opt "UNIVERSAL=$safe\n" } else { print $opt "SYMBOL_VECTOR=($safe=DATA)\n"; } } - + close $opt; } diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm index 5e4f96d4d8..74cc5e0381 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm @@ -3,7 +3,7 @@ package ExtUtils::testlib; use strict; use warnings; -our $VERSION = '6.68'; +our $VERSION = '6.70'; use Cwd; use File::Spec; @@ -11,7 +11,7 @@ use File::Spec; # So the tests can chdir around and not break @INC. # We use getcwd() because otherwise rel2abs will blow up under taint # mode pre-5.8. We detaint is so @INC won't be tainted. This is -# no worse, and probably better, than just shoving an untainted, +# no worse, and probably better, than just shoving an untainted, # relative "blib/lib" onto @INC. my $cwd; BEGIN { diff --git a/cpan/ExtUtils-MakeMaker/t/00compile.t b/cpan/ExtUtils-MakeMaker/t/00compile.t index cdec1b977c..ba6baacce8 100644 --- a/cpan/ExtUtils-MakeMaker/t/00compile.t +++ b/cpan/ExtUtils-MakeMaker/t/00compile.t @@ -14,13 +14,13 @@ BEGIN { plan skip_all => 'No MANIFEST' unless -e "../MANIFEST"; - + chdir ".."; my $manifest = "MANIFEST"; open(my $manifest_fh, "<", $manifest) or die "Can't open $manifest: $!"; -my @modules = map { m{^lib/(\S+)}; $1 } - grep { m{^lib/\S+\.pm} } +my @modules = map { m{^lib/(\S+)}; $1 } + grep { m{^lib/\S+\.pm} } <$manifest_fh>; chomp @modules; diff --git a/cpan/ExtUtils-MakeMaker/t/INST.t b/cpan/ExtUtils-MakeMaker/t/INST.t index b5ece3e157..35251f8ba9 100644 --- a/cpan/ExtUtils-MakeMaker/t/INST.t +++ b/cpan/ExtUtils-MakeMaker/t/INST.t @@ -86,7 +86,7 @@ is( $mm->{PERM_RWX}, 755, 'PERM_RWX' ); # INST_* -is( $mm->{INST_ARCHLIB}, +is( $mm->{INST_ARCHLIB}, $mm->{PERL_CORE} ? $mm->{PERL_ARCHLIB} : File::Spec->catdir($Curdir, 'blib', 'arch'), 'INST_ARCHLIB'); @@ -96,7 +96,7 @@ is( $mm->{INST_BIN}, File::Spec->catdir($Curdir, 'blib', 'bin'), is( keys %{$mm->{CHILDREN}}, 1 ); my($child_pack) = keys %{$mm->{CHILDREN}}; my $c_mm = $mm->{CHILDREN}{$child_pack}; -is( $c_mm->{INST_ARCHLIB}, +is( $c_mm->{INST_ARCHLIB}, $c_mm->{PERL_CORE} ? $c_mm->{PERL_ARCHLIB} : File::Spec->catdir($Updir, 'blib', 'arch'), 'CHILD INST_ARCHLIB'); @@ -105,7 +105,7 @@ is( $c_mm->{INST_BIN}, File::Spec->catdir($Updir, 'blib', 'bin'), my $inst_lib = File::Spec->catdir($Curdir, 'blib', 'lib'); -is( $mm->{INST_LIB}, +is( $mm->{INST_LIB}, $mm->{PERL_CORE} ? $mm->{PERL_LIB} : $inst_lib, 'INST_LIB' ); diff --git a/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t b/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t index d2f605e468..bd82dbd410 100644 --- a/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t +++ b/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t @@ -36,7 +36,7 @@ cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || diag(@mpl_out); my $makefile = makefile_name(); -ok( grep(/^Writing $makefile for Big::Dummy/, +ok( grep(/^Writing $makefile for Big::Dummy/, @mpl_out) == 1, 'Makefile.PL output looks right'); @@ -48,7 +48,7 @@ like( $install_out, qr/^Installing /m ); ok( -r '../dummy-install', ' install dir created' ); -my @installed_files = +my @installed_files = ('../dummy-install/lib/perl5/Big/Dummy.pm', '../dummy-install/lib/perl5/Big/Liar.pm', '../dummy-install/bin/program', diff --git a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t index 5bd0a5dd80..12cdee19db 100644 --- a/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t +++ b/cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t @@ -120,8 +120,8 @@ my %Install_Vars = ( while( my($type, $vars) = each %Install_Vars) { SKIP: { - skip "VMS must expand macros in INSTALL* vars", scalar @$vars - if $Is_VMS; + skip "VMS must expand macros in INSTALL* vars", scalar @$vars + if $Is_VMS; skip '$Config{usevendorprefix} not set', scalar @$vars if $type eq 'VENDOR' and !$Config{usevendorprefix}; @@ -134,10 +134,10 @@ while( my($type, $vars) = each %Install_Vars) { if $mm->{uc $installvar} =~ /^\$\(INSTALL.*\)$/; # support for man page skipping - $prefix = 'none' if $type eq 'PERL' && - $var =~ /man/ && + $prefix = 'none' if $type eq 'PERL' && + $var =~ /man/ && !$Config{$installvar}; - like( $mm->{uc $installvar}, qr/^\Q$prefix\E/, + like( $mm->{uc $installvar}, qr/^\Q$prefix\E/, "$prefix + $var" ); } } @@ -185,9 +185,9 @@ while( my($type, $vars) = each %Install_Vars) { INSTALLMAN3DIR=> 'foo/bar/baz', ); - is( $mm->{INSTALLVENDORMAN1DIR}, File::Spec->catdir('foo','bar'), + is( $mm->{INSTALLVENDORMAN1DIR}, File::Spec->catdir('foo','bar'), 'installvendorman1dir (in %Config) not modified' ); - isnt( $mm->{INSTALLVENDORMAN3DIR}, '', + isnt( $mm->{INSTALLVENDORMAN3DIR}, '', 'installvendorman3dir (not in %Config) set' ); } @@ -224,7 +224,7 @@ while( my($type, $vars) = each %Install_Vars) { } -# Check that when usevendoprefix and installvendorman*dir aren't set in +# Check that when usevendoprefix and installvendorman*dir aren't set in # Config it leaves them unset. { _set_config(installman1dir => File::Spec->catdir('foo', 'bar') ); diff --git a/cpan/ExtUtils-MakeMaker/t/Liblist.t b/cpan/ExtUtils-MakeMaker/t/Liblist.t index 37d10a1c6e..934b83aa69 100644 --- a/cpan/ExtUtils-MakeMaker/t/Liblist.t +++ b/cpan/ExtUtils-MakeMaker/t/Liblist.t @@ -11,7 +11,7 @@ BEGIN { use_ok( 'ExtUtils::Liblist' ); } -ok( defined &ExtUtils::Liblist::ext, +ok( defined &ExtUtils::Liblist::ext, 'ExtUtils::Liblist::ext() defined for backwards compat' ); { diff --git a/cpan/ExtUtils-MakeMaker/t/MM_Any.t b/cpan/ExtUtils-MakeMaker/t/MM_Any.t index 672ff4dbd1..731c9767fc 100644 --- a/cpan/ExtUtils-MakeMaker/t/MM_Any.t +++ b/cpan/ExtUtils-MakeMaker/t/MM_Any.t @@ -18,7 +18,7 @@ can_ok( 'MM', 'os_flavor', 'os_flavor_is' ); my @flavors = MM->os_flavor; ok( @flavors, 'os_flavor() returned something' ); -ok( MM->os_flavor_is($flavors[rand @flavors]), +ok( MM->os_flavor_is($flavors[rand @flavors]), 'os_flavor_is() one flavor' ); ok( MM->os_flavor_is($flavors[rand @flavors], 'BogusOS'), ' many flavors' ); diff --git a/cpan/ExtUtils-MakeMaker/t/MM_BeOS.t b/cpan/ExtUtils-MakeMaker/t/MM_BeOS.t index be19058f65..0f9825b7c0 100644 --- a/cpan/ExtUtils-MakeMaker/t/MM_BeOS.t +++ b/cpan/ExtUtils-MakeMaker/t/MM_BeOS.t @@ -23,8 +23,8 @@ use File::Basename; # Does this mimic ExtUtils::MakeMaker ok? { @MM::ISA = qw( - ExtUtils::MM_Unix - ExtUtils::Liblist::Kid + ExtUtils::MM_Unix + ExtUtils::Liblist::Kid ExtUtils::MakeMaker ); # MM package faked up by messy MI entanglement @@ -38,7 +38,7 @@ my $MM = bless { NAME => "Foo" }, 'MM'; # init_linker { - my $libperl = File::Spec->catfile('$(PERL_INC)', + my $libperl = File::Spec->catfile('$(PERL_INC)', $Config{libperl} || 'libperl.a' ); my $export = ''; my $after = ''; diff --git a/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t b/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t index b518c8c79e..0655d17622 100644 --- a/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t +++ b/cpan/ExtUtils-MakeMaker/t/MM_Cygwin.t @@ -42,7 +42,7 @@ delete $MM->{CFLAGS}; # ExtUtils::MM_Cygwin::cflags() calls this, fake the output { - local $SIG{__WARN__} = sub { + local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /^Subroutine .* redefined/; }; *ExtUtils::MM_Unix::cflags = sub { return $_[1] }; diff --git a/cpan/ExtUtils-MakeMaker/t/MM_NW5.t b/cpan/ExtUtils-MakeMaker/t/MM_NW5.t index 3f6198f1a4..383e6d9541 100644 --- a/cpan/ExtUtils-MakeMaker/t/MM_NW5.t +++ b/cpan/ExtUtils-MakeMaker/t/MM_NW5.t @@ -47,18 +47,18 @@ SKIP: { skip( '$ENV{COMSPEC} not set', 2 ) unless $ENV{COMSPEC} =~ m!((?:[a-z]:)?[^|<>]+)!i; my $comspec = $1; - is( $MM->maybe_command( $comspec ), + is( $MM->maybe_command( $comspec ), $comspec, 'COMSPEC is a maybe_command()' ); ( my $comspec2 = $comspec ) =~ s|\..{3}$||; - like( $MM->maybe_command( $comspec2 ), - qr/\Q$comspec/i, + like( $MM->maybe_command( $comspec2 ), + qr/\Q$comspec/i, 'maybe_command() without extension' ); } my $had_pathext = exists $ENV{PATHEXT}; { local $ENV{PATHEXT} = '.exe'; - ok( ! $MM->maybe_command( 'not_a_command.com' ), + ok( ! $MM->maybe_command( 'not_a_command.com' ), 'not a maybe_command()' ); } # Bug in Perl. local $ENV{FOO} won't delete the key afterward. @@ -66,19 +66,19 @@ delete $ENV{PATHEXT} unless $had_pathext; # file_name_is_absolute() [Does not support UNC-paths] { - ok( $MM->file_name_is_absolute( 'SYS:/' ), + ok( $MM->file_name_is_absolute( 'SYS:/' ), 'file_name_is_absolute()' ); ok( ! $MM->file_name_is_absolute( 'some/path/' ), 'not file_name_is_absolute()' ); } -# find_perl() +# find_perl() # Should be able to find running perl... $^X is OK on NW5 { my $my_perl = $1 if $^X =~ /(.*)/; # are we in -T or -t? my( $perl, $path ) = fileparse( $my_perl ); - like( $MM->find_perl( $], [ $perl ], [ $path ] ), + like( $MM->find_perl( $], [ $perl ], [ $path ] ), qr/^\Q$my_perl\E$/i, 'find_perl() finds this perl' ); } @@ -86,10 +86,10 @@ delete $ENV{PATHEXT} unless $had_pathext; { my @path_eg = qw( SYS trick dir/now_OK ); - is( $MM->catdir( @path_eg ), + is( $MM->catdir( @path_eg ), 'SYS\\trick\\dir\\now_OK', 'catdir()' ); - is( $MM->catdir( @path_eg ), - File::Spec->catdir( @path_eg ), + is( $MM->catdir( @path_eg ), + File::Spec->catdir( @path_eg ), 'catdir() eq File::Spec->catdir()' ); # catfile() (calls MM_NW5->catdir) @@ -98,8 +98,8 @@ delete $ENV{PATHEXT} unless $had_pathext; is( $MM->catfile( @path_eg ), 'SYS\\trick\\dir\\now_OK\\file.ext', 'catfile()' ); - is( $MM->catfile( @path_eg ), - File::Spec->catfile( @path_eg ), + is( $MM->catfile( @path_eg ), + File::Spec->catfile( @path_eg ), 'catfile() eq File::Spec->catfile()' ); } @@ -108,7 +108,7 @@ delete $ENV{PATHEXT} unless $had_pathext; { my $mm_w32 = bless( {}, 'MM' ); $mm_w32->init_others(); - my @keys = qw( TOUCH CHMOD CP RM_F RM_RF MV NOOP + my @keys = qw( TOUCH CHMOD CP RM_F RM_RF MV NOOP TEST_F LD AR LDLOADLIBS DEV_NULL ); for my $key ( @keys ) { ok( $mm_w32->{ $key }, "init_others: $key" ); @@ -118,7 +118,7 @@ delete $ENV{PATHEXT} unless $had_pathext; # constants() { my $mm_w32 = bless { - NAME => 'TestMM_NW5', + NAME => 'TestMM_NW5', VERSION => '1.00', VERSION_FROM => 'TestMM_NW5', PM => { 'MM_NW5.pm' => 1 }, @@ -201,19 +201,19 @@ EOSCRIPT skip( "Can't write to temp file: $!", 4 ) unless close SCRIPT; # now start tests: - is( $MM->perl_script( $script_name ), + is( $MM->perl_script( $script_name ), "${script_name}$script_ext", "perl_script ($script_ext)" ); skip( "Can't rename temp file: $!", 3 ) unless rename $script_name, "${script_name}.pl"; $script_ext = '.pl'; - is( $MM->perl_script( $script_name ), + is( $MM->perl_script( $script_name ), "${script_name}$script_ext", "perl_script ($script_ext)" ); skip( "Can't rename temp file: $!", 2 ) unless rename "${script_name}$script_ext", "${script_name}.bat"; $script_ext = '.bat'; - is( $MM->perl_script( $script_name ), + is( $MM->perl_script( $script_name ), "${script_name}$script_ext", "perl_script ($script_ext)" ); skip( "Can't rename temp file: $!", 1 ) @@ -221,7 +221,7 @@ EOSCRIPT $script_ext = '.noscript'; isnt( $MM->perl_script( $script_name ), - "${script_name}$script_ext", + "${script_name}$script_ext", "not a perl_script anymore ($script_ext)" ); is( $MM->perl_script( $script_name ), undef, "perl_script ($script_ext) returns empty" ); diff --git a/cpan/ExtUtils-MakeMaker/t/MM_OS2.t b/cpan/ExtUtils-MakeMaker/t/MM_OS2.t index 08d0e1abab..f0a3889d31 100644 --- a/cpan/ExtUtils-MakeMaker/t/MM_OS2.t +++ b/cpan/ExtUtils-MakeMaker/t/MM_OS2.t @@ -23,18 +23,18 @@ BEGIN { use File::Spec; use_ok( 'ExtUtils::MM_OS2' ); -ok( grep( 'ExtUtils::MM_OS2', @MM::ISA), +ok( grep( 'ExtUtils::MM_OS2', @MM::ISA), 'ExtUtils::MM_OS2 should be parent of MM' ); # dlsyms -my $mm = bless({ - SKIPHASH => { - dynamic => 1 - }, +my $mm = bless({ + SKIPHASH => { + dynamic => 1 + }, NAME => 'foo:bar::', }, 'ExtUtils::MM_OS2'); -is( $mm->dlsyms(), '', +is( $mm->dlsyms(), '', 'dlsyms() should return nothing with dynamic flag set' ); $mm->{BASEEXT} = 'baseext'; @@ -42,13 +42,13 @@ delete $mm->{SKIPHASH}; my $res = $mm->dlsyms(); like( $res, qr/baseext\.def: Makefile/, '... without flag, should return make targets' ); -like( $res, qr/"DL_FUNCS" => \{ \}/, +like( $res, qr/"DL_FUNCS" => \{ \}/, '... should provide empty hash refs where necessary' ); like( $res, qr/"DL_VARS" => \[]/, '... and empty array refs too' ); $mm->{FUNCLIST} = 'funclist'; $res = $mm->dlsyms( IMPORTS => 'imports' ); -like( $res, qr/"FUNCLIST" => .+funclist/, +like( $res, qr/"FUNCLIST" => .+funclist/, '... should pick up values from object' ); like( $res, qr/"IMPORTS" => .+imports/, '... and allow parameter options too' ); @@ -65,7 +65,7 @@ SKIP: { local $@; eval { $mm->dlsyms() }; - like( $@, qr/Can.t mkdir tmp_imp/, + like( $@, qr/Can.t mkdir tmp_imp/, '... should die if directory cannot be made' ); unlink('tmp_imp') or skip("Cannot remove test file: $!", 9); @@ -89,15 +89,15 @@ SKIP: { eval { $mm->dlsyms() }; like( $sysargs, qr/^emximp/, '... should try to call system() though' ); - like( $@, qr/Cannot make import library/, + like( $@, qr/Cannot make import library/, '... should die if emximp syscall fails' ); # sysfail is 0 now, call emximp call should succeed eval { $mm->dlsyms() }; is( $unlinked, 1, '... should attempt to unlink temp files' ); - like( $@, qr/Cannot extract import/, + like( $@, qr/Cannot extract import/, '... should die if other syscall fails' ); - + # make both syscalls succeed @sysfail = (0, 0); local $@; @@ -127,9 +127,9 @@ SKIP: { $args->{IMPORTS} = { foo => 1}; $ret = ExtUtils::MM_OS2::static_lib( $args ); is( $called, 2, '... should call parent method if extra imports passed' ); - like( $ret, qr/^called static_lib\n\t\$\(AR\) \$\(AR_STATIC_ARGS\)/m, + like( $ret, qr/^called static_lib\n\t\$\(AR\) \$\(AR_STATIC_ARGS\)/m, '... should append make tags to first line from parent method' ); - like( $ret, qr/\$@\n\n\nline2\nline3\n\nline4/m, + like( $ret, qr/\$@\n\n\nline2\nline3\n\nline4/m, '... should include remaining data from parent method' ); } @@ -164,7 +164,7 @@ is( ExtUtils::MM_OS2->replace_manpage_separator($sep), '.a.b.c.de', unless (defined $dir) { if (-d $file) { next if ( -x $file . '.exe' or -x $file . '.cmd' ); - + $dir = $file; $found++; } @@ -208,7 +208,7 @@ is( ExtUtils::MM_OS2->replace_manpage_separator($sep), '.a.b.c.de', SKIP: { skip('No appropriate directory found', 1) unless defined $dir; - is( ExtUtils::MM_OS2->maybe_command( $dir ), undef, + is( ExtUtils::MM_OS2->maybe_command( $dir ), undef, 'maybe_command() should ignore directories' ); } @@ -234,11 +234,11 @@ is( ExtUtils::MM_OS2->replace_manpage_separator($sep), '.a.b.c.de', } # file_name_is_absolute -ok( ExtUtils::MM_OS2->file_name_is_absolute( 's:/' ), +ok( ExtUtils::MM_OS2->file_name_is_absolute( 's:/' ), 'file_name_is_absolute() should be true for paths with volume and slash' ); -ok( ExtUtils::MM_OS2->file_name_is_absolute( '\foo' ), +ok( ExtUtils::MM_OS2->file_name_is_absolute( '\foo' ), '... and for paths with leading slash but no volume' ); -ok( ! ExtUtils::MM_OS2->file_name_is_absolute( 'arduk' ), +ok( ! ExtUtils::MM_OS2->file_name_is_absolute( 'arduk' ), '... but not for paths with no leading slash or volume' ); @@ -252,18 +252,18 @@ is( $mm->{PERL_ARCHIVE}, '$(PERL_INC)/libperl$(LIB_EXT)', 'PERL_ARCHIVE' ); my $aout = 0; local *OS2::is_aout; *OS2::is_aout = \$aout; - + $mm->init_linker; isnt( $mm->{PERL_ARCHIVE_AFTER}, '', 'PERL_ARCHIVE_AFTER should be empty without $is_aout set' ); $aout = 1; - is( $mm->{PERL_ARCHIVE_AFTER}, - '$(PERL_INC)/libperl_override$(LIB_EXT)', + is( $mm->{PERL_ARCHIVE_AFTER}, + '$(PERL_INC)/libperl_override$(LIB_EXT)', '... and has libperl_override if it is set' ); } # EXPORT_LIST -is( $mm->{EXPORT_LIST}, '$(BASEEXT).def', +is( $mm->{EXPORT_LIST}, '$(BASEEXT).def', 'EXPORT_LIST should add .def to BASEEXT member' ); END { diff --git a/cpan/ExtUtils-MakeMaker/t/MM_Unix.t b/cpan/ExtUtils-MakeMaker/t/MM_Unix.t index 55c29e32d8..60f53c4330 100644 --- a/cpan/ExtUtils-MakeMaker/t/MM_Unix.t +++ b/cpan/ExtUtils-MakeMaker/t/MM_Unix.t @@ -5,8 +5,8 @@ BEGIN { } chdir 't'; -BEGIN { - use Test::More; +BEGIN { + use Test::More; if( $^O =~ /^VMS|os2|MacOS|MSWin32|cygwin|beos|netware$/i ) { plan skip_all => 'Non-Unix platform'; @@ -26,9 +26,9 @@ my $class = 'ExtUtils::MM_Unix'; # only one of the following can be true # test should be removed if MM_Unix ever stops handling other OS than Unix my $os = ($ExtUtils::MM_Unix::Is{OS2} || 0) - + ($ExtUtils::MM_Unix::Is{Win32} || 0) + + ($ExtUtils::MM_Unix::Is{Win32} || 0) + ($ExtUtils::MM_Unix::Is{Dos} || 0) - + ($ExtUtils::MM_Unix::Is{VMS} || 0); + + ($ExtUtils::MM_Unix::Is{VMS} || 0); cmp_ok ( $os, '<=', 1, 'There can be only one (or none)'); is($ExtUtils::MM_Unix::VERSION, $ExtUtils::MakeMaker::VERSION, 'MM_Unix has a $VERSION'); @@ -45,7 +45,7 @@ is ($class->catdir('xx','xx'), File::Spec->catdir('xx','xx'), is ($class->catfile('xx','xx','yy'), File::Spec->catfile('xx','xx','yy'), 'catfile(xx, xx) => xx/xx'); -is ($class->file_name_is_absolute('Bombdadil'), +is ($class->file_name_is_absolute('Bombdadil'), File::Spec->file_name_is_absolute('Bombdadil'), 'file_name_is_absolute()'); @@ -130,7 +130,7 @@ ok ( join (' ', $class->dist_basics()), 'distclean :: realclean distcheck'); # has_link_code tests my $t = bless { NAME => "Foo" }, $class; -$t->{HAS_LINK_CODE} = 1; +$t->{HAS_LINK_CODE} = 1; is ($t->has_link_code(),1,'has_link_code'); is ($t->{HAS_LINK_CODE},1); $t->{HAS_LINK_CODE} = 0; @@ -198,9 +198,9 @@ foreach (qw/ post_constants postamble post_initialize/) { } ############################################################################### -# replace_manpage_separator +# replace_manpage_separator -is ($t->replace_manpage_separator('Foo/Bar'),'Foo::Bar','manpage_separator'); +is ($t->replace_manpage_separator('Foo/Bar'),'Foo::Bar','manpage_separator'); ############################################################################### @@ -208,7 +208,7 @@ $t->init_linker; foreach (qw/ EXPORT_LIST PERL_ARCHIVE PERL_ARCHIVE_AFTER /) { ok( exists $t->{$_}, "$_ was defined" ); - is( $t->{$_}, '', "$_ is empty on Unix"); + is( $t->{$_}, '', "$_ is empty on Unix"); } diff --git a/cpan/ExtUtils-MakeMaker/t/MM_Win32.t b/cpan/ExtUtils-MakeMaker/t/MM_Win32.t index 6d4bf8d288..fee1e5e350 100644 --- a/cpan/ExtUtils-MakeMaker/t/MM_Win32.t +++ b/cpan/ExtUtils-MakeMaker/t/MM_Win32.t @@ -46,18 +46,18 @@ SKIP: { skip( '$ENV{COMSPEC} not set', 2 ) unless $ENV{COMSPEC} =~ m!((?:[a-z]:)?[^|<>]+)!i; my $comspec = $1; - is( $MM->maybe_command( $comspec ), + is( $MM->maybe_command( $comspec ), $comspec, 'COMSPEC is a maybe_command()' ); ( my $comspec2 = $comspec ) =~ s|\..{3}$||; - like( $MM->maybe_command( $comspec2 ), - qr/\Q$comspec/i, + like( $MM->maybe_command( $comspec2 ), + qr/\Q$comspec/i, 'maybe_command() without extension' ); } my $had_pathext = exists $ENV{PATHEXT}; { local $ENV{PATHEXT} = '.exe'; - ok( ! $MM->maybe_command( 'not_a_command.com' ), + ok( ! $MM->maybe_command( 'not_a_command.com' ), 'not a maybe_command()' ); } # Bug in Perl. local $ENV{FOO} won't delete the key afterward. @@ -65,14 +65,14 @@ delete $ENV{PATHEXT} unless $had_pathext; # file_name_is_absolute() [Does not support UNC-paths] { - ok( $MM->file_name_is_absolute( 'C:/' ), + ok( $MM->file_name_is_absolute( 'C:/' ), 'file_name_is_absolute()' ); ok( ! $MM->file_name_is_absolute( 'some/path/' ), 'not file_name_is_absolute()' ); } -# find_perl() +# find_perl() # Should be able to find running perl... $^X is OK on Win32 { my $my_perl = $1 if $^X =~ /(.*)/; # are we in -T or -t? @@ -85,10 +85,10 @@ delete $ENV{PATHEXT} unless $had_pathext; { my @path_eg = qw( c: trick dir/now_OK ); - is( $MM->catdir( @path_eg ), + is( $MM->catdir( @path_eg ), 'C:\\trick\\dir\\now_OK', 'catdir()' ); - is( $MM->catdir( @path_eg ), - File::Spec->catdir( @path_eg ), + is( $MM->catdir( @path_eg ), + File::Spec->catdir( @path_eg ), 'catdir() eq File::Spec->catdir()' ); # catfile() (calls MM_Win32->catdir) @@ -97,8 +97,8 @@ delete $ENV{PATHEXT} unless $had_pathext; is( $MM->catfile( @path_eg ), 'C:\\trick\\dir\\now_OK\\file.ext', 'catfile()' ); - is( $MM->catfile( @path_eg ), - File::Spec->catfile( @path_eg ), + is( $MM->catfile( @path_eg ), + File::Spec->catfile( @path_eg ), 'catfile() eq File::Spec->catfile()' ); } @@ -126,7 +126,7 @@ note "init_others creates expected keys"; { # init_* methods and check the keys in $mm_w32 directly { my $mm_w32 = bless { - NAME => 'TestMM_Win32', + NAME => 'TestMM_Win32', VERSION => '1.00', PM => { 'MM_Win32.pm' => 1 }, MAKE => $Config{make}, @@ -175,7 +175,7 @@ note "init_others creates expected keys"; { # init_linker { - my $libperl = File::Spec->catfile('$(PERL_INC)', + my $libperl = File::Spec->catfile('$(PERL_INC)', $Config{libperl} || 'libperl.a'); my $export = '$(BASEEXT).def'; my $after = ''; @@ -207,19 +207,19 @@ EOSCRIPT skip( "Can't write to temp file: $!", 4 ) unless close SCRIPT; # now start tests: - is( $MM->perl_script( $script_name ), + is( $MM->perl_script( $script_name ), "${script_name}$script_ext", "perl_script ($script_ext)" ); skip( "Can't rename temp file: $!", 3 ) unless rename $script_name, "${script_name}.pl"; $script_ext = '.pl'; - is( $MM->perl_script( $script_name ), + is( $MM->perl_script( $script_name ), "${script_name}$script_ext", "perl_script ($script_ext)" ); skip( "Can't rename temp file: $!", 2 ) unless rename "${script_name}$script_ext", "${script_name}.bat"; $script_ext = '.bat'; - is( $MM->perl_script( $script_name ), + is( $MM->perl_script( $script_name ), "${script_name}$script_ext", "perl_script ($script_ext)" ); skip( "Can't rename temp file: $!", 1 ) @@ -227,7 +227,7 @@ EOSCRIPT $script_ext = '.noscript'; isnt( $MM->perl_script( $script_name ), - "${script_name}$script_ext", + "${script_name}$script_ext", "not a perl_script anymore ($script_ext)" ); is( $MM->perl_script( $script_name ), undef, "perl_script ($script_ext) returns empty" ); diff --git a/cpan/ExtUtils-MakeMaker/t/Mkbootstrap.t b/cpan/ExtUtils-MakeMaker/t/Mkbootstrap.t index 17a3e4550a..db061a4a92 100644 --- a/cpan/ExtUtils-MakeMaker/t/Mkbootstrap.t +++ b/cpan/ExtUtils-MakeMaker/t/Mkbootstrap.t @@ -75,7 +75,7 @@ SKIP: { chmod 0444, 'dasboot.bs'; SKIP: { - skip("cannot write readonly files", 1) if -w 'dasboot.bs'; + skip("cannot write readonly files", 1) if -w 'dasboot.bs'; eval{ Mkbootstrap('dasboot', 1) }; like( $@, qr/Unable to open dasboot\.bs/, 'should die given bad filename' ); @@ -121,7 +121,7 @@ SKIP: { local $DynaLoader::bscode; $DynaLoader::bscode = 'Wall'; $ExtUtils::Mkbootstrap::Verbose = 0; - + # if arguments contain '-l' or '-L' or '-R' print dl_findfile message eval{ Mkbootstrap('dasboot', '-Larry') }; is( $@, '', 'should be able to open a file again'); diff --git a/cpan/ExtUtils-MakeMaker/t/PL_FILES.t b/cpan/ExtUtils-MakeMaker/t/PL_FILES.t index 2d22790692..0b9aed320e 100644 --- a/cpan/ExtUtils-MakeMaker/t/PL_FILES.t +++ b/cpan/ExtUtils-MakeMaker/t/PL_FILES.t @@ -18,7 +18,7 @@ perl_lib(); setup; -END { +END { ok( chdir File::Spec->updir ); ok( teardown ); } diff --git a/cpan/ExtUtils-MakeMaker/t/arch_check.t b/cpan/ExtUtils-MakeMaker/t/arch_check.t index e4b3aef7af..076415bdb3 100644 --- a/cpan/ExtUtils-MakeMaker/t/arch_check.t +++ b/cpan/ExtUtils-MakeMaker/t/arch_check.t @@ -9,7 +9,7 @@ use Test::More 'no_plan'; use Config; use ExtUtils::MakeMaker; -ok( my $stdout = tie *STDOUT, 'TieOut' ); +ok( my $stdout = tie *STDOUT, 'TieOut' ); # Create a normalized MM object to test with my $mm = bless {}, "MM"; @@ -32,11 +32,11 @@ ok $mm->arch_check( ); like $stdout->read, qr{\Q -Your perl and your Config.pm seem to have different ideas about the +Your perl and your Config.pm seem to have different ideas about the architecture they are running on. Perl thinks: [arch1] Config says: [$Config{archname}] -This may or may not cause problems. Please check your installation of perl +This may or may not cause problems. Please check your installation of perl if you have problems building this extension. }; diff --git a/cpan/ExtUtils-MakeMaker/t/basic.t b/cpan/ExtUtils-MakeMaker/t/basic.t index 1410465a9f..cecf0e50b8 100644 --- a/cpan/ExtUtils-MakeMaker/t/basic.t +++ b/cpan/ExtUtils-MakeMaker/t/basic.t @@ -45,7 +45,7 @@ cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || diag(@mpl_out); my $makefile = makefile_name(); -ok( grep(/^Writing $makefile for Big::Dummy/, +ok( grep(/^Writing $makefile for Big::Dummy/, @mpl_out) == 1, 'Makefile.PL output looks right'); @@ -79,12 +79,12 @@ ok( open(PPD, 'Big-Dummy.ppd'), ' .ppd file generated' ); my $ppd_html; { local $/; $ppd_html = <PPD> } close PPD; -like( $ppd_html, qr{^<SOFTPKG NAME="Big-Dummy" VERSION="0.01">}m, +like( $ppd_html, qr{^<SOFTPKG NAME="Big-Dummy" VERSION="0.01">}m, ' <SOFTPKG>' ); like( $ppd_html, qr{^\s*<ABSTRACT>Try "our" hot dog's, \$andwiche\$ and \$\(ub\)\$!</ABSTRACT>}m, ' <ABSTRACT>'); -like( $ppd_html, +like( $ppd_html, qr{^\s*<AUTHOR>Michael G Schwern <schwern\@pobox.com></AUTHOR>}m, ' <AUTHOR>' ); like( $ppd_html, qr{^\s*<IMPLEMENTATION>}m, ' <IMPLEMENTATION>'); @@ -106,7 +106,7 @@ END { unlink 'Big-Dummy.ppd' } my $test_out = run("$make test"); like( $test_out, qr/All tests successful/, 'make test' ); -is( $?, 0, ' exited normally' ) || +is( $?, 0, ' exited normally' ) || diag $test_out; # Test 'make test TEST_VERBOSE=1' @@ -124,14 +124,14 @@ like( $install_out, qr/^Installing /m ); ok( -r '../dummy-install', ' install dir created' ); my %files = (); -find( sub { +find( sub { # do it case-insensitive for non-case preserving OSs my $file = lc $_; # VMS likes to put dots on the end of things that don't have them. $file =~ s/\.$// if $Is_VMS; - $files{$file} = $File::Find::name; + $files{$file} = $File::Find::name; }, '../dummy-install' ); ok( $files{'dummy.pm'}, ' Dummy.pm installed' ); ok( $files{'liar.pm'}, ' Liar.pm installed' ); @@ -163,14 +163,14 @@ SKIP: { skip 'VMS install targets do not preserve $(DESTDIR)', 10 if $Is_VMS; $install_out = run("$make install PREFIX= DESTDIR=other"); - is( $?, 0, 'install with DESTDIR' ) || + is( $?, 0, 'install with DESTDIR' ) || diag $install_out; like( $install_out, qr/^Installing /m ); ok( -d 'other', ' destdir created' ); %files = (); my $perllocal; - find( sub { + find( sub { $files{$_} = $File::Find::name; }, 'other' ); ok( $files{'Dummy.pm'}, ' Dummy.pm installed' ); @@ -179,7 +179,7 @@ SKIP: { ok( $files{'.packlist'}, ' packlist created' ); ok( $files{'perllocal.pod'},' perllocal.pod created' ); - ok( open(PERLLOCAL, $files{'perllocal.pod'} ) ) || + ok( open(PERLLOCAL, $files{'perllocal.pod'} ) ) || diag("Can't open $files{'perllocal.pod'}: $!"); { local $/; unlike(<PERLLOCAL>, qr/other/, 'DESTDIR should not appear in perllocal'); @@ -187,7 +187,7 @@ SKIP: { close PERLLOCAL; # TODO not available in the min version of Test::Harness we require -# ok( open(PACKLIST, $files{'.packlist'} ) ) || +# ok( open(PACKLIST, $files{'.packlist'} ) ) || # diag("Can't open $files{'.packlist'}: $!"); # { local $/; # local $TODO = 'DESTDIR still in .packlist'; @@ -203,7 +203,7 @@ SKIP: { skip 'VMS install targets do not preserve $(PREFIX)', 9 if $Is_VMS; $install_out = run("$make install PREFIX=elsewhere DESTDIR=other/"); - is( $?, 0, 'install with PREFIX override and DESTDIR' ) || + is( $?, 0, 'install with PREFIX override and DESTDIR' ) || diag $install_out; like( $install_out, qr/^Installing /m ); @@ -394,7 +394,7 @@ note "META file validity"; { cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || diag(@mpl_out); ok( grep(/^Writing $makefile for Big::Dummy/, @mpl_out) == 1, - 'init_dirscan skipped distdir') || + 'init_dirscan skipped distdir') || diag(@mpl_out); # I know we'll get ignored errors from make here, that's ok. diff --git a/cpan/ExtUtils-MakeMaker/t/cd.t b/cpan/ExtUtils-MakeMaker/t/cd.t index 2563bf01d5..2b30145956 100644 --- a/cpan/ExtUtils-MakeMaker/t/cd.t +++ b/cpan/ExtUtils-MakeMaker/t/cd.t @@ -26,14 +26,14 @@ my @cd_args = ($dir, "command1", "command2"); my @dirs = (File::Spec->updir) x 2; my $expected_updir = File::Spec->catdir(@dirs); - + ::is $mm->cd(@cd_args), qq{cd $dir command1 command2 cd $expected_updir}; } - + { local *make = sub { "dmake" }; @@ -51,7 +51,7 @@ qq{cd $dir && command1 SKIP: { skip("VMS' cd requires vmspath which is only on VMS", 1) unless $Is_VMS; - + use ExtUtils::MM_VMS; is +ExtUtils::MM_VMS->cd(@cd_args), q{startdir = F$Environment("Default") diff --git a/cpan/ExtUtils-MakeMaker/t/fixin.t b/cpan/ExtUtils-MakeMaker/t/fixin.t index ab3a177b38..f8c73e8e36 100644 --- a/cpan/ExtUtils-MakeMaker/t/fixin.t +++ b/cpan/ExtUtils-MakeMaker/t/fixin.t @@ -75,9 +75,9 @@ END my @lines = @_; unlike $lines[$shb_line_num], qr[/foo/bar/perl], "#! replaced"; like $lines[$shb_line_num], qr[ -w\b], "switch retained"; - + # In between might be that "not running under some shell" madness. - + is $lines[-1], "blah blah blah\n", "Program text retained"; } ); diff --git a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm index 8df77d4784..6964e30fdf 100644 --- a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm +++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm @@ -119,7 +119,7 @@ sub setup_recurs { return 1; } -sub teardown_recurs { +sub teardown_recurs { foreach my $file (keys %Files) { my $dir = dirname($file); if( -e $dir ) { diff --git a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm index 7446185444..ec0247da86 100644 --- a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm +++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm @@ -110,7 +110,7 @@ sub setup { return 1; } -sub teardown { +sub teardown { foreach my $file (keys %Files) { my $dir = dirname($file); if( -e $dir ) { diff --git a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm index c6573a1aad..59ac1517a6 100644 --- a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm +++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm @@ -48,7 +48,7 @@ sub setup_recurs { return 1; } -sub teardown_recurs { +sub teardown_recurs { foreach my $file (keys %Files) { my $dir = dirname($file); if( -e $dir ) { diff --git a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm index ad1be2f6d1..e7e804f68c 100644 --- a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm +++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm @@ -60,7 +60,7 @@ sub setup_recurs { return 1; } -sub teardown_recurs { +sub teardown_recurs { foreach my $file (keys %Files) { my $dir = dirname($file); if( -e $dir ) { diff --git a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm index 195fd56feb..2e944d1bd7 100644 --- a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm +++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm @@ -51,7 +51,7 @@ is_even(input) CODE: RETVAL = (input % 2 == 0); OUTPUT: - RETVAL + RETVAL END 'XS-Test/t/is_even.t' => <<'END', @@ -84,7 +84,7 @@ sub setup_xs { return 1; } -sub teardown_xs { +sub teardown_xs { foreach my $file (keys %Files) { my $dir = dirname($file); if( -e $dir ) { diff --git a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm index 9a6ab60e35..9f7e3f1be5 100644 --- a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm +++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm @@ -128,7 +128,7 @@ sub which_perl { # When building in the core, *don't* go off and find # another perl - die "Can't find a perl to use (\$^X=$^X), (\$perlpath=$perlpath)" + die "Can't find a perl to use (\$^X=$^X), (\$perlpath=$perlpath)" if $ENV{PERL_CORE}; foreach my $path (File::Spec->path) { @@ -162,7 +162,7 @@ sub perl_lib { unshift @INC, $lib; } -END { +END { if( $had5lib ) { $ENV{PERL5LIB} = $old5lib; } @@ -183,7 +183,7 @@ should generate. sub makefile_name { return $Is_VMS ? 'Descrip.MMS' : 'Makefile'; -} +} =item B<makefile_backup> @@ -236,7 +236,7 @@ sub make_run { Returns the command necessary to run $make on the given $target using the given %macros. - my $make_test_verbose = make_macro(make_run(), 'test', + my $make_test_verbose = make_macro(make_run(), 'test', TEST_VERBOSE => 1); This is important because VMS's make utilities have a completely @@ -300,7 +300,7 @@ sub run { use ExtUtils::MM; - # Unix, modern Windows and OS/2 from 5.005_54 up can handle 2>&1 + # Unix, modern Windows and OS/2 from 5.005_54 up can handle 2>&1 # This makes our failure diagnostics nicer to read. if( MM->os_flavor_is('Unix') or (MM->os_flavor_is('Win32') and !MM->os_flavor_is('Win9x')) or @@ -336,7 +336,7 @@ sub run_ok { =item B<setup_mm_test_root> -Creates a rooted logical to avoid the 8-level limit on older VMS systems. +Creates a rooted logical to avoid the 8-level limit on older VMS systems. No action taken on non-VMS systems. =cut @@ -347,7 +347,7 @@ sub setup_mm_test_root { # imposed by RMS. We get around this with a rooted logical, but we # can't create logical names with attributes in Perl, so we do it # in a DCL subprocess and put it in the job table so the parent sees it. - open( MMTMP, '>mmtesttmp.com' ) || + open( MMTMP, '>mmtesttmp.com' ) || die "Error creating command file; $!"; print MMTMP <<'COMMAND'; $ MM_TEST_ROOT = F$PARSE("SYS$DISK:[--]",,,,"NO_CONCEAL")-".][000000"-"]["-"].;"+".]" diff --git a/cpan/ExtUtils-MakeMaker/t/maketext_filter.t b/cpan/ExtUtils-MakeMaker/t/maketext_filter.t index 404a91c94f..ccb6a77998 100644 --- a/cpan/ExtUtils-MakeMaker/t/maketext_filter.t +++ b/cpan/ExtUtils-MakeMaker/t/maketext_filter.t @@ -12,7 +12,7 @@ use ExtUtils::MM_VMS; sub test_filter { my($text, $vms_text) = @_; - + local $Test::Builder::Level = $Test::Builder::Level + 1; is( ExtUtils::MM_Any->maketext_filter($text), $text, 'default filter' ); is( ExtUtils::MM_VMS->maketext_filter($text), $vms_text, 'VMS filter' ); diff --git a/cpan/ExtUtils-MakeMaker/t/metafile_data.t b/cpan/ExtUtils-MakeMaker/t/metafile_data.t index 1fb8d10b9d..94ce0948b0 100644 --- a/cpan/ExtUtils-MakeMaker/t/metafile_data.t +++ b/cpan/ExtUtils-MakeMaker/t/metafile_data.t @@ -83,7 +83,7 @@ my $new_mm = sub { generated_by => "ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION", 'meta-spec' => { - url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', + url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', version => 1.4 }, }; @@ -111,7 +111,7 @@ my $new_mm = sub { generated_by => "ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION", 'meta-spec' => { - url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', + url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', version => 1.4 }, }, 'rt.cpan.org 39348'; @@ -171,7 +171,7 @@ my $new_mm = sub { generated_by => "ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION", 'meta-spec' => { - url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', + url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', version => 1.4 }, @@ -218,7 +218,7 @@ my $new_mm = sub { generated_by => "ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION", 'meta-spec' => { - url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', + url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', version => 1.4 }, }; @@ -266,7 +266,7 @@ my $new_mm = sub { generated_by => "ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION", 'meta-spec' => { - url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', + url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', version => 1.4 }, }; @@ -307,7 +307,7 @@ my $new_mm = sub { generated_by => "ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION", 'meta-spec' => { - url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', + url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', version => 1.4 }, },'CONFIGURE_REQUIRES'; @@ -348,7 +348,7 @@ my $new_mm = sub { generated_by => "ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION", 'meta-spec' => { - url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', + url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', version => 1.4 }, },'CONFIGURE_REQUIRES'; @@ -389,7 +389,7 @@ my $new_mm = sub { generated_by => "ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION", 'meta-spec' => { - url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', + url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', version => 1.4 }, },'META.yml data (META_ADD wins)'; diff --git a/cpan/ExtUtils-MakeMaker/t/metafile_file.t b/cpan/ExtUtils-MakeMaker/t/metafile_file.t index e4e98dc4a0..3085c22cc5 100644 --- a/cpan/ExtUtils-MakeMaker/t/metafile_file.t +++ b/cpan/ExtUtils-MakeMaker/t/metafile_file.t @@ -103,7 +103,7 @@ YAML { - my @meta = ( + my @meta = ( name => 'My-Module', version => '0.1', version_from => 'lib/My/Module.pm', @@ -145,7 +145,7 @@ YAML } { - my @meta = ( + my @meta = ( name => 'My-Module', version => '0.1', version_from => 'lib/My/Module.pm', @@ -196,7 +196,7 @@ YAML } { - my @meta = ( + my @meta = ( name => 'My-Module', version => '0.1', version_from => 'lib/My/Module.pm', @@ -267,7 +267,7 @@ YAML SKIP: { - # Load() behaves diffrently in versions prior to 1.06 + # Load() behaves diffrently in versions prior to 1.06 skip "Need YAML::Tiny to test if it can load META.yml", 2 unless eval { require YAML::Tiny } and $YAML::Tiny::VERSION >= 1.06; @@ -294,7 +294,7 @@ YAML my @meta = ( k => \*STDOUT ); eval { $mm->metafile_file(@meta) }; - like($@, qr/^only nested hashes, arrays and objects are supported/, + like($@, qr/^only nested hashes, arrays and objects are supported/, "we don't like but hash/array refs"); } @@ -302,7 +302,7 @@ YAML my @meta = ( k => [ [] ] ); eval { $mm->metafile_file(@meta) }; - like($@, qr/^only nested arrays of non-refs are supported/, + like($@, qr/^only nested arrays of non-refs are supported/, "we also don't like but array of strings"); } diff --git a/cpan/ExtUtils-MakeMaker/t/miniperl.t b/cpan/ExtUtils-MakeMaker/t/miniperl.t index 9a4def2028..d3177bebfe 100644 --- a/cpan/ExtUtils-MakeMaker/t/miniperl.t +++ b/cpan/ExtUtils-MakeMaker/t/miniperl.t @@ -12,7 +12,7 @@ use Test::More; BEGIN { plan skip_all => "miniperl test only necessary for the perl core" if !$ENV{PERL_CORE}; - + plan "no_plan"; } diff --git a/cpan/ExtUtils-MakeMaker/t/parse_version.t b/cpan/ExtUtils-MakeMaker/t/parse_version.t index 9a249a4fdc..e0d181b3cd 100644 --- a/cpan/ExtUtils-MakeMaker/t/parse_version.t +++ b/cpan/ExtUtils-MakeMaker/t/parse_version.t @@ -11,6 +11,7 @@ use File::Temp qw[tempfile]; my $Has_Version = eval 'require version; "version"->import; 1'; +# "undef" - means we expect "undef", undef - eval should be never called for this string my %versions = (q[$VERSION = '1.00'] => '1.00', q[*VERSION = \'1.01'] => '1.01', q[($VERSION) = q$Revision: 32208 $ =~ /(\d+)/g;] => 32208, @@ -20,30 +21,35 @@ my %versions = (q[$VERSION = '1.00'] => '1.00', '$VERSION = 0.0' => 0.0, '$VERSION = -1.0' => -1.0, '$VERSION = undef' => 'undef', - '$wibble = 1.0' => 'undef', + '$wibble = 1.0' => undef, q[my $VERSION = '1.01'] => 'undef', q[local $VERISON = '1.02'] => 'undef', q[local $FOO::VERSION = '1.30'] => 'undef', q[if( $Foo::VERSION >= 3.00 ) {]=> 'undef', q[our $VERSION = '1.23';] => '1.23', + q[$CGI::VERSION='3.63'] => '3.63', + q[$VERSION = "1.627"; # ==> ALSO update the version in the pod text below!] => '1.627', - '$Something::VERSION == 1.0' => 'undef', - '$Something::VERSION <= 1.0' => 'undef', - '$Something::VERSION >= 1.0' => 'undef', - '$Something::VERSION != 1.0' => 'undef', + '$Something::VERSION == 1.0' => undef, + '$Something::VERSION <= 1.0' => undef, + '$Something::VERSION >= 1.0' => undef, + '$Something::VERSION != 1.0' => undef, + 'my $meta_coder = ($JSON::XS::VERSION >= 1.4) ?' => undef, qq[\$Something::VERSION == 1.0\n\$VERSION = 2.3\n] => '2.3', qq[\$Something::VERSION == 1.0\n\$VERSION = 2.3\n\$VERSION = 4.5\n] => '2.3', '$VERSION = sprintf("%d.%03d", q$Revision: 3.74 $ =~ /(\d+)\.(\d+)/);' => '3.074', '$VERSION = substr(q$Revision: 2.8 $, 10) + 2 . "";' => '4.8', - 'elsif ( $Something::VERSION >= 1.99 )' => 'undef', + q[our $VERSION = do { my @r = ( q$Revision: 2.7 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };] => '2.07', # Fucking seriously? + 'elsif ( $Something::VERSION >= 1.99 )' => undef, ); if( $Has_Version ) { $versions{q[use version; $VERSION = qv("1.2.3");]} = qv("1.2.3"); $versions{q[$VERSION = qv("1.2.3")]} = qv("1.2.3"); + $versions{q[$VERSION = v1.2.3]} = 'v1.2.3'; } if( $] >= 5.011001 ) { @@ -74,14 +80,24 @@ our $VERSION = 2.34; END } -plan tests => (3 * keys %versions) + 4; +plan tests => (3 * keys %versions) + 4 + grep { !defined} (values %versions); for my $code ( sort keys %versions ) { my $expect = $versions{$code}; (my $label = $code) =~ s/\n/\\n/g; my $warnings = ""; local $SIG{__WARN__} = sub { $warnings .= "@_\n"; }; - is( parse_version_string($code), $expect, $label ); + if (defined $expect) { + is( parse_version_string($code), $expect, $label ); + } else { + my $is_called = 0; + no warnings qw[redefine once]; + local *MM::get_version = sub { + $is_called = 1; + }; + ok !$is_called; + is( parse_version_string($code), 'undef', $label ); + } is($warnings, '', "$label does not cause warnings"); } diff --git a/cpan/ExtUtils-MakeMaker/t/postamble.t b/cpan/ExtUtils-MakeMaker/t/postamble.t index c83a1c8910..711e979e52 100644 --- a/cpan/ExtUtils-MakeMaker/t/postamble.t +++ b/cpan/ExtUtils-MakeMaker/t/postamble.t @@ -49,7 +49,7 @@ ok( chdir 'Big-Dummy', q{chdir'd to Big-Dummy} ) || sub MY::postamble { my($self, %extra) = @_; - is_deeply( \%extra, { FOO => 1, BAR => 'fugawazads' }, + is_deeply( \%extra, { FOO => 1, BAR => 'fugawazads' }, 'postamble args passed' ); return <<OUT; @@ -60,7 +60,7 @@ OUT ok( open(MAKEFILE, $Makefile) ) or diag "Can't open $Makefile: $!"; -{ local $/; +{ local $/; like( <MAKEFILE>, qr/^\# This makes sure the postamble gets written\n/m, 'postamble added to the Makefile' ); } diff --git a/cpan/ExtUtils-MakeMaker/t/prereq.t b/cpan/ExtUtils-MakeMaker/t/prereq.t index 07bbaf02d3..3149193186 100644 --- a/cpan/ExtUtils-MakeMaker/t/prereq.t +++ b/cpan/ExtUtils-MakeMaker/t/prereq.t @@ -53,7 +53,7 @@ ok( chdir 'Big-Dummy', "chdir'd to Big-Dummy" ) || strict => 99999 } ); - is $warnings, + is $warnings, sprintf("Warning: prerequisite strict 99999 not found. We have %s.\n", $strict::VERSION); @@ -64,7 +64,7 @@ ok( chdir 'Big-Dummy', "chdir'd to Big-Dummy" ) || "I::Do::Not::Exist" => 0, } ); - is $warnings, + is $warnings, "Warning: prerequisite I::Do::Not::Exist 0 not found.\n"; @@ -89,11 +89,11 @@ ok( chdir 'Big-Dummy', "chdir'd to Big-Dummy" ) || "strict" => 99999, } ); - is $warnings, + is $warnings, "Warning: prerequisite I::Do::Not::Exist 0 not found.\n". sprintf("Warning: prerequisite strict 99999 not found. We have %s.\n", $strict::VERSION); - + $warnings = ''; eval { WriteMakefile( @@ -106,7 +106,7 @@ ok( chdir 'Big-Dummy', "chdir'd to Big-Dummy" ) || PREREQ_FATAL => 1, ); }; - + is $warnings, ''; is $@, <<'END', "PREREQ_FATAL"; MakeMaker FATAL: prerequisites not found. @@ -131,7 +131,7 @@ END PREREQ_FATAL => 1, ); }; - + is $warnings, ''; is $@, <<'END', "PREREQ_FATAL happens before CONFIGURE"; MakeMaker FATAL: prerequisites not found. diff --git a/cpan/ExtUtils-MakeMaker/t/prereq_print.t b/cpan/ExtUtils-MakeMaker/t/prereq_print.t index e93a2fd8b9..9170aa0e4e 100644 --- a/cpan/ExtUtils-MakeMaker/t/prereq_print.t +++ b/cpan/ExtUtils-MakeMaker/t/prereq_print.t @@ -58,7 +58,7 @@ is( $?, 0, ' exited normally' ); $prereq_out = run(qq{$Perl Makefile.PL "PRINT_PREREQ=1"}); ok( !-r $Makefile, "PRINT_PREREQ produces no $Makefile" ); is( $?, 0, ' exited normally' ); -::like( $prereq_out, qr/^perl\(strict\) \s* >= \s* 0 \s*$/x, +::like( $prereq_out, qr/^perl\(strict\) \s* >= \s* 0 \s*$/x, 'prereqs dumped' ); diff --git a/cpan/ExtUtils-MakeMaker/t/problems.t b/cpan/ExtUtils-MakeMaker/t/problems.t index 8956539de5..3aeba706ef 100644 --- a/cpan/ExtUtils-MakeMaker/t/problems.t +++ b/cpan/ExtUtils-MakeMaker/t/problems.t @@ -33,7 +33,7 @@ ok( chdir 'Problem-Module', "chdir'd to Problem-Module" ) || eval { $MM->eval_in_subdirs; }; is( $stdout->read, qq{\@INC has .\n}, 'cwd in @INC' ); - like( $@, + like( $@, qr{^ERROR from evaluation of .*subdir.*Makefile.PL: YYYAaaaakkk}, 'Makefile.PL death in subdir warns' ); diff --git a/cpan/ExtUtils-MakeMaker/t/prompt.t b/cpan/ExtUtils-MakeMaker/t/prompt.t index d428aa835e..d6f343eb6a 100644 --- a/cpan/ExtUtils-MakeMaker/t/prompt.t +++ b/cpan/ExtUtils-MakeMaker/t/prompt.t @@ -19,7 +19,7 @@ like( $@, qr/^Not enough arguments for ExtUtils::MakeMaker::prompt/, eval { prompt(undef); }; -like( $@, qr/^prompt function called without an argument/, +like( $@, qr/^prompt function called without an argument/, 'undef message' ); my $stdout = tie *STDOUT, 'TieOut' or die; diff --git a/cpan/ExtUtils-MakeMaker/t/recurs.t b/cpan/ExtUtils-MakeMaker/t/recurs.t index 746a09a219..b7c561bc9c 100644 --- a/cpan/ExtUtils-MakeMaker/t/recurs.t +++ b/cpan/ExtUtils-MakeMaker/t/recurs.t @@ -29,7 +29,7 @@ my $Touch_Time = calibrate_mtime(); $| = 1; ok( setup_recurs(), 'setup' ); -END { +END { ok( chdir File::Spec->updir ); ok( teardown_recurs(), 'teardown' ); } @@ -100,9 +100,9 @@ ok( -e $submakefile, 'sub Makefile written' ); my $inst_script = File::Spec->catdir(File::Spec->updir, 'cgi'); ok( open(MAKEFILE, $submakefile) ) || diag("Can't open $submakefile: $!"); -{ local $/; - like( <MAKEFILE>, qr/^\s*INST_SCRIPT\s*=\s*\Q$inst_script\E/m, - 'prepend .. not stomping WriteMakefile args' ) +{ local $/; + like( <MAKEFILE>, qr/^\s*INST_SCRIPT\s*=\s*\Q$inst_script\E/m, + 'prepend .. not stomping WriteMakefile args' ) } close MAKEFILE; diff --git a/cpan/ExtUtils-MakeMaker/t/revision.t b/cpan/ExtUtils-MakeMaker/t/revision.t index ebfea1a296..97e19c7fbb 100644 --- a/cpan/ExtUtils-MakeMaker/t/revision.t +++ b/cpan/ExtUtils-MakeMaker/t/revision.t @@ -6,8 +6,8 @@ BEGIN { use Test::More tests => 4; -BEGIN { - use_ok 'ExtUtils::MakeMaker'; +BEGIN { + use_ok 'ExtUtils::MakeMaker'; use_ok 'ExtUtils::MM_VMS'; } diff --git a/cpan/ExtUtils-MakeMaker/t/several_authors.t b/cpan/ExtUtils-MakeMaker/t/several_authors.t index bf6cdcb906..eba35e13a6 100644 --- a/cpan/ExtUtils-MakeMaker/t/several_authors.t +++ b/cpan/ExtUtils-MakeMaker/t/several_authors.t @@ -68,7 +68,7 @@ note "argument verification via CONFIGURE"; { eval { WriteMakefile( NAME => 'Multiple::Authors', - CONFIGURE => sub { + CONFIGURE => sub { return {AUTHOR => 'John Doe <jd@example.com>',}; }, ); diff --git a/cpan/ExtUtils-MakeMaker/t/testlib.t b/cpan/ExtUtils-MakeMaker/t/testlib.t index b2c8ddbadf..90691ae2e7 100644 --- a/cpan/ExtUtils-MakeMaker/t/testlib.t +++ b/cpan/ExtUtils-MakeMaker/t/testlib.t @@ -8,7 +8,7 @@ chdir 't'; use Test::More tests => 5; -BEGIN { +BEGIN { # non-core tests will have blib in their path. We remove it # and just use the one in lib/. unless( $ENV{PERL_CORE} ) { diff --git a/cpan/ExtUtils-MakeMaker/t/writemakefile_args.t b/cpan/ExtUtils-MakeMaker/t/writemakefile_args.t index daa8255fbe..421a311c18 100644 --- a/cpan/ExtUtils-MakeMaker/t/writemakefile_args.t +++ b/cpan/ExtUtils-MakeMaker/t/writemakefile_args.t @@ -225,7 +225,7 @@ VERIFY }; is( $warnings, '' ); is_deeply( $mm->{AUTHOR}, ["test"] ); - + # AUTHOR / array $warnings = ''; @@ -238,5 +238,5 @@ VERIFY }; is( $warnings, '' ); is_deeply( $mm->{AUTHOR}, ["test1","test2"] ); - + } diff --git a/cpan/ExtUtils-MakeMaker/t/xs.t b/cpan/ExtUtils-MakeMaker/t/xs.t index 5cb17c2fed..3f9a4df4ba 100644 --- a/cpan/ExtUtils-MakeMaker/t/xs.t +++ b/cpan/ExtUtils-MakeMaker/t/xs.t @@ -50,9 +50,9 @@ cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || my $make = make_run(); my $make_out = run("$make"); -is( $?, 0, ' make exited normally' ) || +is( $?, 0, ' make exited normally' ) || diag $make_out; my $test_out = run("$make test"); -is( $?, 0, ' make test exited normally' ) || +is( $?, 0, ' make test exited normally' ) || diag $test_out; |