Hello community,
here is the log from the commit of package perl-Parse-Method-Signatures for
openSUSE:Factory checked in at 2013-06-13 18:20:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Parse-Method-Signatures (Old)
and /work/SRC/openSUSE:Factory/.perl-Parse-Method-Signatures.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Parse-Method-Signatures"
Changes:
--------
---
/work/SRC/openSUSE:Factory/perl-Parse-Method-Signatures/perl-Parse-Method-Signatures.changes
2012-01-05 13:49:31.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.perl-Parse-Method-Signatures.new/perl-Parse-Method-Signatures.changes
2013-06-13 18:20:28.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Jun 9 14:46:52 UTC 2013 - [email protected]
+
+- updated to 1.003015
+ - Don't ship MYMETA files
+
+-------------------------------------------------------------------
Old:
----
Parse-Method-Signatures-1.003014.tar.gz
New:
----
Parse-Method-Signatures-1.003015.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Parse-Method-Signatures.spec ++++++
--- /var/tmp/diff_new_pack.fMkifc/_old 2013-06-13 18:20:29.000000000 +0200
+++ /var/tmp/diff_new_pack.fMkifc/_new 2013-06-13 18:20:29.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Parse-Method-Signatures
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,8 +15,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: perl-Parse-Method-Signatures
-Version: 1.003014
+Version: 1.003015
Release: 0
%define cpan_name Parse-Method-Signatures
Summary: Perl6 like method signature parser
@@ -51,6 +52,7 @@
#BuildRequires: perl(MooseX::Types::Util)
#BuildRequires: perl(Parse::CPAN::Meta)
#BuildRequires: perl(Parse::Method::Signatures)
+#BuildRequires: perl(Parse::Method::Signatures::Param)
#BuildRequires: perl(Parse::Method::Signatures::ParamCollection)
#BuildRequires: perl(Parse::Method::Signatures::Param::Unpacked)
#BuildRequires: perl(Parse::Method::Signatures::Types)
@@ -64,8 +66,8 @@
Requires: perl(MooseX::Types) >= 0.17
Requires: perl(MooseX::Types::Moose)
Requires: perl(MooseX::Types::Structured)
-Requires: perl(namespace::clean) >= 0.10
Requires: perl(PPI) >= 1.203
+Requires: perl(namespace::clean) >= 0.10
%{perl_requires}
%description
@@ -90,6 +92,6 @@
%files -f %{name}.files
%defattr(-,root,root,755)
-%doc Changes MYMETA.json MYMETA.yml
+%doc Changes
%changelog
++++++ Parse-Method-Signatures-1.003014.tar.gz ->
Parse-Method-Signatures-1.003015.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Parse-Method-Signatures-1.003014/Changes
new/Parse-Method-Signatures-1.003015/Changes
--- old/Parse-Method-Signatures-1.003014/Changes 2011-09-12
11:25:41.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/Changes 2013-03-01
01:57:39.000000000 +0100
@@ -1,4 +1,6 @@
Changelog for Parse::Method::Signatures
+1.003015 - 2013/03/01
+ - Don't ship MYMETA files
1.003014 - 2011/09/12
- Don't look in the stash for type names containing :: (Jesse Luehrs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Parse-Method-Signatures-1.003014/MANIFEST
new/Parse-Method-Signatures-1.003015/MANIFEST
--- old/Parse-Method-Signatures-1.003014/MANIFEST 2011-09-12
11:28:07.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/MANIFEST 2013-03-01
01:58:26.000000000 +0100
@@ -26,8 +26,6 @@
Makefile.PL
MANIFEST This list of files
META.yml
-MYMETA.json
-MYMETA.yml
t/ppi.t
t/signatures.t
t/struct.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Parse-Method-Signatures-1.003014/META.yml
new/Parse-Method-Signatures-1.003015/META.yml
--- old/Parse-Method-Signatures-1.003014/META.yml 2011-09-12
11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/META.yml 2013-03-01
01:58:20.000000000 +0100
@@ -3,16 +3,17 @@
author:
- 'Ash Berlin <[email protected]>.'
build_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
MooseX::Types::Structured: 0
Test::Differences: 0
Test::Exception: 0
Test::More: 0
aliased: 0
configure_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
distribution_type: module
-generated_by: 'Module::Install version 1.01'
+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
@@ -35,4 +36,4 @@
homepage: http://github.com/ashb/Parse-Method-Signatures/tree/master
license: http://dev.perl.org/licenses/
repository: git://github.com/ashb/Parse-Method-Signatures.git
-version: 1.003014
+version: 1.003015
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Parse-Method-Signatures-1.003014/MYMETA.json
new/Parse-Method-Signatures-1.003015/MYMETA.json
--- old/Parse-Method-Signatures-1.003014/MYMETA.json 2011-09-12
11:28:13.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/MYMETA.json 1970-01-01
01:00:00.000000000 +0100
@@ -1,62 +0,0 @@
-{
- "abstract" : "Perl6 like method signature parser",
- "author" : [
- "Ash Berlin <[email protected]>."
- ],
- "dynamic_config" : 0,
- "generated_by" : "Module::Install version 1.01, CPAN::Meta::Converter
version 2.112150",
- "license" : [
- "perl_5"
- ],
- "meta-spec" : {
- "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";,
- "version" : "2"
- },
- "name" : "Parse-Method-Signatures",
- "no_index" : {
- "directory" : [
- "inc",
- "t"
- ]
- },
- "prereqs" : {
- "build" : {
- "requires" : {
- "ExtUtils::MakeMaker" : "6.42",
- "MooseX::Types::Structured" : 0,
- "Test::Differences" : 0,
- "Test::Exception" : 0,
- "Test::More" : 0,
- "aliased" : 0
- }
- },
- "configure" : {
- "requires" : {
- "ExtUtils::MakeMaker" : "6.42"
- }
- },
- "runtime" : {
- "requires" : {
- "List::MoreUtils" : "0.20",
- "Moose" : 0,
- "MooseX::Traits" : "0.06",
- "MooseX::Types" : "0.17",
- "MooseX::Types::Moose" : 0,
- "MooseX::Types::Structured" : 0,
- "PPI" : "1.203",
- "namespace::clean" : "0.10"
- }
- }
- },
- "release_status" : "stable",
- "resources" : {
- "homepage" :
"http://github.com/ashb/Parse-Method-Signatures/tree/master";,
- "license" : [
- "http://dev.perl.org/licenses/";
- ],
- "repository" : {
- "url" : "git://github.com/ashb/Parse-Method-Signatures.git"
- }
- },
- "version" : "1.003014"
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Parse-Method-Signatures-1.003014/MYMETA.yml
new/Parse-Method-Signatures-1.003015/MYMETA.yml
--- old/Parse-Method-Signatures-1.003014/MYMETA.yml 2011-09-12
11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/MYMETA.yml 1970-01-01
01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
----
-abstract: 'Perl6 like method signature parser'
-author:
- - 'Ash Berlin <[email protected]>.'
-build_requires:
- ExtUtils::MakeMaker: 6.42
- MooseX::Types::Structured: 0
- Test::Differences: 0
- Test::Exception: 0
- Test::More: 0
- aliased: 0
-configure_requires:
- ExtUtils::MakeMaker: 6.42
-dynamic_config: 0
-generated_by: 'Module::Install version 1.01, CPAN::Meta::Converter version
2.112150'
-license: perl
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
-name: Parse-Method-Signatures
-no_index:
- directory:
- - inc
- - t
-requires:
- List::MoreUtils: 0.20
- Moose: 0
- MooseX::Traits: 0.06
- MooseX::Types: 0.17
- MooseX::Types::Moose: 0
- MooseX::Types::Structured: 0
- PPI: 1.203
- namespace::clean: 0.10
-resources:
- homepage: http://github.com/ashb/Parse-Method-Signatures/tree/master
- license: http://dev.perl.org/licenses/
- repository: git://github.com/ashb/Parse-Method-Signatures.git
-version: 1.003013
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/inc/Module/AutoInstall.pm
new/Parse-Method-Signatures-1.003015/inc/Module/AutoInstall.pm
--- old/Parse-Method-Signatures-1.003014/inc/Module/AutoInstall.pm
2011-09-12 11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/inc/Module/AutoInstall.pm
2013-03-01 01:58:19.000000000 +0100
@@ -3,11 +3,12 @@
use strict;
use Cwd ();
+use File::Spec ();
use ExtUtils::MakeMaker ();
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.03';
+ $VERSION = '1.06';
}
# special map on pre-defined feature sets
@@ -17,11 +18,14 @@
);
# various lexical flags
-my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS );
+my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $InstallDepsTarget,
$HasCPANPLUS );
my (
- $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps
+ $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps,
+ $UpgradeDeps
);
-my ( $PostambleActions, $PostambleUsed );
+my ( $PostambleActions, $PostambleActionsNoTest, $PostambleActionsUpgradeDeps,
+ $PostambleActionsUpgradeDepsNoTest, $PostambleActionsListDeps,
+ $PostambleActionsListAllDeps, $PostambleUsed, $NoTest);
# See if it's a testing or non-interactive session
_accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN );
@@ -31,6 +35,10 @@
$AcceptDefault = shift;
}
+sub _installdeps_target {
+ $InstallDepsTarget = shift;
+}
+
sub missing_modules {
return @Missing;
}
@@ -63,6 +71,11 @@
__PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
exit 0;
}
+ elsif ( $arg =~ /^--upgradedeps=(.*)$/ ) {
+ $UpgradeDeps = 1;
+ __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
+ exit 0;
+ }
elsif ( $arg =~ /^--default(?:deps)?$/ ) {
$AcceptDefault = 1;
}
@@ -125,7 +138,7 @@
# check entirely since we don't want to have to load (and configure)
# an old CPAN just for a cosmetic message
- $UnderCPAN = _check_lock(1) unless $SkipInstall;
+ $UnderCPAN = _check_lock(1) unless $SkipInstall || $InstallDepsTarget;
while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
my ( @required, @tests, @skiptests );
@@ -175,7 +188,7 @@
}
# XXX: check for conflicts and uninstalls(!) them.
- my $cur = _load($mod);
+ my $cur = _version_of($mod);
if (_version_cmp ($cur, $arg) >= 0)
{
print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
@@ -207,6 +220,7 @@
$CheckOnly
or ($mandatory and $UnderCPAN)
or $AllDeps
+ or $InstallDepsTarget
or _prompt(
qq{==> Auto-install the }
. ( @required / 2 )
@@ -237,10 +251,17 @@
}
}
- if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
+ if ( @Missing and not( $CheckOnly or $UnderCPAN) ) {
require Config;
- print
-"*** Dependencies will be installed the next time you type
'$Config::Config{make}'.\n";
+ my $make = $Config::Config{make};
+ if ($InstallDepsTarget) {
+ print
+"*** To install dependencies type '$make installdeps' or '$make
installdeps_notest'.\n";
+ }
+ else {
+ print
+"*** Dependencies will be installed the next time you type '$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"
@@ -271,6 +292,10 @@
sub _check_lock {
return unless @Missing or @_;
+ if ($ENV{PERL5_CPANM_IS_RUNNING}) {
+ return _running_under('cpanminus');
+ }
+
my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING};
if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
@@ -324,7 +349,7 @@
while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
# grep out those already installed
- if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
+ if ( _version_cmp( _version_of($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
else {
@@ -332,6 +357,11 @@
}
}
+ if ($UpgradeDeps) {
+ push @modules, @installed;
+ @installed = ();
+ }
+
return @installed unless @modules; # nothing to do
return @installed if _check_lock(); # defer to the CPAN shell
@@ -363,7 +393,7 @@
# see if we have successfully installed them
while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
- if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
+ if ( _version_cmp( _version_of($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) )
{
@@ -463,6 +493,11 @@
} else {
die "*** Cannot convert option $key = '$value'
to CPANPLUS version.\n";
}
+ push @config, 'prereqs', $value;
+ } elsif ( $key eq 'force' ) {
+ push @config, $key, $value;
+ } elsif ( $key eq 'notest' ) {
+ push @config, 'skiptest', $value;
} else {
die "*** Cannot convert option $key to CPANPLUS
version.\n";
}
@@ -497,10 +532,14 @@
# set additional options
while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) {
( $args{$opt} = $arg, next )
- if $opt =~ /^force$/; # pseudo-option
+ if $opt =~ /^(?:force|notest)$/; # pseudo-option
$CPAN::Config->{$opt} = $arg;
}
+ if ($args{notest} && (not CPAN::Shell->can('notest'))) {
+ die "Your version of CPAN is too old to support the 'notest' pragma";
+ }
+
local $CPAN::Config->{prerequisites_policy} = 'follow';
while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
@@ -519,8 +558,16 @@
delete $INC{$inc};
}
- my $rv = $args{force} ? CPAN::Shell->force( install => $pkg )
- : CPAN::Shell->install($pkg);
+ my $rv = do {
+ if ($args{force}) {
+ CPAN::Shell->force( install => $pkg )
+ } elsif ($args{notest}) {
+ CPAN::Shell->notest( install => $pkg )
+ } else {
+ CPAN::Shell->install($pkg)
+ }
+ };
+
$rv ||= eval {
$CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
->{install}
@@ -575,7 +622,7 @@
my $ver = shift;
return
- if _version_cmp( _load($class), $ver ) >= 0; # no need to upgrade
+ if _version_cmp( _version_of($class), $ver ) >= 0; # no need to upgrade
if (
_prompt( "==> A newer version of $class ($ver) is required. Install?",
@@ -660,16 +707,30 @@
# load a module and return the version it reports
sub _load {
- my $mod = pop; # class/instance doesn't matter
+ my $mod = pop; # method/function doesn't matter
my $file = $mod;
-
$file =~ s|::|/|g;
$file .= '.pm';
-
local $@;
return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 );
}
+# report version without loading a module
+sub _version_of {
+ my $mod = pop; # method/function doesn't matter
+ my $file = $mod;
+ $file =~ s|::|/|g;
+ $file .= '.pm';
+ foreach my $dir ( @INC ) {
+ next if ref $dir;
+ my $path = File::Spec->catfile($dir, $file);
+ next unless -e $path;
+ require ExtUtils::MM_Unix;
+ return ExtUtils::MM_Unix->parse_version($path);
+ }
+ return undef;
+}
+
# Load CPAN.pm and it's configuration
sub _load_cpan {
return if $CPAN::VERSION and $CPAN::Config and not @_;
@@ -763,6 +824,35 @@
: "\$(NOECHO) \$(NOOP)"
);
+ my $deps_list = join( ',', @Missing, @Existing );
+
+ $PostambleActionsUpgradeDeps =
+ "\$(PERL) $0 --config=$config --upgradedeps=$deps_list";
+
+ my $config_notest =
+ join( ',', (UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config}),
+ 'notest', 1 )
+ if $Config;
+
+ $PostambleActionsNoTest = (
+ ($missing and not $UnderCPAN)
+ ? "\$(PERL) $0 --config=$config_notest --installdeps=$missing"
+ : "\$(NOECHO) \$(NOOP)"
+ );
+
+ $PostambleActionsUpgradeDepsNoTest =
+ "\$(PERL) $0 --config=$config_notest --upgradedeps=$deps_list";
+
+ $PostambleActionsListDeps =
+ '@$(PERL) -le "print for @ARGV" '
+ . join(' ', map $Missing[$_], grep $_ % 2 == 0, 0..$#Missing);
+
+ my @all = (@Missing, @Existing);
+
+ $PostambleActionsListAllDeps =
+ '@$(PERL) -le "print for @ARGV" '
+ . join(' ', map $all[$_], grep $_ % 2 == 0, 0..$#all);
+
return %args;
}
@@ -797,11 +887,15 @@
sub postamble {
$PostambleUsed = 1;
+ my $fragment;
- return <<"END_MAKE";
+ $fragment .= <<"AUTO_INSTALL" if !$InstallDepsTarget;
config :: installdeps
\t\$(NOECHO) \$(NOOP)
+AUTO_INSTALL
+
+ $fragment .= <<"END_MAKE";
checkdeps ::
\t\$(PERL) $0 --checkdeps
@@ -809,12 +903,28 @@
installdeps ::
\t$PostambleActions
+installdeps_notest ::
+\t$PostambleActionsNoTest
+
+upgradedeps ::
+\t$PostambleActionsUpgradeDeps
+
+upgradedeps_notest ::
+\t$PostambleActionsUpgradeDepsNoTest
+
+listdeps ::
+\t$PostambleActionsListDeps
+
+listalldeps ::
+\t$PostambleActionsListAllDeps
+
END_MAKE
+ return $fragment;
}
1;
__END__
-#line 1071
+#line 1193
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/inc/Module/Install/AutoInstall.pm
new/Parse-Method-Signatures-1.003015/inc/Module/Install/AutoInstall.pm
--- old/Parse-Method-Signatures-1.003014/inc/Module/Install/AutoInstall.pm
2011-09-12 11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/inc/Module/Install/AutoInstall.pm
2013-03-01 01:58:19.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -73,6 +73,17 @@
);
}
+sub installdeps_target {
+ my ($self, @args) = @_;
+
+ $self->include('Module::AutoInstall');
+ require Module::AutoInstall;
+
+ Module::AutoInstall::_installdeps_target(1);
+
+ $self->auto_install(@args);
+}
+
sub auto_install_now {
my $self = shift;
$self->auto_install(@_);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/inc/Module/Install/Base.pm
new/Parse-Method-Signatures-1.003015/inc/Module/Install/Base.pm
--- old/Parse-Method-Signatures-1.003014/inc/Module/Install/Base.pm
2011-09-12 11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/inc/Module/Install/Base.pm
2013-03-01 01:58:19.000000000 +0100
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
}
# Suspend handler for "redefined" warnings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/inc/Module/Install/Can.pm
new/Parse-Method-Signatures-1.003015/inc/Module/Install/Can.pm
--- old/Parse-Method-Signatures-1.003014/inc/Module/Install/Can.pm
2011-09-12 11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/inc/Module/Install/Can.pm
2013-03-01 01:58:19.000000000 +0100
@@ -3,13 +3,12 @@
use strict;
use Config ();
-use File::Spec ();
use ExtUtils::MakeMaker ();
use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -29,7 +28,7 @@
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) = @_;
@@ -38,14 +37,88 @@
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
next if $dir eq '';
- my $abs = File::Spec->catfile($dir, $_[1]);
+ require File::Spec;
+ my $abs = File::Spec->catfile($dir, $cmd);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
return;
}
-# can we locate a (the) C compiler
+# 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;
@@ -78,4 +151,4 @@
__END__
-#line 156
+#line 236
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/inc/Module/Install/Fetch.pm
new/Parse-Method-Signatures-1.003015/inc/Module/Install/Fetch.pm
--- old/Parse-Method-Signatures-1.003014/inc/Module/Install/Fetch.pm
2011-09-12 11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/inc/Module/Install/Fetch.pm
2013-03-01 01:58:19.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/inc/Module/Install/Include.pm
new/Parse-Method-Signatures-1.003015/inc/Module/Install/Include.pm
--- old/Parse-Method-Signatures-1.003014/inc/Module/Install/Include.pm
2011-09-12 11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/inc/Module/Install/Include.pm
2013-03-01 01:58:19.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/inc/Module/Install/Makefile.pm
new/Parse-Method-Signatures-1.003015/inc/Module/Install/Makefile.pm
--- old/Parse-Method-Signatures-1.003014/inc/Module/Install/Makefile.pm
2011-09-12 11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/inc/Module/Install/Makefile.pm
2013-03-01 01:58:19.000000000 +0100
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -215,18 +215,22 @@
require ExtUtils::MakeMaker;
if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
- # MakeMaker can complain about module versions that include
- # an underscore, even though its own version may contain one!
- # Hence the funny regexp to get rid of it. See RT #35800
- # for details.
- my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
- $self->build_requires( 'ExtUtils::MakeMaker' => $v );
- $self->configure_requires( 'ExtUtils::MakeMaker' => $v );
+ # 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.42 );
- $self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 );
}
# Generate the MakeMaker params
@@ -241,7 +245,6 @@
'all_from' if you prefer) in Makefile.PL.
EOT
- $DB::single = 1;
if ( $self->tests ) {
my @tests = split ' ', $self->tests;
my %seen;
@@ -412,4 +415,4 @@
__END__
-#line 541
+#line 544
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/inc/Module/Install/Metadata.pm
new/Parse-Method-Signatures-1.003015/inc/Module/Install/Metadata.pm
--- old/Parse-Method-Signatures-1.003014/inc/Module/Install/Metadata.pm
2011-09-12 11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/inc/Module/Install/Metadata.pm
2013-03-01 01:58:19.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -151,15 +151,21 @@
sub install_as_vendor { $_[0]->installdirs('vendor') }
sub dynamic_config {
- my $self = shift;
- unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to
dynamic_config\n";
- return $self;
+ 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} = $_[0] ? 1 : 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 @_;
@@ -170,7 +176,7 @@
# Normalize the version
$version = $self->_perl_version($version);
- # We don't support the reall old versions
+ # 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";
}
@@ -582,7 +588,7 @@
sub requires_from {
my $self = shift;
my $content = Module::Install::_readperl($_[0]);
- my @requires = $content =~
m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+ my @requires = $content =~
m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg;
while ( @requires ) {
my $module = shift @requires;
my $version = shift @requires;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/inc/Module/Install/Win32.pm
new/Parse-Method-Signatures-1.003015/inc/Module/Install/Win32.pm
--- old/Parse-Method-Signatures-1.003014/inc/Module/Install/Win32.pm
2011-09-12 11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/inc/Module/Install/Win32.pm
2013-03-01 01:58:19.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/inc/Module/Install/WriteAll.pm
new/Parse-Method-Signatures-1.003015/inc/Module/Install/WriteAll.pm
--- old/Parse-Method-Signatures-1.003014/inc/Module/Install/WriteAll.pm
2011-09-12 11:27:52.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/inc/Module/Install/WriteAll.pm
2013-03-01 01:58:19.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/inc/Module/Install.pm
new/Parse-Method-Signatures-1.003015/inc/Module/Install.pm
--- old/Parse-Method-Signatures-1.003014/inc/Module/Install.pm 2011-09-12
11:27:51.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/inc/Module/Install.pm 2013-03-01
01:58:19.000000000 +0100
@@ -31,7 +31,7 @@
# 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.01';
+ $VERSION = '1.06';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -451,7 +451,7 @@
}
sub _cmp ($$) {
- _version($_[0]) <=> _version($_[1]);
+ _version($_[1]) <=> _version($_[2]);
}
# Cloned from Params::Util::_CLASS
@@ -467,4 +467,4 @@
1;
-# Copyright 2008 - 2011 Adam Kennedy.
+# Copyright 2008 - 2012 Adam Kennedy.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Parse-Method-Signatures-1.003014/lib/Parse/Method/Signatures.pm
new/Parse-Method-Signatures-1.003015/lib/Parse/Method/Signatures.pm
--- old/Parse-Method-Signatures-1.003014/lib/Parse/Method/Signatures.pm
2011-09-09 19:34:34.000000000 +0200
+++ new/Parse-Method-Signatures-1.003015/lib/Parse/Method/Signatures.pm
2013-03-01 01:56:21.000000000 +0100
@@ -15,7 +15,7 @@
use Carp qw/croak/;
use namespace::clean -except => 'meta';
-our $VERSION = '1.003014';
+our $VERSION = '1.003015';
our $ERROR_LEVEL = 0;
our %LEXTABLE;
our $DEBUG = $ENV{PMS_DEBUG} || 0;
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
