This is an automated email from the git hooks/post-receive script. dom pushed a commit to branch master in repository libclass-errorhandler-perl.
commit 44c391b02dbe1c64fd6e14b82dd4e9f75a8ac0f0 Author: Dominic Hargreaves <d...@earth.li> Date: Sun Jun 9 11:02:33 2013 +0100 Imported Upstream version 0.02 --- Build.PL | 3 - Changes | 4 + MANIFEST | 4 - META.yml | 26 +- Makefile.PL | 6 - inc/ExtUtils/AutoInstall.pm | 631 ---------------------------- inc/Module/Install.pm | 527 ++++++++++++++++++----- inc/Module/Install/AutoInstall.pm | 65 --- inc/Module/Install/Base.pm | 82 ++-- inc/Module/Install/Build.pm | 66 --- inc/Module/Install/Can.pm | 163 ++++++-- inc/Module/Install/Fetch.pm | 26 +- inc/Module/Install/Include.pm | 38 +- inc/Module/Install/Makefile.pm | 488 +++++++++++++++++----- inc/Module/Install/Metadata.pm | 852 +++++++++++++++++++++++++++++++------- inc/Module/Install/Win32.pm | 76 ++-- inc/Module/Install/WriteAll.pm | 88 ++-- lib/Class/ErrorHandler.pm | 2 +- 18 files changed, 1839 insertions(+), 1308 deletions(-) diff --git a/Build.PL b/Build.PL deleted file mode 100644 index 03fd8de..0000000 --- a/Build.PL +++ /dev/null @@ -1,3 +0,0 @@ -# $Id: Build.PL,v 1.1.1.1 2004/08/15 14:55:43 btrott Exp $ - -require 'Makefile.PL'; diff --git a/Changes b/Changes index ed42184..c596d4c 100644 --- a/Changes +++ b/Changes @@ -2,5 +2,9 @@ Revision history for Class::ErrorHandler +0.02 2013.04.25 + - Re-packaging without auto_install(). + (ANDK) + 0.01 2004.08.15 - Initial distribution. diff --git a/MANIFEST b/MANIFEST index ee0faf1..3ec7a29 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,10 +1,6 @@ -Build.PL Changes -inc/ExtUtils/AutoInstall.pm inc/Module/Install.pm -inc/Module/Install/AutoInstall.pm inc/Module/Install/Base.pm -inc/Module/Install/Build.pm inc/Module/Install/Can.pm inc/Module/Install/Fetch.pm inc/Module/Install/Include.pm diff --git a/META.yml b/META.yml index 729efa0..5d7125b 100644 --- a/META.yml +++ b/META.yml @@ -1,11 +1,23 @@ -name: Class-ErrorHandler -version: 0.01 -abstract: Base class for error handling -author: Benjamin Trott <c...@stupidfool.org> -license: perl +--- +abstract: 'Base class for error handling' +author: + - 'Benjamin Trott <c...@stupidfool.org>' +build_requires: + ExtUtils::MakeMaker: 6.36 +configure_requires: + ExtUtils::MakeMaker: 6.36 distribution_type: module +dynamic_config: 1 +generated_by: 'Module::Install version 1.06' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Class-ErrorHandler no_index: directory: - - t - inc -generated_by: Module::Install version 0.33 + - t +resources: + license: http://dev.perl.org/licenses/ +version: 0.02 diff --git a/Makefile.PL b/Makefile.PL index 21d6398..153a8bf 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -8,11 +8,5 @@ author('Benjamin Trott <c...@stupidfool.org>'); version_from('lib/Class/ErrorHandler.pm'); license('perl'); no_index(directory => 't'); -sign(1); - -include('ExtUtils::AutoInstall'); - auto_include(); -auto_install(); - &WriteAll; diff --git a/inc/ExtUtils/AutoInstall.pm b/inc/ExtUtils/AutoInstall.pm deleted file mode 100644 index 5e43c13..0000000 --- a/inc/ExtUtils/AutoInstall.pm +++ /dev/null @@ -1,631 +0,0 @@ -#line 1 "inc/ExtUtils/AutoInstall.pm - /Library/Perl/5.8.1/ExtUtils/AutoInstall.pm" -# $File: //member/autrijus/ExtUtils-AutoInstall/lib/ExtUtils/AutoInstall.pm $ -# $Revision: #9 $ $Change: 9532 $ $DateTime: 2004/01/01 06:47:30 $ vim: expandtab shiftwidth=4 - -package ExtUtils::AutoInstall; -$ExtUtils::AutoInstall::VERSION = '0.56'; - -use strict; -use Cwd (); -use ExtUtils::MakeMaker (); - -#line 282 - -# special map on pre-defined feature sets -my %FeatureMap = ( - '' => 'Core Features', # XXX: deprecated - '-core' => 'Core Features', -); - -# various lexical flags -my (@Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS); -my ($Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly); -my ($PostambleActions, $PostambleUsed); - -$AcceptDefault = 1 unless -t STDIN; # non-interactive session -_init(); - -sub missing_modules { - return @Missing; -} - -sub do_install { - __PACKAGE__->install( - [ UNIVERSAL::isa($Config, 'HASH') ? %{$Config} : @{$Config}], - @Missing, - ); -} - -# initialize various flags, and/or perform install -sub _init { - foreach my $arg (@ARGV, split(/[\s\t]+/, $ENV{PERL_EXTUTILS_AUTOINSTALL} || '')) { - if ($arg =~ /^--config=(.*)$/) { - $Config = [ split(',', $1) ]; - } - elsif ($arg =~ /^--installdeps=(.*)$/) { - __PACKAGE__->install($Config, @Missing = split(/,/, $1)); - exit 0; - } - elsif ($arg =~ /^--default(?:deps)?$/) { - $AcceptDefault = 1; - } - elsif ($arg =~ /^--check(?:deps)?$/) { - $CheckOnly = 1; - } - elsif ($arg =~ /^--skip(?:deps)?$/) { - $SkipInstall = 1; - } - elsif ($arg =~ /^--test(?:only)?$/) { - $TestOnly = 1; - } - } -} - -# overrides MakeMaker's prompt() to automatically accept the default choice -sub _prompt { - goto &ExtUtils::MakeMaker::prompt unless $AcceptDefault; - - my ($prompt, $default) = @_; - my $y = ($default =~ /^[Yy]/); - - print $prompt, ' [', ($y ? 'Y' : 'y'), '/', ($y ? 'n' : 'N'), '] '; - print "$default\n"; - return $default; -} - -# the workhorse -sub import { - my $class = shift; - my @args = @_ or return; - my $core_all; - - print "*** $class version ".$class->VERSION."\n"; - print "*** Checking for dependencies...\n"; - - my $cwd = Cwd::cwd(); - - $Config = []; - - my $maxlen = length((sort { length($b) <=> length($a) } - grep { /^[^\-]/ } - map { ref($_) ? keys %{ref($_) eq 'HASH' ? $_ : +{@{$_}}} : '' } - map { +{@args}->{$_} } - grep { /^[^\-]/ or /^-core$/i } keys %{+{@args}})[0]); - - while (my ($feature, $modules) = splice(@args, 0, 2)) { - my (@required, @tests, @skiptests); - my $default = 1; - my $conflict = 0; - - if ($feature =~ m/^-(\w+)$/) { - my $option = lc($1); - - # check for a newer version of myself - _update_to($modules, @_) and return if $option eq 'version'; - - # sets CPAN configuration options - $Config = $modules if $option eq 'config'; - - # promote every features to core status - $core_all = ($modules =~ /^all$/i) and next - if $option eq 'core'; - - next unless $option eq 'core'; - } - - print "[".($FeatureMap{lc($feature)} || $feature)."]\n"; - - $modules = [ %{$modules} ] if UNIVERSAL::isa($modules, 'HASH'); - - unshift @$modules, -default => &{shift(@$modules)} - if (ref($modules->[0]) eq 'CODE'); # XXX: bugward combatability - - while (my ($mod, $arg) = splice(@$modules, 0, 2)) { - if ($mod =~ m/^-(\w+)$/) { - my $option = lc($1); - - $default = $arg if ($option eq 'default'); - $conflict = $arg if ($option eq 'conflict'); - @tests = @{$arg} if ($option eq 'tests'); - @skiptests = @{$arg} if ($option eq 'skiptests'); - - next; - } - - printf("- %-${maxlen}s ...", $mod); - - # XXX: check for conflicts and uninstalls(!) them. - if (defined(my $cur = _version_check(_load($mod), $arg ||= 0))) { - print "loaded. ($cur".($arg ? " >= $arg" : '').")\n"; - push @Existing, $mod => $arg; - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - else { - print "missing." . ($arg ? " (would need $arg)" : '') . "\n"; - push @required, $mod => $arg; - } - } - - next unless @required; - - my $mandatory = ($feature eq '-core' or $core_all); - - if (!$SkipInstall and ($CheckOnly or _prompt( - qq{==> Auto-install the }. (@required / 2). - ($mandatory ? ' mandatory' : ' optional'). - qq{ module(s) from CPAN?}, $default ? 'y' : 'n', - ) =~ /^[Yy]/)) { - push (@Missing, @required); - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - - elsif (!$SkipInstall and $default and $mandatory and _prompt( - qq{==> The module(s) are mandatory! Really skip?}, 'n', - ) =~ /^[Nn]/) { - push (@Missing, @required); - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - - else { - $DisabledTests{$_} = 1 for map { glob($_) } @tests; - } - } - - _check_lock(); # check for $UnderCPAN - - if (@Missing and not ($CheckOnly or $UnderCPAN)) { - require Config; - print "*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n"; - # make an educated guess of whether we'll need root permission. - print " (You may need to do that as the 'root' user.)\n" if eval '$>'; - } - print "*** $class configuration finished.\n"; - - chdir $cwd; - - # import to main:: - no strict 'refs'; - *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main'; -} - -# CPAN.pm is non-reentrant, so check if we're under it and have no CPANPLUS -sub _check_lock { - return unless @Missing; - return if _has_cpanplus(); - - require CPAN; CPAN::Config->load; - my $lock = MM->catfile($CPAN::Config->{cpan_home}, ".lock"); - - if (-f $lock and open(LOCK, $lock) - and ($^O eq 'MSWin32' ? _under_cpan() : <LOCK> == getppid()) - and ($CPAN::Config->{prerequisites_policy} || '') ne 'ignore' - ) { - print << '.'; - -*** Since we're running under CPAN, I'll just let it take care - of the dependency's installation later. -. - $UnderCPAN = 1; - } - - close LOCK; -} - -sub install { - my $class = shift; - - my $i; # used below to strip leading '-' from config keys - my @config = (map { s/^-// if ++$i; $_ } @{+shift}); - - my (@modules, @installed); - while (my ($pkg, $ver) = splice(@_, 0, 2)) { - # grep out those already installed - if (defined(_version_check(_load($pkg), $ver))) { - push @installed, $pkg; - } - else { - push @modules, $pkg, $ver; - } - } - - return @installed unless @modules; # nothing to do - - print "*** Installing dependencies...\n"; - - return unless _connected_to('cpan.org'); - - my %args = @config; - my %failed; - local *FAILED; - if ($args{do_once} and open(FAILED, '.#autoinstall.failed')) { - while (<FAILED>) { chomp; $failed{$_}++ } - close FAILED; - - my @newmod; - while (my ($k, $v) = splice(@modules, 0, 2)) { - push @newmod, ($k => $v) unless $failed{$k}; - } - @modules = @newmod; - } - - if (_has_cpanplus()) { - _install_cpanplus(\@modules, \@config); - } - else { - _install_cpan(\@modules, \@config); - } - - print "*** $class installation finished.\n"; - - # see if we have successfully installed them - while (my ($pkg, $ver) = splice(@modules, 0, 2)) { - if (defined(_version_check(_load($pkg), $ver))) { - push @installed, $pkg; - } - elsif ($args{do_once} and open(FAILED, '>> .#autoinstall.failed')) { - print FAILED "$pkg\n"; - } - } - - close FAILED if $args{do_once}; - - return @installed; -} - -sub _install_cpanplus { - my @modules = @{+shift}; - my @config = @{+shift}; - my $installed = 0; - - require CPANPLUS::Backend; - my $cp = CPANPLUS::Backend->new; - my $conf = $cp->configure_object; - - return unless _can_write($conf->_get_build('base')); - - # if we're root, set UNINST=1 to avoid trouble unless user asked for it. - my $makeflags = $conf->get_conf('makeflags') || ''; - if (UNIVERSAL::isa($makeflags, 'HASH')) { - # 0.03+ uses a hashref here - $makeflags->{UNINST} = 1 unless exists $makeflags->{UNINST}; - } - else { - # 0.02 and below uses a scalar - $makeflags = join(' ', split(' ', $makeflags), 'UNINST=1') - if ($makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' }); - } - $conf->set_conf(makeflags => $makeflags); - - while (my ($key, $val) = splice(@config, 0, 2)) { - eval { $conf->set_conf($key, $val) }; - } - - my $modtree = $cp->module_tree; - while (my ($pkg, $ver) = splice(@modules, 0, 2)) { - print "*** Installing $pkg...\n"; - - MY::preinstall($pkg, $ver) or next if defined &MY::preinstall; - - my $success; - my $obj = $modtree->{$pkg}; - - if ($obj and defined(_version_check($obj->{version}, $ver))) { - my $pathname = $pkg; $pathname =~ s/::/\\W/; - - foreach my $inc (grep { m/$pathname.pm/i } keys(%INC)) { - delete $INC{$inc}; - } - - my $rv = $cp->install( modules => [ $obj->{module} ]); - - if ($rv and ($rv->{$obj->{module}} or $rv->{ok})) { - print "*** $pkg successfully installed.\n"; - $success = 1; - } - else { - print "*** $pkg installation cancelled.\n"; - $success = 0; - } - - $installed += $success; - } - else { - print << "."; -*** Could not find a version $ver or above for $pkg; skipping. -. - } - - MY::postinstall($pkg, $ver, $success) if defined &MY::postinstall; - } - - return $installed; -} - -sub _install_cpan { - my @modules = @{+shift}; - my @config = @{+shift}; - my $installed = 0; - my %args; - - require CPAN; CPAN::Config->load; - - return unless _can_write(MM->catfile($CPAN::Config->{cpan_home}, 'sources')); - - # if we're root, set UNINST=1 to avoid trouble unless user asked for it. - my $makeflags = $CPAN::Config->{make_install_arg} || ''; - $CPAN::Config->{make_install_arg} = join(' ', split(' ', $makeflags), 'UNINST=1') - if ($makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' }); - - # don't show start-up info - $CPAN::Config->{inhibit_startup_message} = 1; - - # set additional options - while (my ($opt, $arg) = splice(@config, 0, 2)) { - ($args{$opt} = $arg, next) - if $opt =~ /^force$/; # pseudo-option - $CPAN::Config->{$opt} = $arg; - } - - while (my ($pkg, $ver) = splice(@modules, 0, 2)) { - MY::preinstall($pkg, $ver) or next if defined &MY::preinstall; - - print "*** Installing $pkg...\n"; - - my $obj = CPAN::Shell->expand(Module => $pkg); - my $success = 0; - - if ($obj and defined(_version_check($obj->cpan_version, $ver))) { - my $pathname = $pkg; $pathname =~ s/::/\\W/; - - foreach my $inc (grep { m/$pathname.pm/i } keys(%INC)) { - delete $INC{$inc}; - } - - $obj->force('install') if $args{force}; - - if ($obj->install eq 'YES') { - print "*** $pkg successfully installed.\n"; - $success = 1; - } - else { - print "*** $pkg installation failed.\n"; - $success = 0; - } - - $installed += $success; - } - else { - print << "."; -*** Could not find a version $ver or above for $pkg; skipping. -. - } - - MY::postinstall($pkg, $ver, $success) if defined &MY::postinstall; - } - - return $installed; -} - -sub _has_cpanplus { - return ( - $HasCPANPLUS = ( - $INC{'CPANPLUS/Config.pm'} or - _load('CPANPLUS::Shell::Default') - ) - ); -} - -# make guesses on whether we're under the CPAN installation directory -sub _under_cpan { - require Cwd; - require File::Spec; - - my $cwd = File::Spec->canonpath(Cwd::cwd()); - my $cpan = File::Spec->canonpath($CPAN::Config->{cpan_home}); - - return (index($cwd, $cpan) > -1); -} - -sub _update_to { - my $class = __PACKAGE__; - my $ver = shift; - - return if defined(_version_check(_load($class), $ver)); # no need to upgrade - - if (_prompt( - "==> A newer version of $class ($ver) is required. Install?", 'y' - ) =~ /^[Nn]/) { - die "*** Please install $class $ver manually.\n"; - } - - print << "."; -*** Trying to fetch it from CPAN... -. - - # install ourselves - _load($class) and return $class->import(@_) - if $class->install([], $class, $ver); - - print << '.'; exit 1; - -*** Cannot bootstrap myself. :-( Installation terminated. -. -} - -# check if we're connected to some host, using inet_aton -sub _connected_to { - my $site = shift; - - return ( - ( _load('Socket') and Socket::inet_aton($site) ) or _prompt(qq( -*** Your host cannot resolve the domain name '$site', which - probably means the Internet connections are unavailable. -==> Should we try to install the required module(s) anyway?), 'n' - ) =~ /^[Yy]/ - ); -} - -# check if a directory is writable; may create it on demand -sub _can_write { - my $path = shift; - mkdir ($path, 0755) unless -e $path; - - require Config; - return 1 if -w $path and -w $Config::Config{sitelib}; - - print << "."; -*** You are not allowed to write to the directory '$path'; - the installation may fail due to insufficient permissions. -. - - if (eval '$>' and lc(`sudo -V`) =~ /version/ and _prompt(qq( -==> Should we try to re-execute the autoinstall process with 'sudo'?), 'y' - ) =~ /^[Yy]/) { - # try to bootstrap ourselves from sudo - print << "."; -*** Trying to re-execute the autoinstall process with 'sudo'... -. - my $missing = join(',', @Missing); - my $config = join(',', - UNIVERSAL::isa($Config, 'HASH') ? %{$Config} : @{$Config} - ) if $Config; - - return unless system('sudo', $^X, $0, "--config=$config", "--installdeps=$missing"); - - print << "."; -*** The 'sudo' command exited with error! Resuming... -. - } - - return _prompt(qq( -==> Should we try to install the required module(s) anyway?), 'n' - ) =~ /^[Yy]/ -} - -# load a module and return the version it reports -sub _load { - my $mod = pop; # class/instance doesn't matter - my $file = $mod; - - $file =~ s|::|/|g; - $file .= '.pm'; - - local $@; - return eval { require $file; $mod->VERSION } || ($@ ? undef : 0); -} - -# compare two versions, either use Sort::Versions or plain comparison -sub _version_check { - my ($cur, $min) = @_; - return unless defined $cur; - - $cur =~ s/\s+$//; - - # check for version numbers that are not in decimal format - if (ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./) { - if ($version::VERSION or defined(_load('version'))) { - # use version.pm if it is installed. - return ((version->new($cur) >= version->new($min)) ? $cur : undef); - } - elsif ($Sort::Versions::VERSION or defined(_load('Sort::Versions'))) { - # use Sort::Versions as the sorting algorithm for a.b.c versions - return ((Sort::Versions::versioncmp($cur, $min) != -1) ? $cur : undef); - } - - warn "Cannot reliably compare non-decimal formatted versions.\n". - "Please install version.pm or Sort::Versions.\n"; - } - - # plain comparison - local $^W = 0; # shuts off 'not numeric' bugs - return ($cur >= $min ? $cur : undef); -} - -# nothing; this usage is deprecated. -sub main::PREREQ_PM { return {}; } - -sub _make_args { - my %args = @_; - - $args{PREREQ_PM} = { %{$args{PREREQ_PM} || {} }, @Existing, @Missing } - if $UnderCPAN or $TestOnly; - - if ($args{EXE_FILES}) { - require ExtUtils::Manifest; - my $manifest = ExtUtils::Manifest::maniread('MANIFEST'); - - $args{EXE_FILES} = [ - grep { exists $manifest->{$_} } @{$args{EXE_FILES}} - ]; - } - - $args{test}{TESTS} ||= 't/*.t'; - $args{test}{TESTS} = join(' ', grep { - !exists($DisabledTests{$_}) - } map { glob($_) } split(/\s+/, $args{test}{TESTS})); - - my $missing = join(',', @Missing); - my $config = join(',', - UNIVERSAL::isa($Config, 'HASH') ? %{$Config} : @{$Config} - ) if $Config; - - $PostambleActions = ( - $missing ? "\$(PERL) $0 --config=$config --installdeps=$missing" - : "\@\$(NOOP)" - ); - - return %args; -} - -# a wrapper to ExtUtils::MakeMaker::WriteMakefile -sub Write { - require Carp; - Carp::croak "WriteMakefile: Need even number of args" if @_ % 2; - - if ($CheckOnly) { - print << "."; -*** Makefile not written in check-only mode. -. - return; - } - - my %args = _make_args(@_); - - no strict 'refs'; - - $PostambleUsed = 0; - local *MY::postamble = \&postamble unless defined &MY::postamble; - ExtUtils::MakeMaker::WriteMakefile(%args); - - print << "." unless $PostambleUsed; -*** WARNING: Makefile written with customized MY::postamble() without - including contents from ExtUtils::AutoInstall::postamble() -- - auto installation features disabled. Please contact the author. -. - - return 1; -} - -sub postamble { - $PostambleUsed = 1; - - return << "."; - -config :: installdeps -\t\@\$(NOOP) - -checkdeps :: -\t\$(PERL) $0 --checkdeps - -installdeps :: -\t$PostambleActions - -. - -} - -1; - -__END__ - -#line 929 diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm index eeb4c1e..4ecf46b 100644 --- a/inc/Module/Install.pm +++ b/inc/Module/Install.pm @@ -1,171 +1,470 @@ -#line 1 "inc/Module/Install.pm - /Library/Perl/5.8.1/Module/Install.pm" -# $File: //depot/cpan/Module-Install/lib/Module/Install.pm $ $Author: autrijus $ -# $Revision: #67 $ $Change: 1885 $ $DateTime: 2004/03/11 05:55:27 $ vim: expandtab shiftwidth=4 - +#line 1 package Module::Install; -$VERSION = '0.33'; -die << "." unless $INC{join('/', inc => split(/::/, __PACKAGE__)).'.pm'}; +# For any maintainers: +# The load order for Module::Install is a bit magic. +# It goes something like this... +# +# IF ( host has Module::Install installed, creating author mode ) { +# 1. Makefile.PL calls "use inc::Module::Install" +# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install +# 3. The installed version of inc::Module::Install loads +# 4. inc::Module::Install calls "require Module::Install" +# 5. The ./inc/ version of Module::Install loads +# } ELSE { +# 1. Makefile.PL calls "use inc::Module::Install" +# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install +# 3. The ./inc/ version of Module::Install loads +# } + +use 5.005; +use strict 'vars'; +use Cwd (); +use File::Find (); +use File::Path (); + +use vars qw{$VERSION $MAIN}; +BEGIN { + # All Module::Install core packages now require synchronised versions. + # This will be used to ensure we don't accidentally load old or + # different versions of modules. + # This is not enforced yet, but will be some time in the next few + # releases once we can make sure it won't clash with custom + # Module::Install extensions. + $VERSION = '1.06'; + + # Storage for the pseudo-singleton + $MAIN = undef; + + *inc::Module::Install::VERSION = *VERSION; + @inc::Module::Install::ISA = __PACKAGE__; + +} + +sub import { + my $class = shift; + my $self = $class->new(@_); + my $who = $self->_caller; + + #------------------------------------------------------------- + # all of the following checks should be included in import(), + # to allow "eval 'require Module::Install; 1' to test + # installation of Module::Install. (RT #51267) + #------------------------------------------------------------- + + # Whether or not inc::Module::Install is actually loaded, the + # $INC{inc/Module/Install.pm} is what will still get set as long as + # the caller loaded module this in the documented manner. + # If not set, the caller may NOT have loaded the bundled version, and thus + # they may not have a MI version that works with the Makefile.PL. This would + # result in false errors or unexpected behaviour. And we don't want that. + my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; + unless ( $INC{$file} ) { die <<"END_DIE" } + Please invoke ${\__PACKAGE__} with: - use inc::${\__PACKAGE__}; + use inc::${\__PACKAGE__}; not: - use ${\__PACKAGE__}; + use ${\__PACKAGE__}; -. +END_DIE -use strict 'vars'; -use Cwd (); -use File::Find (); -use File::Path (); + # This reportedly fixes a rare Win32 UTC file time issue, but + # as this is a non-cross-platform XS module not in the core, + # we shouldn't really depend on it. See RT #24194 for detail. + # (Also, this module only supports Perl 5.6 and above). + eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006; -@inc::Module::Install::ISA = 'Module::Install'; + # If the script that is loading Module::Install is from the future, + # then make will detect this and cause it to re-run over and over + # again. This is bad. Rather than taking action to touch it (which + # is unreliable on some platforms and requires write permissions) + # for now we should catch this and refuse to run. + if ( -f $0 ) { + my $s = (stat($0))[9]; -#line 129 + # If the modification time is only slightly in the future, + # sleep briefly to remove the problem. + my $a = $s - time; + if ( $a > 0 and $a < 5 ) { sleep 5 } -sub import { - my $class = shift; - my $self = $class->new(@_); + # Too far in the future, throw an error. + my $t = time; + if ( $s > $t ) { die <<"END_DIE" } - if (not -f $self->{file}) { - require "$self->{path}/$self->{dispatch}.pm"; - File::Path::mkpath("$self->{prefix}/$self->{author}"); - $self->{admin} = - "$self->{name}::$self->{dispatch}"->new(_top => $self); - $self->{admin}->init; - @_ = ($class, _self => $self); - goto &{"$self->{name}::import"}; - } +Your installer $0 has a modification time in the future ($s > $t). - *{caller(0) . "::AUTOLOAD"} = $self->autoload; +This is known to create infinite loops in make. - # Unregister loader and worker packages so subdirs can use them again - delete $INC{"$self->{file}"}; - delete $INC{"$self->{path}.pm"}; -} +Please correct this, then run $0 again. -#line 156 +END_DIE + } -sub autoload { - my $self = shift; - my $caller = caller; - my $cwd = Cwd::cwd(); - my $sym = "$caller\::AUTOLOAD"; + # Build.PL was formerly supported, but no longer is due to excessive + # difficulty in implementing every single feature twice. + if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } - $sym->{$cwd} = sub { - my $pwd = Cwd::cwd(); - if (my $code = $sym->{$pwd}) { - goto &$code unless $cwd eq $pwd; # delegate back to parent dirs - } - $$sym =~ /([^:]+)$/ or die "Cannot autoload $caller"; - unshift @_, ($self, $1); - goto &{$self->can('call')} unless uc($1) eq $1; - }; -} +Module::Install no longer supports Build.PL. -#line 181 +It was impossible to maintain duel backends, and has been deprecated. -sub new { - my ($class, %args) = @_; +Please remove all Build.PL files and only use the Makefile.PL installer. + +END_DIE + + #------------------------------------------------------------- + + # To save some more typing in Module::Install installers, every... + # use inc::Module::Install + # ...also acts as an implicit use strict. + $^H |= strict::bits(qw(refs subs vars)); + + #------------------------------------------------------------- + + unless ( -f $self->{file} ) { + foreach my $key (keys %INC) { + delete $INC{$key} if $key =~ /Module\/Install/; + } - return $args{_self} if $args{_self}; + local $^W; + require "$self->{path}/$self->{dispatch}.pm"; + File::Path::mkpath("$self->{prefix}/$self->{author}"); + $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); + $self->{admin}->init; + @_ = ($class, _self => $self); + goto &{"$self->{name}::import"}; + } - $args{dispatch} ||= 'Admin'; - $args{prefix} ||= 'inc'; - $args{author} ||= '.author'; - $args{bundle} ||= 'inc/BUNDLES'; + local $^W; + *{"${who}::AUTOLOAD"} = $self->autoload; + $self->preload; - $class =~ s/^\Q$args{prefix}\E:://; - $args{name} ||= $class; - $args{version} ||= $class->VERSION; + # Unregister loader and worker packages so subdirs can use them again + delete $INC{'inc/Module/Install.pm'}; + delete $INC{'Module/Install.pm'}; - unless ($args{path}) { - $args{path} = $args{name}; - $args{path} =~ s!::!/!g; - } - $args{file} ||= "$args{prefix}/$args{path}.pm"; + # Save to the singleton + $MAIN = $self; - bless(\%args, $class); + return 1; } -#line 210 +sub autoload { + my $self = shift; + my $who = $self->_caller; + my $cwd = Cwd::cwd(); + my $sym = "${who}::AUTOLOAD"; + $sym->{$cwd} = sub { + my $pwd = Cwd::cwd(); + if ( my $code = $sym->{$pwd} ) { + # Delegate back to parent dirs + goto &$code unless $cwd eq $pwd; + } + unless ($$sym =~ s/([^:]+)$//) { + # XXX: it looks like we can't retrieve the missing function + # via $$sym (usually $main::AUTOLOAD) in this case. + # I'm still wondering if we should slurp Makefile.PL to + # get some context or not ... + my ($package, $file, $line) = caller; + die <<"EOT"; +Unknown function is found at $file line $line. +Execution of $file aborted due to runtime errors. + +If you're a contributor to a project, you may need to install +some Module::Install extensions from CPAN (or other repository). +If you're a user of a module, please contact the author. +EOT + } + my $method = $1; + if ( uc($method) eq $method ) { + # Do nothing + return; + } elsif ( $method =~ /^_/ and $self->can($method) ) { + # Dispatch to the root M:I class + return $self->$method(@_); + } + + # Dispatch to the appropriate plugin + unshift @_, ( $self, $1 ); + goto &{$self->can('call')}; + }; +} -sub call { - my $self = shift; - my $method = shift; - my $obj = $self->load($method) or return; +sub preload { + my $self = shift; + unless ( $self->{extensions} ) { + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ); + } + + my @exts = @{$self->{extensions}}; + unless ( @exts ) { + @exts = $self->{admin}->load_all_extensions; + } + + my %seen; + foreach my $obj ( @exts ) { + while (my ($method, $glob) = each %{ref($obj) . '::'}) { + next unless $obj->can($method); + next if $method =~ /^_/; + next if $method eq uc($method); + $seen{$method}++; + } + } + + my $who = $self->_caller; + foreach my $name ( sort keys %seen ) { + local $^W; + *{"${who}::$name"} = sub { + ${"${who}::AUTOLOAD"} = "${who}::$name"; + goto &{"${who}::AUTOLOAD"}; + }; + } +} - unshift @_, $obj; - goto &{$obj->can($method)}; +sub new { + my ($class, %args) = @_; + + delete $INC{'FindBin.pm'}; + { + # to suppress the redefine warning + local $SIG{__WARN__} = sub {}; + require FindBin; + } + + # ignore the prefix on extension modules built from top level. + my $base_path = Cwd::abs_path($FindBin::Bin); + unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { + delete $args{prefix}; + } + return $args{_self} if $args{_self}; + + $args{dispatch} ||= 'Admin'; + $args{prefix} ||= 'inc'; + $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); + $args{bundle} ||= 'inc/BUNDLES'; + $args{base} ||= $base_path; + $class =~ s/^\Q$args{prefix}\E:://; + $args{name} ||= $class; + $args{version} ||= $class->VERSION; + unless ( $args{path} ) { + $args{path} = $args{name}; + $args{path} =~ s!::!/!g; + } + $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; + $args{wrote} = 0; + + bless( \%args, $class ); } -#line 225 +sub call { + my ($self, $method) = @_; + my $obj = $self->load($method) or return; + splice(@_, 0, 2, $obj); + goto &{$obj->can($method)}; +} sub load { - my ($self, $method) = @_; + my ($self, $method) = @_; - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ) unless $self->{extensions}; + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ) unless $self->{extensions}; - foreach my $obj (@{$self->{extensions}}) { - return $obj if $obj->can($method); - } + foreach my $obj (@{$self->{extensions}}) { + return $obj if $obj->can($method); + } - my $admin = $self->{admin} or die << "END"; + my $admin = $self->{admin} or die <<"END_DIE"; The '$method' method does not exist in the '$self->{prefix}' path! Please remove the '$self->{prefix}' directory and run $0 again to load it. -END +END_DIE - my $obj = $admin->load($method, 1); - push @{$self->{extensions}}, $obj; + my $obj = $admin->load($method, 1); + push @{$self->{extensions}}, $obj; - $obj; + $obj; } -#line 255 - sub load_extensions { - my ($self, $path, $top_obj) = @_; + my ($self, $path, $top) = @_; + + my $should_reload = 0; + unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { + unshift @INC, $self->{prefix}; + $should_reload = 1; + } + + foreach my $rv ( $self->find_extensions($path) ) { + my ($file, $pkg) = @{$rv}; + next if $self->{pathnames}{$pkg}; + + local $@; + my $new = eval { local $^W; require $file; $pkg->can('new') }; + unless ( $new ) { + warn $@ if $@; + next; + } + $self->{pathnames}{$pkg} = + $should_reload ? delete $INC{$file} : $INC{$file}; + push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); + } + + $self->{extensions} ||= []; +} + +sub find_extensions { + my ($self, $path) = @_; + + my @found; + File::Find::find( sub { + my $file = $File::Find::name; + return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; + my $subpath = $1; + return if lc($subpath) eq lc($self->{dispatch}); + + $file = "$self->{path}/$subpath.pm"; + my $pkg = "$self->{name}::$subpath"; + $pkg =~ s!/!::!g; + + # If we have a mixed-case package name, assume case has been preserved + # correctly. Otherwise, root through the file to locate the case-preserved + # version of the package name. + if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { + my $content = Module::Install::_read($subpath . '.pm'); + my $in_pod = 0; + foreach ( split //, $content ) { + $in_pod = 1 if /^=\w/; + $in_pod = 0 if /^=cut/; + next if ($in_pod || /^=cut/); # skip pod text + next if /^\s*#/; # and comments + if ( m/^\s*package\s+($pkg)\s*;/i ) { + $pkg = $1; + last; + } + } + } + + push @found, [ $file, $pkg ]; + }, $path ) if -d $path; + + @found; +} + - unshift @INC, $self->{prefix} - unless grep { $_ eq $self->{prefix} } @INC; - local @INC = ($path, @INC); - foreach my $rv ($self->find_extensions($path)) { - my ($file, $pkg) = @{$rv}; - next if $self->{pathnames}{$pkg}; - eval { require $file; 1 } or (warn($@), next); - $self->{pathnames}{$pkg} = delete $INC{$file}; - push @{$self->{extensions}}, $pkg->new( _top => $top_obj ); - } + +##################################################################### +# Common Utility Functions + +sub _caller { + my $depth = 0; + my $call = caller($depth); + while ( $call eq __PACKAGE__ ) { + $depth++; + $call = caller($depth); + } + return $call; } -#line 279 +# Done in evals to avoid confusing Perl::MinimumVersion +eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; +sub _read { + local *FH; + open( FH, '<', $_[0] ) or die "open($_[0]): $!"; + my $string = do { local $/; <FH> }; + close FH or die "close($_[0]): $!"; + return $string; +} +END_NEW +sub _read { + local *FH; + open( FH, "< $_[0]" ) or die "open($_[0]): $!"; + my $string = do { local $/; <FH> }; + close FH or die "close($_[0]): $!"; + return $string; +} +END_OLD + +sub _readperl { + my $string = Module::Install::_read($_[0]); + $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; + $string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s; + $string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg; + return $string; +} -sub find_extensions { - my ($self, $path) = @_; - my @found; +sub _readpod { + my $string = Module::Install::_read($_[0]); + $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; + return $string if $_[0] =~ /\.pod\z/; + $string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg; + $string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg; + $string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg; + $string =~ s/^\n+//s; + return $string; +} - File::Find::find(sub { - my $file = $File::Find::name; - return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; - return if $1 eq $self->{dispatch}; +# Done in evals to avoid confusing Perl::MinimumVersion +eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; +sub _write { + local *FH; + open( FH, '>', $_[0] ) or die "open($_[0]): $!"; + foreach ( 1 .. $#_ ) { + print FH $_[$_] or die "print($_[0]): $!"; + } + close FH or die "close($_[0]): $!"; +} +END_NEW +sub _write { + local *FH; + open( FH, "> $_[0]" ) or die "open($_[0]): $!"; + foreach ( 1 .. $#_ ) { + print FH $_[$_] or die "print($_[0]): $!"; + } + close FH or die "close($_[0]): $!"; +} +END_OLD + +# _version is for processing module versions (eg, 1.03_05) not +# Perl versions (eg, 5.8.1). +sub _version ($) { + my $s = shift || 0; + my $d =()= $s =~ /(\.)/g; + if ( $d >= 2 ) { + # Normalise multipart versions + $s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg; + } + $s =~ s/^(\d+)\.?//; + my $l = $1 || 0; + my @v = map { + $_ . '0' x (3 - length $_) + } $s =~ /(\d{1,3})\D?/g; + $l = $l . '.' . join '', @v if @v; + return $l + 0; +} - $file = "$self->{path}/$1.pm"; - my $pkg = "$self->{name}::$1"; $pkg =~ s!/!::!g; - push @found, [$file, $pkg]; - }, $path) if -d $path; +sub _cmp ($$) { + _version($_[1]) <=> _version($_[2]); +} - @found; +# Cloned from Params::Util::_CLASS +sub _CLASS ($) { + ( + defined $_[0] + and + ! ref $_[0] + and + $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s + ) ? $_[0] : undef; } 1; -__END__ - -#line 614 +# Copyright 2008 - 2012 Adam Kennedy. diff --git a/inc/Module/Install/AutoInstall.pm b/inc/Module/Install/AutoInstall.pm deleted file mode 100644 index c22821c..0000000 --- a/inc/Module/Install/AutoInstall.pm +++ /dev/null @@ -1,65 +0,0 @@ -#line 1 "inc/Module/Install/AutoInstall.pm - /Library/Perl/5.8.1/Module/Install/AutoInstall.pm" -# $File: //depot/cpan/Module-Install/lib/Module/Install/AutoInstall.pm $ $Author: autrijus $ -# $Revision: #13 $ $Change: 1846 $ $DateTime: 2003/12/31 22:57:12 $ vim: expandtab shiftwidth=4 - -package Module::Install::AutoInstall; -use Module::Install::Base; @ISA = qw(Module::Install::Base); - -sub AutoInstall { $_[0] } - -sub run { - my $self = shift; - $self->auto_install_now(@_); -} - -sub write { - my $self = shift; - $self->auto_install(@_); -} - -sub auto_install { - my $self = shift; - return if $self->{done}++; - -# ExtUtils::AutoInstall Bootstrap Code, version 7. -AUTO:{my$p='ExtUtils::AutoInstall';my$v=0.49;$p->VERSION||0>=$v -or+eval"use $p $v;1"or+do{my$e=$ENV{PERL_EXTUTILS_AUTOINSTALL}; -(!defined($e)||$e!~m/--(?:default|skip|testonly)/and-t STDIN or -eval"use ExtUtils::MakeMaker;WriteMakefile(PREREQ_PM=>{'$p',$v} -);1"and exit)and print"==> $p $v required. Install it from CP". -"AN? [Y/n] "and<STDIN>!~/^n/i and print"*** Installing $p\n"and -do{if (eval '$>' and lc(`sudo -V`) =~ /version/){system('sudo', -$^X,"-MCPANPLUS","-e","CPANPLUS::install $p");eval"use $p $v;1" -||system('sudo', $^X, "-MCPAN", "-e", "CPAN::install $p")}eval{ -require CPANPLUS;CPANPLUS::install$p};eval"use $p $v;1"or eval{ -require CPAN;CPAN::install$p};eval"use $p $v;1"||die"*** Please -manually install $p $v from cpan.org first...\n"}}} - - # Flatten array of arrays into a single array - my @core = map @$_, map @$_, grep ref, - $self->build_requires, $self->requires; - - while ( @core and @_ > 1 and $_[0] =~ /^-\w+$/ ) { - push @core, splice(@_, 0, 2); - } - - ExtUtils::AutoInstall->import( - (@core ? (-core => \@core) : ()), @_, $self->features - ); - - $self->makemaker_args( ExtUtils::AutoInstall::_make_args() ); - - my $class = ref($self); - $self->postamble( - "# --- $class section:\n" . - ExtUtils::AutoInstall::postamble() - ); -} - -sub auto_install_now { - my $self = shift; - $self->auto_install; - ExtUtils::AutoInstall::do_install(); -} - -1; diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm index ac43208..802844a 100644 --- a/inc/Module/Install/Base.pm +++ b/inc/Module/Install/Base.pm @@ -1,57 +1,83 @@ -#line 1 "inc/Module/Install/Base.pm - /Library/Perl/5.8.1/Module/Install/Base.pm" -# $File: //depot/cpan/Module-Install/lib/Module/Install/Base.pm $ $Author: autrijus $ -# $Revision: #10 $ $Change: 1847 $ $DateTime: 2003/12/31 23:14:54 $ vim: expandtab shiftwidth=4 - +#line 1 package Module::Install::Base; -#line 31 +use strict 'vars'; +use vars qw{$VERSION}; +BEGIN { + $VERSION = '1.06'; +} -sub new { - my ($class, %args) = @_; +# Suspend handler for "redefined" warnings +BEGIN { + my $w = $SIG{__WARN__}; + $SIG{__WARN__} = sub { $w }; +} - foreach my $method (qw(call load)) { - *{"$class\::$method"} = sub { - +shift->_top->$method(@_); - } unless defined &{"$class\::$method"}; - } +#line 42 - bless(\%args, $class); +sub new { + my $class = shift; + unless ( defined &{"${class}::call"} ) { + *{"${class}::call"} = sub { shift->_top->call(@_) }; + } + unless ( defined &{"${class}::load"} ) { + *{"${class}::load"} = sub { shift->_top->load(@_) }; + } + bless { @_ }, $class; } -#line 49 +#line 61 sub AUTOLOAD { - my $self = shift; - goto &{$self->_top->autoload}; + local $@; + my $func = eval { shift->_top->autoload } or return; + goto &$func; } -#line 60 +#line 75 -sub _top { $_[0]->{_top} } +sub _top { + $_[0]->{_top}; +} -#line 71 +#line 90 sub admin { - my $self = shift; - $self->_top->{admin} or Module::Install::Base::FakeAdmin->new; + $_[0]->_top->{admin} + or + Module::Install::Base::FakeAdmin->new; } +#line 106 + sub is_admin { - my $self = shift; - $self->admin->VERSION; + ! $_[0]->admin->isa('Module::Install::Base::FakeAdmin'); } sub DESTROY {} package Module::Install::Base::FakeAdmin; -my $Fake; -sub new { $Fake ||= bless(\@_, $_[0]) } +use vars qw{$VERSION}; +BEGIN { + $VERSION = $Module::Install::Base::VERSION; +} + +my $fake; + +sub new { + $fake ||= bless(\@_, $_[0]); +} + sub AUTOLOAD {} + sub DESTROY {} -1; +# Restore warning handler +BEGIN { + $SIG{__WARN__} = $SIG{__WARN__}->(); +} -__END__ +1; -#line 115 +#line 159 diff --git a/inc/Module/Install/Build.pm b/inc/Module/Install/Build.pm deleted file mode 100644 index 6fb595e..0000000 --- a/inc/Module/Install/Build.pm +++ /dev/null @@ -1,66 +0,0 @@ -#line 1 "inc/Module/Install/Build.pm - /Library/Perl/5.8.1/Module/Install/Build.pm" -# $File: //depot/cpan/Module-Install/lib/Module/Install/Build.pm $ $Author: ingy $ -# $Revision: #23 $ $Change: 1255 $ $DateTime: 2003/03/05 13:23:32 $ vim: expandtab shiftwidth=4 - -package Module::Install::Build; -$VERSION = '0.01'; -use strict; -use vars qw(@ISA); -use Module::Install::Base; @ISA = qw(Module::Install::Base); - -sub Build { $_[0] } - -sub write { - my $self = shift; - die "Build->write() takes no arguments\n" if @_; - - my %args; - my $build; - - $args{dist_name} = $self->name || $self->determine_NAME($self->{args}); - $args{license} = $self->license; - $args{dist_version} = $self->version || $self->determine_VERSION($self->{args}); - $args{dist_abstract} = $self->abstract; - $args{dist_author} = $self->author; - $args{sign} = $self->sign; - $args{no_index} = $self->no_index; - - foreach my $key (qw(build_requires requires recommends conflicts)) { - my $val = eval "\$self->$key" or next; - $args{$key} = { map @$_, @$val }; - } - - %args = map {($_, $args{$_})} grep {defined($args{$_})} keys %args; - - require Module::Build; - $build = Module::Build->new(%args); - $build->add_to_cleanup(split /\s+/, $self->clean_files); - $build->create_build_script; -} - -sub ACTION_reset { - my ($self) = @_; - die "XXX - Can't get this working yet"; - require File::Path; - warn "Removing inc\n"; - rmpath('inc'); -} - -sub ACTION_dist { - my ($self) = @_; - die "XXX - Can't get this working yet"; -} - -# <ingy> DrMath: is there an OO way to add actions to Module::Build?? -# <DrMath> ingy: yeah -# <DrMath> ingy: package MyBuilder; use w(Module::Build; @ISA = qw(w(Module::Build); sub ACTION_ingy -# {...} -# <DrMath> ingy: then my $build = new MyBuilder( ...parameters... ); -# $build->write_build_script; - - -1; - -__END__ - -#line 178 diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm index fe6ac24..22167b8 100644 --- a/inc/Module/Install/Can.pm +++ b/inc/Module/Install/Can.pm @@ -1,41 +1,154 @@ -#line 1 "inc/Module/Install/Can.pm - /Library/Perl/5.8.1/Module/Install/Can.pm" -# $File: //depot/cpan/Module-Install/lib/Module/Install/Can.pm $ $Author: autrijus $ -# $Revision: #6 $ $Change: 1840 $ $DateTime: 2003/12/28 19:42:02 $ vim: expandtab shiftwidth=4 - +#line 1 package Module::Install::Can; -use Module::Install::Base; @ISA = qw(Module::Install::Base); -$VERSION = '0.01'; use strict; -use Config (); -use File::Spec (); -use ExtUtils::MakeMaker (); +use Config (); +use ExtUtils::MakeMaker (); +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '1.06'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} + +# check if we can load some module +### Upgrade this to not have to load the module if possible +sub can_use { + my ($self, $mod, $ver) = @_; + $mod =~ s{::|\\}{/}g; + $mod .= '.pm' unless $mod =~ /\.pm$/i; + + my $pkg = $mod; + $pkg =~ s{/}{::}g; + $pkg =~ s{\.pm$}{}i; + + local $@; + eval { require $mod; $pkg->VERSION($ver || 0); 1 }; +} -# check if we can run some command +# Check if we can run some command sub can_run { - my ($self, $cmd) = @_; + my ($self, $cmd) = @_; - my $_cmd = $cmd; - return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); + my $_cmd = $cmd; + return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); - for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { - my $abs = File::Spec->catfile($dir, $_[1]); - return $abs if (-x $abs or $abs = MM->maybe_command($abs)); - } + for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { + next if $dir eq ''; + require File::Spec; + my $abs = File::Spec->catfile($dir, $cmd); + return $abs if (-x $abs or $abs = MM->maybe_command($abs)); + } - return; + return; } +# Can our C compiler environment build XS files +sub can_xs { + my $self = shift; + + # Ensure we have the CBuilder module + $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 ); + + # Do we have the configure_requires checker? + local $@; + eval "require ExtUtils::CBuilder;"; + if ( $@ ) { + # They don't obey configure_requires, so it is + # someone old and delicate. Try to avoid hurting + # them by falling back to an older simpler test. + return $self->can_cc(); + } + + # Do we have a working C compiler + my $builder = ExtUtils::CBuilder->new( + quiet => 1, + ); + unless ( $builder->have_compiler ) { + # No working C compiler + return 0; + } + + # Write a C file representative of what XS becomes + require File::Temp; + my ( $FH, $tmpfile ) = File::Temp::tempfile( + "compilexs-XXXXX", + SUFFIX => '.c', + ); + binmode $FH; + print $FH <<'END_C'; +#include "EXTERN.h" +#include "perl.h" +#include "XSUB.h" + +int main(int argc, char **argv) { + return 0; +} + +int boot_sanexs() { + return 1; +} + +END_C + close $FH; + + # Can the C compiler access the same headers XS does + my @libs = (); + my $object = undef; + eval { + local $^W = 0; + $object = $builder->compile( + source => $tmpfile, + ); + @libs = $builder->link( + objects => $object, + module_name => 'sanexs', + ); + }; + my $result = $@ ? 0 : 1; + + # Clean up all the build files + foreach ( $tmpfile, $object, @libs ) { + next unless defined $_; + 1 while unlink; + } + + return $result; +} + +# Can we locate a (the) C compiler sub can_cc { - my $self = shift; - my @chunks = split(/ /, $Config::Config{cc}) or return; + my $self = shift; + my @chunks = split(/ /, $Config::Config{cc}) or return; + + # $Config{cc} may contain args; try to find out the program part + while (@chunks) { + return $self->can_run("@chunks") || (pop(@chunks), next); + } - # $Config{cc} may contain args; try to find out the program part - while (@chunks) { - return $self->can_run("@chunks") || (pop(@chunks), next); - } + return; +} - return; +# Fix Cygwin bug on maybe_command(); +if ( $^O eq 'cygwin' ) { + require ExtUtils::MM_Cygwin; + require ExtUtils::MM_Win32; + if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) { + *ExtUtils::MM_Cygwin::maybe_command = sub { + my ($self, $file) = @_; + if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) { + ExtUtils::MM_Win32->maybe_command($file); + } else { + ExtUtils::MM_Unix->maybe_command($file); + } + } + } } 1; + +__END__ + +#line 236 diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm index 6c9a1d7..bee0c4f 100644 --- a/inc/Module/Install/Fetch.pm +++ b/inc/Module/Install/Fetch.pm @@ -1,21 +1,25 @@ -#line 1 "inc/Module/Install/Fetch.pm - /Library/Perl/5.8.1/Module/Install/Fetch.pm" -# $File: //depot/cpan/Module-Install/lib/Module/Install/Fetch.pm $ $Author: autrijus $ -# $Revision: #8 $ $Change: 1374 $ $DateTime: 2003/03/18 11:50:15 $ vim: expandtab shiftwidth=4 - +#line 1 package Module::Install::Fetch; -use Module::Install::Base; @ISA = qw(Module::Install::Base); -$VERSION = '0.01'; +use strict; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '1.06'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} sub get_file { my ($self, %args) = @_; - my ($scheme, $host, $path, $file) = + my ($scheme, $host, $path, $file) = $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - if ($scheme eq 'http' and !eval { require LWP::Simple; 1 }) { + if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) { $args{url} = $args{ftp_url} or (warn("LWP support unavailable!\n"), return); - ($scheme, $host, $path, $file) = + ($scheme, $host, $path, $file) = $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; } @@ -56,14 +60,14 @@ sub get_file { chdir $dir; return; } - my @dialog = split(/\n/, << "."); + my @dialog = split(/\n/, <<"END_FTP"); open $host user anonymous anonymous\@example.com cd $path binary get $file $file quit -. +END_FTP foreach (@dialog) { $fh->print("$_\n") } $fh->close; } } diff --git a/inc/Module/Install/Include.pm b/inc/Module/Install/Include.pm index 6adef92..8310e4c 100644 --- a/inc/Module/Install/Include.pm +++ b/inc/Module/Install/Include.pm @@ -1,12 +1,34 @@ -#line 1 "inc/Module/Install/Include.pm - /Library/Perl/5.8.1/Module/Install/Include.pm" -# $File: //depot/cpan/Module-Install/lib/Module/Install/Include.pm $ $Author: autrijus $ -# $Revision: #8 $ $Change: 1811 $ $DateTime: 2003/12/14 18:52:33 $ vim: expandtab shiftwidth=4 - +#line 1 package Module::Install::Include; -use Module::Install::Base; @ISA = qw(Module::Install::Base); -sub include { +shift->admin->include(@_) }; -sub include_deps { +shift->admin->include_deps(@_) }; -sub auto_include { +shift->admin->auto_include(@_) }; +use strict; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '1.06'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} + +sub include { + shift()->admin->include(@_); +} + +sub include_deps { + shift()->admin->include_deps(@_); +} + +sub auto_include { + shift()->admin->auto_include(@_); +} + +sub auto_include_deps { + shift()->admin->auto_include_deps(@_); +} + +sub auto_include_dependent_dists { + shift()->admin->auto_include_dependent_dists(@_); +} 1; diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm index 41dff0c..7052f36 100644 --- a/inc/Module/Install/Makefile.pm +++ b/inc/Module/Install/Makefile.pm @@ -1,146 +1,418 @@ -#line 1 "inc/Module/Install/Makefile.pm - /Library/Perl/5.8.1/Module/Install/Makefile.pm" -# $File: //depot/cpan/Module-Install/lib/Module/Install/Makefile.pm $ $Author: autrijus $ -# $Revision: #53 $ $Change: 1847 $ $DateTime: 2003/12/31 23:14:54 $ vim: expandtab shiftwidth=4 - +#line 1 package Module::Install::Makefile; -use Module::Install::Base; @ISA = qw(Module::Install::Base); - -$VERSION = '0.01'; use strict 'vars'; -use vars '$VERSION'; - -use ExtUtils::MakeMaker (); +use ExtUtils::MakeMaker (); +use Module::Install::Base (); +use Fcntl qw/:flock :seek/; + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '1.06'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} sub Makefile { $_[0] } -sub prompt { - shift; - goto &ExtUtils::MakeMaker::prompt; -} +my %seen = (); -sub makemaker_args { - my $self = shift; - my $args = ($self->{makemaker_args} ||= {}); - %$args = ( %$args, @_ ) if @_; - $args; -} +sub prompt { + shift; -sub clean_files { - my $self = shift; - my $clean = $self->makemaker_args->{clean} ||= {}; - %$clean = ( - %$clean, - FILES => join(" ", grep length, $clean->{FILES}, @_), - ); -} + # Infinite loop protection + my @c = caller(); + if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { + die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; + } -sub libs { - my $self = shift; - my $libs = ref $_[0] ? shift : [shift]; - $self->makemaker_args( LIBS => $libs ); + # In automated testing or non-interactive session, always use defaults + if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) { + local $ENV{PERL_MM_USE_DEFAULT} = 1; + goto &ExtUtils::MakeMaker::prompt; + } else { + goto &ExtUtils::MakeMaker::prompt; + } } -sub inc { - my $self = shift; - $self->makemaker_args( INC => shift ); +# Store a cleaned up version of the MakeMaker version, +# since we need to behave differently in a variety of +# ways based on the MM version. +my $makemaker = eval $ExtUtils::MakeMaker::VERSION; + +# If we are passed a param, do a "newer than" comparison. +# Otherwise, just return the MakeMaker version. +sub makemaker { + ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0 } -sub write { - my $self = shift; - die "&Makefile->write() takes no arguments\n" if @_; +# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified +# as we only need to know here whether the attribute is an array +# or a hash or something else (which may or may not be appendable). +my %makemaker_argtype = ( + C => 'ARRAY', + CONFIG => 'ARRAY', +# CONFIGURE => 'CODE', # ignore + DIR => 'ARRAY', + DL_FUNCS => 'HASH', + DL_VARS => 'ARRAY', + EXCLUDE_EXT => 'ARRAY', + EXE_FILES => 'ARRAY', + FUNCLIST => 'ARRAY', + H => 'ARRAY', + IMPORTS => 'HASH', + INCLUDE_EXT => 'ARRAY', + LIBS => 'ARRAY', # ignore '' + MAN1PODS => 'HASH', + MAN3PODS => 'HASH', + META_ADD => 'HASH', + META_MERGE => 'HASH', + PL_FILES => 'HASH', + PM => 'HASH', + PMLIBDIRS => 'ARRAY', + PMLIBPARENTDIRS => 'ARRAY', + PREREQ_PM => 'HASH', + CONFIGURE_REQUIRES => 'HASH', + SKIP => 'ARRAY', + TYPEMAPS => 'ARRAY', + XS => 'HASH', +# VERSION => ['version',''], # ignore +# _KEEP_AFTER_FLUSH => '', + + clean => 'HASH', + depend => 'HASH', + dist => 'HASH', + dynamic_lib=> 'HASH', + linkext => 'HASH', + macro => 'HASH', + postamble => 'HASH', + realclean => 'HASH', + test => 'HASH', + tool_autosplit => 'HASH', + + # special cases where you can use makemaker_append + CCFLAGS => 'APPENDABLE', + DEFINE => 'APPENDABLE', + INC => 'APPENDABLE', + LDDLFLAGS => 'APPENDABLE', + LDFROM => 'APPENDABLE', +); - my $args = $self->makemaker_args; +sub makemaker_args { + my ($self, %new_args) = @_; + my $args = ( $self->{makemaker_args} ||= {} ); + foreach my $key (keys %new_args) { + if ($makemaker_argtype{$key}) { + if ($makemaker_argtype{$key} eq 'ARRAY') { + $args->{$key} = [] unless defined $args->{$key}; + unless (ref $args->{$key} eq 'ARRAY') { + $args->{$key} = [$args->{$key}] + } + push @{$args->{$key}}, + ref $new_args{$key} eq 'ARRAY' + ? @{$new_args{$key}} + : $new_args{$key}; + } + elsif ($makemaker_argtype{$key} eq 'HASH') { + $args->{$key} = {} unless defined $args->{$key}; + foreach my $skey (keys %{ $new_args{$key} }) { + $args->{$key}{$skey} = $new_args{$key}{$skey}; + } + } + elsif ($makemaker_argtype{$key} eq 'APPENDABLE') { + $self->makemaker_append($key => $new_args{$key}); + } + } + else { + if (defined $args->{$key}) { + warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n}; + } + $args->{$key} = $new_args{$key}; + } + } + return $args; +} - $args->{DISTNAME} = $self->name; - $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args); - $args->{VERSION} = $self->version || $self->determine_VERSION($args); - $args->{NAME} =~ s/-/::/g; +# For mm args that take multiple space-seperated args, +# append an argument to the current list. +sub makemaker_append { + my $self = shift; + my $name = shift; + my $args = $self->makemaker_args; + $args->{$name} = defined $args->{$name} + ? join( ' ', $args->{$name}, @_ ) + : join( ' ', @_ ); +} - if ($] >= 5.005) { - $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = $self->author; - } - if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) { - $args->{NO_META} = 1; - } - if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 ) { - $args->{SIGN} = 1 if $self->sign; - } - delete $args->{SIGN} unless $self->is_admin; +sub build_subdirs { + my $self = shift; + my $subdirs = $self->makemaker_args->{DIR} ||= []; + for my $subdir (@_) { + push @$subdirs, $subdir; + } +} - # merge both kinds of requires into prereq_pm - my $prereq = ($args->{PREREQ_PM} ||= {}); - %$prereq = ( %$prereq, map { @$_ } map { @$_ } grep $_, - ($self->build_requires, $self->requires) ); +sub clean_files { + my $self = shift; + my $clean = $self->makemaker_args->{clean} ||= {}; + %$clean = ( + %$clean, + FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), + ); +} - # merge both kinds of requires into prereq_pm - my $dir = ($args->{DIR} ||= []); - if ($self->bundles) { - push @$dir, map "$_->[1]", @{$self->bundles}; - delete $prereq->{$_->[0]} for @{$self->bundles}; - } +sub realclean_files { + my $self = shift; + my $realclean = $self->makemaker_args->{realclean} ||= {}; + %$realclean = ( + %$realclean, + FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), + ); +} - if (my $perl_version = $self->perl_version) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, ". - "but we need version >= $perl_version"; - } +sub libs { + my $self = shift; + my $libs = ref $_[0] ? shift : [ shift ]; + $self->makemaker_args( LIBS => $libs ); +} - my %args = map {($_ => $args->{$_})} grep {defined($args->{$_})} keys %$args; +sub inc { + my $self = shift; + $self->makemaker_args( INC => shift ); +} - if ($self->admin->preop) { - $args{dist} = $self->admin->preop; - } +sub _wanted_t { +} - ExtUtils::MakeMaker::WriteMakefile(%args); +sub tests_recursive { + my $self = shift; + my $dir = shift || 't'; + unless ( -d $dir ) { + die "tests_recursive dir '$dir' does not exist"; + } + my %tests = map { $_ => 1 } split / /, ($self->tests || ''); + require File::Find; + File::Find::find( + sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 }, + $dir + ); + $self->tests( join ' ', sort keys %tests ); +} - $self->fix_up_makefile(); +sub write { + my $self = shift; + die "&Makefile->write() takes no arguments\n" if @_; + + # Check the current Perl version + my $perl_version = $self->perl_version; + if ( $perl_version ) { + eval "use $perl_version; 1" + or die "ERROR: perl: Version $] is installed, " + . "but we need version >= $perl_version"; + } + + # Make sure we have a new enough MakeMaker + require ExtUtils::MakeMaker; + + if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) { + # This previous attempted to inherit the version of + # ExtUtils::MakeMaker in use by the module author, but this + # was found to be untenable as some authors build releases + # using future dev versions of EU:MM that nobody else has. + # Instead, #toolchain suggests we use 6.59 which is the most + # stable version on CPAN at time of writing and is, to quote + # ribasushi, "not terminally fucked, > and tested enough". + # TODO: We will now need to maintain this over time to push + # the version up as new versions are released. + $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 ); + $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 ); + } else { + # Allow legacy-compatibility with 5.005 by depending on the + # most recent EU:MM that supported 5.005. + $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 ); + $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 ); + } + + # Generate the MakeMaker params + my $args = $self->makemaker_args; + $args->{DISTNAME} = $self->name; + $args->{NAME} = $self->module_name || $self->name; + $args->{NAME} =~ s/-/::/g; + $args->{VERSION} = $self->version or die <<'EOT'; +ERROR: Can't determine distribution version. Please specify it +explicitly via 'version' in Makefile.PL, or set a valid $VERSION +in a module, and provide its file path via 'version_from' (or +'all_from' if you prefer) in Makefile.PL. +EOT + + if ( $self->tests ) { + my @tests = split ' ', $self->tests; + my %seen; + $args->{test} = { + TESTS => (join ' ', grep {!$seen{$_}++} @tests), + }; + } elsif ( $Module::Install::ExtraTests::use_extratests ) { + # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness. + # So, just ignore our xt tests here. + } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) { + $args->{test} = { + TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ), + }; + } + if ( $] >= 5.005 ) { + $args->{ABSTRACT} = $self->abstract; + $args->{AUTHOR} = join ', ', @{$self->author || []}; + } + if ( $self->makemaker(6.10) ) { + $args->{NO_META} = 1; + #$args->{NO_MYMETA} = 1; + } + if ( $self->makemaker(6.17) and $self->sign ) { + $args->{SIGN} = 1; + } + unless ( $self->is_admin ) { + delete $args->{SIGN}; + } + if ( $self->makemaker(6.31) and $self->license ) { + $args->{LICENSE} = $self->license; + } + + my $prereq = ($args->{PREREQ_PM} ||= {}); + %$prereq = ( %$prereq, + map { @$_ } # flatten [module => version] + map { @$_ } + grep $_, + ($self->requires) + ); + + # Remove any reference to perl, PREREQ_PM doesn't support it + delete $args->{PREREQ_PM}->{perl}; + + # Merge both kinds of requires into BUILD_REQUIRES + my $build_prereq = ($args->{BUILD_REQUIRES} ||= {}); + %$build_prereq = ( %$build_prereq, + map { @$_ } # flatten [module => version] + map { @$_ } + grep $_, + ($self->configure_requires, $self->build_requires) + ); + + # Remove any reference to perl, BUILD_REQUIRES doesn't support it + delete $args->{BUILD_REQUIRES}->{perl}; + + # Delete bundled dists from prereq_pm, add it to Makefile DIR + my $subdirs = ($args->{DIR} || []); + if ($self->bundles) { + my %processed; + foreach my $bundle (@{ $self->bundles }) { + my ($mod_name, $dist_dir) = @$bundle; + delete $prereq->{$mod_name}; + $dist_dir = File::Basename::basename($dist_dir); # dir for building this module + if (not exists $processed{$dist_dir}) { + if (-d $dist_dir) { + # List as sub-directory to be processed by make + push @$subdirs, $dist_dir; + } + # Else do nothing: the module is already present on the system + $processed{$dist_dir} = undef; + } + } + } + + unless ( $self->makemaker('6.55_03') ) { + %$prereq = (%$prereq,%$build_prereq); + delete $args->{BUILD_REQUIRES}; + } + + if ( my $perl_version = $self->perl_version ) { + eval "use $perl_version; 1" + or die "ERROR: perl: Version $] is installed, " + . "but we need version >= $perl_version"; + + if ( $self->makemaker(6.48) ) { + $args->{MIN_PERL_VERSION} = $perl_version; + } + } + + if ($self->installdirs) { + warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS}; + $args->{INSTALLDIRS} = $self->installdirs; + } + + my %args = map { + ( $_ => $args->{$_} ) } grep {defined($args->{$_} ) + } keys %$args; + + my $user_preop = delete $args{dist}->{PREOP}; + if ( my $preop = $self->admin->preop($user_preop) ) { + foreach my $key ( keys %$preop ) { + $args{dist}->{$key} = $preop->{$key}; + } + } + + my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); + $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); } sub fix_up_makefile { - my $self = shift; - my $top_class = ref($self->_top) || ''; - my $top_version = $self->_top->VERSION || ''; - - my $preamble = $self->preamble - ? "# Preamble by $top_class $top_version\n" . $self->preamble - : ''; - my $postamble = "# Postamble by $top_class $top_version\n" . - ($self->postamble || ''); - - open MAKEFILE, '< Makefile' or die $!; - my $makefile = do { local $/; <MAKEFILE> }; - close MAKEFILE; - - $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; - $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; - $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; - - $makefile =~ s/^(FULLPERL = .*)/$1 -Iinc/m; - $makefile =~ s/^(PERL = .*)/$1 -Iinc/m; - - open MAKEFILE, '> Makefile' or die $!; - print MAKEFILE "$preamble$makefile$postamble"; - close MAKEFILE; + my $self = shift; + my $makefile_name = shift; + my $top_class = ref($self->_top) || ''; + my $top_version = $self->_top->VERSION || ''; + + my $preamble = $self->preamble + ? "# Preamble by $top_class $top_version\n" + . $self->preamble + : ''; + my $postamble = "# Postamble by $top_class $top_version\n" + . ($self->postamble || ''); + + local *MAKEFILE; + open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + eval { flock MAKEFILE, LOCK_EX }; + my $makefile = do { local $/; <MAKEFILE> }; + + $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; + $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; + $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; + $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; + $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; + + # Module::Install will never be used to build the Core Perl + # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks + # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist + $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; + #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; + + # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. + $makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g; + + # XXX - This is currently unused; not sure if it breaks other MM-users + # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; + + seek MAKEFILE, 0, SEEK_SET; + truncate MAKEFILE, 0; + print MAKEFILE "$preamble$makefile$postamble" or die $!; + close MAKEFILE or die $!; + + 1; } sub preamble { - my ($self, $text) = @_; - $self->{preamble} = $text . $self->{preamble} if defined $text; - $self->{preamble}; + my ($self, $text) = @_; + $self->{preamble} = $text . $self->{preamble} if defined $text; + $self->{preamble}; } sub postamble { - my ($self, $text) = @_; - - $self->{postamble} ||= $self->admin->postamble; - $self->{postamble} .= $text if defined $text; - $self->{postamble} + my ($self, $text) = @_; + $self->{postamble} ||= $self->admin->postamble; + $self->{postamble} .= $text if defined $text; + $self->{postamble} } 1; __END__ -#line 276 +#line 544 diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm index b966264..58430f3 100644 --- a/inc/Module/Install/Metadata.pm +++ b/inc/Module/Install/Metadata.pm @@ -1,190 +1,722 @@ -#line 1 "inc/Module/Install/Metadata.pm - /Library/Perl/5.8.1/Module/Install/Metadata.pm" -# $File: //depot/cpan/Module-Install/lib/Module/Install/Metadata.pm $ $Author: autrijus $ -# $Revision: #32 $ $Change: 1885 $ $DateTime: 2004/03/11 05:55:27 $ vim: expandtab shiftwidth=4 - +#line 1 package Module::Install::Metadata; -use Module::Install::Base; @ISA = qw(Module::Install::Base); - -$VERSION = '0.04'; use strict 'vars'; -use vars qw($VERSION); +use Module::Install::Base (); -sub Meta { shift } +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '1.06'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} -my @scalar_keys = qw( - name module_name version abstract author license - distribution_type sign perl_version -); -my @tuple_keys = qw(build_requires requires recommends bundles); - -foreach my $key (@scalar_keys) { - *$key = sub { - my $self = shift; - return $self->{'values'}{$key} unless @_; - $self->{'values'}{$key} = shift; - return $self; - }; -} - -foreach my $key (@tuple_keys) { - *$key = sub { - my $self = shift; - return $self->{'values'}{$key} unless @_; - my @rv; - while (@_) { - my $module = shift or last; - my $version = shift || 0; - if ($module eq 'perl') { - $version =~ s{^(\d+)\.(\d+)\.(\d+)} - {$1 + $2/1_000 + $3/1_000_000}e; - $self->perl_version($version); - next; - } - my $rv = [$module, $version]; - push @{$self->{'values'}{$key}}, $rv; - push @rv, $rv; - } - return @rv; - }; +my @boolean_keys = qw{ + sign +}; + +my @scalar_keys = qw{ + name + module_name + abstract + version + distribution_type + tests + installdirs +}; + +my @tuple_keys = qw{ + configure_requires + build_requires + requires + recommends + bundles + resources +}; + +my @resource_keys = qw{ + homepage + bugtracker + repository +}; + +my @array_keys = qw{ + keywords + author +}; + +*authors = \&author; + +sub Meta { shift } +sub Meta_BooleanKeys { @boolean_keys } +sub Meta_ScalarKeys { @scalar_keys } +sub Meta_TupleKeys { @tuple_keys } +sub Meta_ResourceKeys { @resource_keys } +sub Meta_ArrayKeys { @array_keys } + +foreach my $key ( @boolean_keys ) { + *$key = sub { + my $self = shift; + if ( defined wantarray and not @_ ) { + return $self->{values}->{$key}; + } + $self->{values}->{$key} = ( @_ ? $_[0] : 1 ); + return $self; + }; } -sub features { - my $self = shift; - while (my ($name, $mods) = splice(@_, 0, 2)) { - my $count = 0; - push @{$self->{'values'}{'features'}}, ($name => [ - map { (++$count % 2 and ref($_) and ($count += $#$_)) ? @$_ : $_ } @$mods - ] ); - } - return @{$self->{'values'}{'features'}}; +foreach my $key ( @scalar_keys ) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} if defined wantarray and !@_; + $self->{values}->{$key} = shift; + return $self; + }; } -sub no_index { - my $self = shift; - my $type = shift; - push @{$self->{'values'}{'no_index'}{$type}}, @_ if $type; - return $self->{'values'}{'no_index'}; +foreach my $key ( @array_keys ) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} if defined wantarray and !@_; + $self->{values}->{$key} ||= []; + push @{$self->{values}->{$key}}, @_; + return $self; + }; } -sub _dump { - my $self = shift; - my $package = ref($self->_top); - my $version = $self->_top->VERSION; - my %values = %{$self->{'values'}}; - - delete $values{sign}; - if (my $perl_version = delete $values{perl_version}) { - # Always canonical to three-dot version - $perl_version =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2), int($3))}e - if $perl_version >= 5.006; - $values{requires} = [ - [perl => $perl_version], - @{$values{requires}||[]}, - ]; - } +foreach my $key ( @resource_keys ) { + *$key = sub { + my $self = shift; + unless ( @_ ) { + return () unless $self->{values}->{resources}; + return map { $_->[1] } + grep { $_->[0] eq $key } + @{ $self->{values}->{resources} }; + } + return $self->{values}->{resources}->{$key} unless @_; + my $uri = shift or die( + "Did not provide a value to $key()" + ); + $self->resources( $key => $uri ); + return 1; + }; +} - warn "No license specified, setting license = 'unknown'\n" - unless $values{license}; - - $values{license} ||= 'unknown'; - $values{distribution_type} ||= 'module'; - $values{name} ||= do { - my $name = $values{module_name}; - $name =~ s/::/-/g; - $name; - } if $values{module_name}; - - if ($values{name} =~ /::/) { - my $name = $values{name}; - $name =~ s/::/-/g; - die "Error in name(): '$values{name}' should be '$name'!\n"; - } +foreach my $key ( grep { $_ ne "resources" } @tuple_keys) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} unless @_; + my @added; + while ( @_ ) { + my $module = shift or last; + my $version = shift || 0; + push @added, [ $module, $version ]; + } + push @{ $self->{values}->{$key} }, @added; + return map {@$_} @added; + }; +} - my $dump = ''; - foreach my $key (@scalar_keys) { - $dump .= "$key: $values{$key}\n" if exists $values{$key}; - } - foreach my $key (@tuple_keys) { - next unless exists $values{$key}; - $dump .= "$key:\n"; - foreach (@{$values{$key}}) { - $dump .= " $_->[0]: $_->[1]\n"; - } - } +# Resource handling +my %lc_resource = map { $_ => 1 } qw{ + homepage + license + bugtracker + repository +}; - if (my $no_index = $values{no_index}) { - push @{$no_index->{'directory'}}, 'inc'; - require YAML; - local $YAML::UseHeader = 0; - $dump .= YAML::Dump({ no_index => $no_index}); - } - else { - $dump .= << "META"; -no_index: - directory: - - inc -META - } - - $dump .= "generated_by: $package version $version\n"; - return $dump; +sub resources { + my $self = shift; + while ( @_ ) { + my $name = shift or last; + my $value = shift or next; + if ( $name eq lc $name and ! $lc_resource{$name} ) { + die("Unsupported reserved lowercase resource '$name'"); + } + $self->{values}->{resources} ||= []; + push @{ $self->{values}->{resources} }, [ $name, $value ]; + } + $self->{values}->{resources}; +} + +# Aliases for build_requires that will have alternative +# meanings in some future version of META.yml. +sub test_requires { shift->build_requires(@_) } +sub install_requires { shift->build_requires(@_) } + +# Aliases for installdirs options +sub install_as_core { $_[0]->installdirs('perl') } +sub install_as_cpan { $_[0]->installdirs('site') } +sub install_as_site { $_[0]->installdirs('site') } +sub install_as_vendor { $_[0]->installdirs('vendor') } + +sub dynamic_config { + my $self = shift; + my $value = @_ ? shift : 1; + if ( $self->{values}->{dynamic_config} ) { + # Once dynamic we never change to static, for safety + return 0; + } + $self->{values}->{dynamic_config} = $value ? 1 : 0; + return 1; +} + +# Convenience command +sub static_config { + shift->dynamic_config(0); +} + +sub perl_version { + my $self = shift; + return $self->{values}->{perl_version} unless @_; + my $version = shift or die( + "Did not provide a value to perl_version()" + ); + + # Normalize the version + $version = $self->_perl_version($version); + + # We don't support the really old versions + unless ( $version >= 5.005 ) { + die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; + } + + $self->{values}->{perl_version} = $version; +} + +sub all_from { + my ( $self, $file ) = @_; + + unless ( defined($file) ) { + my $name = $self->name or die( + "all_from called with no args without setting name() first" + ); + $file = join('/', 'lib', split(/-/, $name)) . '.pm'; + $file =~ s{.*/}{} unless -e $file; + unless ( -e $file ) { + die("all_from cannot find $file from $name"); + } + } + unless ( -f $file ) { + die("The path '$file' does not exist, or is not a file"); + } + + $self->{values}{all_from} = $file; + + # Some methods pull from POD instead of code. + # If there is a matching .pod, use that instead + my $pod = $file; + $pod =~ s/\.pm$/.pod/i; + $pod = $file unless -e $pod; + + # Pull the different values + $self->name_from($file) unless $self->name; + $self->version_from($file) unless $self->version; + $self->perl_version_from($file) unless $self->perl_version; + $self->author_from($pod) unless @{$self->author || []}; + $self->license_from($pod) unless $self->license; + $self->abstract_from($pod) unless $self->abstract; + + return 1; +} + +sub provides { + my $self = shift; + my $provides = ( $self->{values}->{provides} ||= {} ); + %$provides = (%$provides, @_) if @_; + return $provides; +} + +sub auto_provides { + my $self = shift; + return $self unless $self->is_admin; + unless (-e 'MANIFEST') { + warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; + return $self; + } + # Avoid spurious warnings as we are not checking manifest here. + local $SIG{__WARN__} = sub {1}; + require ExtUtils::Manifest; + local *ExtUtils::Manifest::manicheck = sub { return }; + + require Module::Build; + my $build = Module::Build->new( + dist_name => $self->name, + dist_version => $self->version, + license => $self->license, + ); + $self->provides( %{ $build->find_dist_packages || {} } ); +} + +sub feature { + my $self = shift; + my $name = shift; + my $features = ( $self->{values}->{features} ||= [] ); + my $mods; + + if ( @_ == 1 and ref( $_[0] ) ) { + # The user used ->feature like ->features by passing in the second + # argument as a reference. Accomodate for that. + $mods = $_[0]; + } else { + $mods = \@_; + } + + my $count = 0; + push @$features, ( + $name => [ + map { + ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_ + } @$mods + ] + ); + + return @$features; +} + +sub features { + my $self = shift; + while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { + $self->feature( $name, @$mods ); + } + return $self->{values}->{features} + ? @{ $self->{values}->{features} } + : (); +} + +sub no_index { + my $self = shift; + my $type = shift; + push @{ $self->{values}->{no_index}->{$type} }, @_ if $type; + return $self->{values}->{no_index}; } sub read { - my $self = shift; - $self->include_deps( 'YAML', 0 ); - require YAML; - my $data = YAML::LoadFile( 'META.yml' ); - # Call methods explicitly in case user has already set some values. - while ( my ($key, $value) = each %$data ) { - next unless $self->can( $key ); - if (ref $value eq 'HASH') { - while (my ($module, $version) = each %$value) { - $self->$key( $module => $version ); - } - } - else { - $self->$key( $value ); - } - } - return $self; + my $self = shift; + $self->include_deps( 'YAML::Tiny', 0 ); + + require YAML::Tiny; + my $data = YAML::Tiny::LoadFile('META.yml'); + + # Call methods explicitly in case user has already set some values. + while ( my ( $key, $value ) = each %$data ) { + next unless $self->can($key); + if ( ref $value eq 'HASH' ) { + while ( my ( $module, $version ) = each %$value ) { + $self->can($key)->($self, $module => $version ); + } + } else { + $self->can($key)->($self, $value); + } + } + return $self; } sub write { + my $self = shift; + return $self unless $self->is_admin; + $self->admin->write_meta; + return $self; +} + +sub version_from { + require ExtUtils::MM_Unix; + my ( $self, $file ) = @_; + $self->version( ExtUtils::MM_Unix->parse_version($file) ); + + # for version integrity check + $self->makemaker_args( VERSION_FROM => $file ); +} + +sub abstract_from { + require ExtUtils::MM_Unix; + my ( $self, $file ) = @_; + $self->abstract( + bless( + { DISTNAME => $self->name }, + 'ExtUtils::MM_Unix' + )->parse_abstract($file) + ); +} + +# Add both distribution and module name +sub name_from { + my ($self, $file) = @_; + if ( + Module::Install::_read($file) =~ m/ + ^ \s* + package \s* + ([\w:]+) + \s* ; + /ixms + ) { + my ($name, $module_name) = ($1, $1); + $name =~ s{::}{-}g; + $self->name($name); + unless ( $self->module_name ) { + $self->module_name($module_name); + } + } else { + die("Cannot determine name from $file\n"); + } +} + +sub _extract_perl_version { + if ( + $_[0] =~ m/ + ^\s* + (?:use|require) \s* + v? + ([\d_\.]+) + \s* ; + /ixms + ) { + my $perl_version = $1; + $perl_version =~ s{_}{}g; + return $perl_version; + } else { + return; + } +} + +sub perl_version_from { + my $self = shift; + my $perl_version=_extract_perl_version(Module::Install::_read($_[0])); + if ($perl_version) { + $self->perl_version($perl_version); + } else { + warn "Cannot determine perl version info from $_[0]\n"; + return; + } +} + +sub author_from { + my $self = shift; + my $content = Module::Install::_read($_[0]); + if ($content =~ m/ + =head \d \s+ (?:authors?)\b \s* + ([^\n]*) + | + =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* + .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* + ([^\n]*) + /ixms) { + my $author = $1 || $2; + + # XXX: ugly but should work anyway... + if (eval "require Pod::Escapes; 1") { + # Pod::Escapes has a mapping table. + # It's in core of perl >= 5.9.3, and should be installed + # as one of the Pod::Simple's prereqs, which is a prereq + # of Pod::Text 3.x (see also below). + $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } + { + defined $2 + ? chr($2) + : defined $Pod::Escapes::Name2character_number{$1} + ? chr($Pod::Escapes::Name2character_number{$1}) + : do { + warn "Unknown escape: E<$1>"; + "E<$1>"; + }; + }gex; + } + elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) { + # Pod::Text < 3.0 has yet another mapping table, + # though the table name of 2.x and 1.x are different. + # (1.x is in core of Perl < 5.6, 2.x is in core of + # Perl < 5.9.3) + my $mapping = ($Pod::Text::VERSION < 2) + ? \%Pod::Text::HTML_Escapes + : \%Pod::Text::ESCAPES; + $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } + { + defined $2 + ? chr($2) + : defined $mapping->{$1} + ? $mapping->{$1} + : do { + warn "Unknown escape: E<$1>"; + "E<$1>"; + }; + }gex; + } + else { + $author =~ s{E<lt>}{<}g; + $author =~ s{E<gt>}{>}g; + } + $self->author($author); + } else { + warn "Cannot determine author info from $_[0]\n"; + } +} + +#Stolen from M::B +my %license_urls = ( + perl => 'http://dev.perl.org/licenses/', + apache => 'http://apache.org/licenses/LICENSE-2.0', + apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1', + artistic => 'http://opensource.org/licenses/artistic-license.php', + artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', + lgpl => 'http://opensource.org/licenses/lgpl-license.php', + lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', + lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', + bsd => 'http://opensource.org/licenses/bsd-license.php', + gpl => 'http://opensource.org/licenses/gpl-license.php', + gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', + gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', + mit => 'http://opensource.org/licenses/mit-license.php', + mozilla => 'http://opensource.org/licenses/mozilla1.1.php', + open_source => undef, + unrestricted => undef, + restrictive => undef, + unknown => undef, +); + +sub license { + my $self = shift; + return $self->{values}->{license} unless @_; + my $license = shift or die( + 'Did not provide a value to license()' + ); + $license = __extract_license($license) || lc $license; + $self->{values}->{license} = $license; + + # Automatically fill in license URLs + if ( $license_urls{$license} ) { + $self->resources( license => $license_urls{$license} ); + } + + return 1; +} + +sub _extract_license { + my $pod = shift; + my $matched; + return __extract_license( + ($matched) = $pod =~ m/ + (=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?) + (=head \d.*|=cut.*|)\z + /xms + ) || __extract_license( + ($matched) = $pod =~ m/ + (=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?) + (=head \d.*|=cut.*|)\z + /xms + ); +} + +sub __extract_license { + my $license_text = shift or return; + my @phrases = ( + '(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1, + '(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1, + 'Artistic and GPL' => 'perl', 1, + 'GNU general public license' => 'gpl', 1, + 'GNU public license' => 'gpl', 1, + 'GNU lesser general public license' => 'lgpl', 1, + 'GNU lesser public license' => 'lgpl', 1, + 'GNU library general public license' => 'lgpl', 1, + 'GNU library public license' => 'lgpl', 1, + 'GNU Free Documentation license' => 'unrestricted', 1, + 'GNU Affero General Public License' => 'open_source', 1, + '(?:Free)?BSD license' => 'bsd', 1, + 'Artistic license 2\.0' => 'artistic_2', 1, + 'Artistic license' => 'artistic', 1, + 'Apache (?:Software )?license' => 'apache', 1, + 'GPL' => 'gpl', 1, + 'LGPL' => 'lgpl', 1, + 'BSD' => 'bsd', 1, + 'Artistic' => 'artistic', 1, + 'MIT' => 'mit', 1, + 'Mozilla Public License' => 'mozilla', 1, + 'Q Public License' => 'open_source', 1, + 'OpenSSL License' => 'unrestricted', 1, + 'SSLeay License' => 'unrestricted', 1, + 'zlib License' => 'open_source', 1, + 'proprietary' => 'proprietary', 0, + ); + while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { + $pattern =~ s#\s+#\\s+#gs; + if ( $license_text =~ /\b$pattern\b/i ) { + return $license; + } + } + return ''; +} + +sub license_from { + my $self = shift; + if (my $license=_extract_license(Module::Install::_read($_[0]))) { + $self->license($license); + } else { + warn "Cannot determine license info from $_[0]\n"; + return 'unknown'; + } +} + +sub _extract_bugtracker { + my @links = $_[0] =~ m#L<( + https?\Q://rt.cpan.org/\E[^>]+| + https?\Q://github.com/\E[\w_]+/[\w_]+/issues| + https?\Q://code.google.com/p/\E[\w_\-]+/issues/list + )>#gx; + my %links; + @links{@links}=(); + @links=keys %links; + return @links; +} + +sub bugtracker_from { + my $self = shift; + my $content = Module::Install::_read($_[0]); + my @links = _extract_bugtracker($content); + unless ( @links ) { + warn "Cannot determine bugtracker info from $_[0]\n"; + return 0; + } + if ( @links > 1 ) { + warn "Found more than one bugtracker link in $_[0]\n"; + return 0; + } + + # Set the bugtracker + bugtracker( $links[0] ); + return 1; +} + +sub requires_from { + my $self = shift; + my $content = Module::Install::_readperl($_[0]); + my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg; + while ( @requires ) { + my $module = shift @requires; + my $version = shift @requires; + $self->requires( $module => $version ); + } +} + +sub test_requires_from { + my $self = shift; + my $content = Module::Install::_readperl($_[0]); + my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; + while ( @requires ) { + my $module = shift @requires; + my $version = shift @requires; + $self->test_requires( $module => $version ); + } +} + +# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to +# numbers (eg, 5.006001 or 5.008009). +# Also, convert double-part versions (eg, 5.8) +sub _perl_version { + my $v = $_[-1]; + $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e; + $v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e; + $v =~ s/(\.\d\d\d)000$/$1/; + $v =~ s/_.+$//; + if ( ref($v) ) { + # Numify + $v = $v + 0; + } + return $v; +} + +sub add_metadata { my $self = shift; - return $self unless $self->is_admin; - - META_NOT_OURS: { - local *FH; - if (open FH, "META.yml") { - while (<FH>) { - last META_NOT_OURS if /^generated_by: Module::Install\b/; - } - return $self if -s FH; - } + my %hash = @_; + for my $key (keys %hash) { + warn "add_metadata: $key is not prefixed with 'x_'.\n" . + "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/; + $self->{values}->{$key} = $hash{$key}; } +} - warn "Writing META.yml\n"; - open META, "> META.yml" or warn "Cannot write to META.yml: $!"; - print META $self->_dump; - close META; - return $self; + +###################################################################### +# MYMETA Support + +sub WriteMyMeta { + die "WriteMyMeta has been deprecated"; } -sub version_from { - my ($self, $version_from) = @_; - require ExtUtils::MM_Unix; - $self->version(ExtUtils::MM_Unix->parse_version($version_from)); +sub write_mymeta_yaml { + my $self = shift; + + # We need YAML::Tiny to write the MYMETA.yml file + unless ( eval { require YAML::Tiny; 1; } ) { + return 1; + } + + # Generate the data + my $meta = $self->_write_mymeta_data or return 1; + + # Save as the MYMETA.yml file + print "Writing MYMETA.yml\n"; + YAML::Tiny::DumpFile('MYMETA.yml', $meta); } -sub abstract_from { - my ($self, $abstract_from) = @_; - require ExtUtils::MM_Unix; - $self->abstract( - bless( { DISTNAME => $self->name }, 'ExtUtils::MM_Unix') - ->parse_abstract($abstract_from) - ); +sub write_mymeta_json { + my $self = shift; + + # We need JSON to write the MYMETA.json file + unless ( eval { require JSON; 1; } ) { + return 1; + } + + # Generate the data + my $meta = $self->_write_mymeta_data or return 1; + + # Save as the MYMETA.yml file + print "Writing MYMETA.json\n"; + Module::Install::_write( + 'MYMETA.json', + JSON->new->pretty(1)->canonical->encode($meta), + ); +} + +sub _write_mymeta_data { + my $self = shift; + + # If there's no existing META.yml there is nothing we can do + return undef unless -f 'META.yml'; + + # We need Parse::CPAN::Meta to load the file + unless ( eval { require Parse::CPAN::Meta; 1; } ) { + return undef; + } + + # Merge the perl version into the dependencies + my $val = $self->Meta->{values}; + my $perl = delete $val->{perl_version}; + if ( $perl ) { + $val->{requires} ||= []; + my $requires = $val->{requires}; + + # Canonize to three-dot version after Perl 5.6 + if ( $perl >= 5.006 ) { + $perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e + } + unshift @$requires, [ perl => $perl ]; + } + + # Load the advisory META.yml file + my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); + my $meta = $yaml[0]; + + # Overwrite the non-configure dependency hashs + delete $meta->{requires}; + delete $meta->{build_requires}; + delete $meta->{recommends}; + if ( exists $val->{requires} ) { + $meta->{requires} = { map { @$_ } @{ $val->{requires} } }; + } + if ( exists $val->{build_requires} ) { + $meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } }; + } + + return $meta; } 1; diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm index a72d8ed..eeaa3fe 100644 --- a/inc/Module/Install/Win32.pm +++ b/inc/Module/Install/Win32.pm @@ -1,43 +1,44 @@ -#line 1 "inc/Module/Install/Win32.pm - /Library/Perl/5.8.1/Module/Install/Win32.pm" -# $File: //depot/cpan/Module-Install/lib/Module/Install/Win32.pm $ $Author: autrijus $ -# $Revision: #9 $ $Change: 1789 $ $DateTime: 2003/11/11 01:22:54 $ vim: expandtab shiftwidth=4 - +#line 1 package Module::Install::Win32; -use Module::Install::Base; @ISA = qw(Module::Install::Base); - -$VERSION = '0.02'; use strict; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '1.06'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} # determine if the user needs nmake, and download it if needed sub check_nmake { - my $self = shift; - $self->load('can_run'); - $self->load('get_file'); - - require Config; - return unless ( - $Config::Config{make} and - $Config::Config{make} =~ /^nmake\b/i and - $^O eq 'MSWin32' and - !$self->can_run('nmake') - ); - - print "The required 'nmake' executable not found, fetching it...\n"; - - require File::Basename; - my $rv = $self->get_file( - url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe', - ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe', - local_dir => File::Basename::dirname($^X), - size => 51928, - run => 'Nmake15.exe /o > nul', - check_for => 'Nmake.exe', - remove => 1, - ); - - if (!$rv) { - die << '.'; + my $self = shift; + $self->load('can_run'); + $self->load('get_file'); + + require Config; + return unless ( + $^O eq 'MSWin32' and + $Config::Config{make} and + $Config::Config{make} =~ /^nmake\b/i and + ! $self->can_run('nmake') + ); + + print "The required 'nmake' executable not found, fetching it...\n"; + + require File::Basename; + my $rv = $self->get_file( + url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe', + ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe', + local_dir => File::Basename::dirname($^X), + size => 51928, + run => 'Nmake15.exe /o > nul', + check_for => 'Nmake.exe', + remove => 1, + ); + + die <<'END_MESSAGE' unless $rv; ------------------------------------------------------------------------------- @@ -56,11 +57,8 @@ that directory, and run "Nmake15.exe" from there; that will create the You may then resume the installation process described in README. ------------------------------------------------------------------------------- -. - } +END_MESSAGE + } 1; - -__END__ - diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm index 8418d98..85d8018 100644 --- a/inc/Module/Install/WriteAll.pm +++ b/inc/Module/Install/WriteAll.pm @@ -1,39 +1,63 @@ -#line 1 "inc/Module/Install/WriteAll.pm - /Library/Perl/5.8.1/Module/Install/WriteAll.pm" -# $File: //depot/cpan/Module-Install/lib/Module/Install/WriteAll.pm $ $Author: autrijus $ -# $Revision: #3 $ $Change: 1885 $ $DateTime: 2004/03/11 05:55:27 $ vim: expandtab shiftwidth=4 - +#line 1 package Module::Install::WriteAll; -use Module::Install::Base; @ISA = qw(Module::Install::Base); + +use strict; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '1.06'; + @ISA = qw{Module::Install::Base}; + $ISCORE = 1; +} sub WriteAll { - my $self = shift; - my %args = ( - meta => 1, - sign => 0, - inline => 0, - check_nmake => 1, - @_ - ); - - $self->sign(1) if $args{sign}; - $self->Meta->write if $args{meta}; - $self->admin->WriteAll(%args) if $self->is_admin; - - if ($0 =~ /Build.PL$/i) { - $self->Build->write; - } - else { + my $self = shift; + my %args = ( + meta => 1, + sign => 0, + inline => 0, + check_nmake => 1, + @_, + ); + + $self->sign(1) if $args{sign}; + $self->admin->WriteAll(%args) if $self->is_admin; + $self->check_nmake if $args{check_nmake}; - $self->makemaker_args( PL_FILES => {} ) - unless $self->makemaker_args->{'PL_FILES'}; - - if ($args{inline}) { - $self->Inline->write; - } - else { - $self->Makefile->write; - } - } + unless ( $self->makemaker_args->{PL_FILES} ) { + # XXX: This still may be a bit over-defensive... + unless ($self->makemaker(6.25)) { + $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL'; + } + } + + # Until ExtUtils::MakeMaker support MYMETA.yml, make sure + # we clean it up properly ourself. + $self->realclean_files('MYMETA.yml'); + + if ( $args{inline} ) { + $self->Inline->write; + } else { + $self->Makefile->write; + } + + # The Makefile write process adds a couple of dependencies, + # so write the META.yml files after the Makefile. + if ( $args{meta} ) { + $self->Meta->write; + } + + # Experimental support for MYMETA + if ( $ENV{X_MYMETA} ) { + if ( $ENV{X_MYMETA} eq 'JSON' ) { + $self->Meta->write_mymeta_json; + } else { + $self->Meta->write_mymeta_yaml; + } + } + + return 1; } 1; diff --git a/lib/Class/ErrorHandler.pm b/lib/Class/ErrorHandler.pm index 20c82eb..5490508 100644 --- a/lib/Class/ErrorHandler.pm +++ b/lib/Class/ErrorHandler.pm @@ -4,7 +4,7 @@ package Class::ErrorHandler; use strict; use vars qw( $VERSION $ERROR ); -$VERSION = '0.01'; +$VERSION = '0.02'; sub error { my $msg = $_[1] || ''; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libclass-errorhandler-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits