[Bps-public-commit] r18395 - in Shipwright/trunk: inc/Module inc/Module/Install
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Fri Feb 13 23:35:40 EST 2009
Author: sunnavy
Date: Fri Feb 13 23:35:40 2009
New Revision: 18395
Added:
Shipwright/trunk/inc/Module/Install/Scripts.pm
Modified:
Shipwright/trunk/ (props changed)
Shipwright/trunk/META.yml
Shipwright/trunk/inc/Module/Install.pm
Shipwright/trunk/inc/Module/Install/AutoInstall.pm
Shipwright/trunk/inc/Module/Install/Base.pm
Shipwright/trunk/inc/Module/Install/Can.pm
Shipwright/trunk/inc/Module/Install/Fetch.pm
Shipwright/trunk/inc/Module/Install/Include.pm
Shipwright/trunk/inc/Module/Install/Makefile.pm
Shipwright/trunk/inc/Module/Install/Metadata.pm
Shipwright/trunk/inc/Module/Install/Share.pm
Shipwright/trunk/inc/Module/Install/Win32.pm
Shipwright/trunk/inc/Module/Install/WriteAll.pm
Log:
r19852 at sunnavys-mb: sunnavy | 2009-02-14 12:32:15 +0800
updated Module::Install version to 0.79
Modified: Shipwright/trunk/META.yml
==============================================================================
--- Shipwright/trunk/META.yml (original)
+++ Shipwright/trunk/META.yml Fri Feb 13 23:35:40 2009
@@ -7,7 +7,7 @@
IPC::Cmd: 0
Module::Build: 0
distribution_type: module
-generated_by: 'Module::Install version 0.77'
+generated_by: 'Module::Install version 0.79'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -15,10 +15,9 @@
name: Shipwright
no_index:
directory:
- - t
- - docs
- - share
- inc
+ - share
+ - t
requires:
Algorithm::Dependency::Ordered: 0
Algorithm::Dependency::Source::HoA: 0
Modified: Shipwright/trunk/inc/Module/Install.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install.pm (original)
+++ Shipwright/trunk/inc/Module/Install.pm Fri Feb 13 23:35:40 2009
@@ -30,7 +30,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 = '0.77';
+ $VERSION = '0.79';
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
@@ -250,7 +250,7 @@
sub load_extensions {
my ($self, $path, $top) = @_;
- unless ( grep { lc $_ eq lc $self->{prefix} } @INC ) {
+ unless ( grep { !ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
unshift @INC, $self->{prefix};
}
@@ -366,4 +366,4 @@
1;
-# Copyright 2008 Adam Kennedy.
+# Copyright 2008 - 2009 Adam Kennedy.
Modified: Shipwright/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ Shipwright/trunk/inc/Module/Install/AutoInstall.pm Fri Feb 13 23:35:40 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: Shipwright/trunk/inc/Module/Install/Base.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Base.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Base.pm Fri Feb 13 23:35:40 2009
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.77';
+$VERSION = '0.79';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: Shipwright/trunk/inc/Module/Install/Can.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Can.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Can.pm Fri Feb 13 23:35:40 2009
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: Shipwright/trunk/inc/Module/Install/Fetch.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Fetch.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Fetch.pm Fri Feb 13 23:35:40 2009
@@ -6,20 +6,20 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
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 } ) {
$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;
}
Modified: Shipwright/trunk/inc/Module/Install/Include.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Include.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Include.pm Fri Feb 13 23:35:40 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: Shipwright/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Makefile.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Makefile.pm Fri Feb 13 23:35:40 2009
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -64,7 +64,7 @@
my $self = shift;
my $clean = $self->makemaker_args->{clean} ||= {};
%$clean = (
- %$clean,
+ %$clean,
FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_),
);
}
@@ -73,7 +73,7 @@
my $self = shift;
my $realclean = $self->makemaker_args->{realclean} ||= {};
%$realclean = (
- %$realclean,
+ %$realclean,
FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_),
);
}
@@ -124,7 +124,7 @@
$self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
- # Generate the
+ # Generate the
my $args = $self->makemaker_args;
$args->{DISTNAME} = $self->name;
$args->{NAME} = $self->module_name || $self->name;
@@ -196,7 +196,7 @@
my $top_class = ref($self->_top) || '';
my $top_version = $self->_top->VERSION || '';
- my $preamble = $self->preamble
+ my $preamble = $self->preamble
? "# Preamble by $top_class $top_version\n"
. $self->preamble
: '';
Modified: Shipwright/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Metadata.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Metadata.pm Fri Feb 13 23:35:40 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -176,18 +176,15 @@
"Did not provide a value to perl_version()"
);
- # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
- # numbers (eg, 5.006001 or 5.008009).
+ # Normalize the version
+ $version = $self->_perl_version($version);
- $version =~ s/^(\d+)\.(\d+)\.(\d+)$/sprintf("%d.%03d%03d",$1,$2,$3)/e;
-
- $version =~ s/_.+$//;
- $version = $version + 0; # Numify
+ # We don't support the reall old versions
unless ( $version >= 5.005 ) {
die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
}
+
$self->{values}{perl_version} = $version;
- return 1;
}
sub license {
@@ -451,9 +448,6 @@
while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
$pattern =~ s{\s+}{\\s+}g;
if ( $license_text =~ /\b$pattern\b/i ) {
- if ( $osi and $license_text =~ /All rights reserved/i ) {
- print "WARNING: 'All rights reserved' in copyright may invalidate Open Source license.\n";
- }
$self->license($license);
return 1;
}
@@ -482,19 +476,70 @@
return 1;
}
-sub install_script {
+# 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) ) {
+ $v = $v + 0; # Numify
+ }
+ return $v;
+}
+
+
+
+
+
+######################################################################
+# MYMETA.yml Support
+
+sub WriteMyMeta {
+ $_[0]->write_mymeta;
+}
+
+sub write_mymeta {
my $self = shift;
- my $args = $self->makemaker_args;
- my $exe = $args->{EXE_FILES} ||= [];
- foreach ( @_ ) {
- if ( -f $_ ) {
- push @$exe, $_;
- } elsif ( -d 'script' and -f "script/$_" ) {
- push @$exe, "script/$_";
- } else {
- die("Cannot find script '$_'");
+
+ # If there's no existing META.yml there is nothing we can do
+ return unless -f 'META.yml';
+
+ # 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
+ require YAML::Tiny;
+ my @yaml = YAML::Tiny::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} } };
+ }
+
+ # Save as the MYMETA.yml file
+ YAML::Tiny::DumpFile('MYMETA.yml', $meta);
}
1;
Added: Shipwright/trunk/inc/Module/Install/Scripts.pm
==============================================================================
--- (empty file)
+++ Shipwright/trunk/inc/Module/Install/Scripts.pm Fri Feb 13 23:35:40 2009
@@ -0,0 +1,29 @@
+#line 1
+package Module::Install::Scripts;
+
+use strict 'vars';
+use Module::Install::Base;
+
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+ $VERSION = '0.79';
+ $ISCORE = 1;
+ @ISA = qw{Module::Install::Base};
+}
+
+sub install_script {
+ my $self = shift;
+ my $args = $self->makemaker_args;
+ my $exe = $args->{EXE_FILES} ||= [];
+ foreach ( @_ ) {
+ if ( -f $_ ) {
+ push @$exe, $_;
+ } elsif ( -d 'script' and -f "script/$_" ) {
+ push @$exe, "script/$_";
+ } else {
+ die("Cannot find script '$_'");
+ }
+ }
+}
+
+1;
Modified: Shipwright/trunk/inc/Module/Install/Share.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Share.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Share.pm Fri Feb 13 23:35:40 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: Shipwright/trunk/inc/Module/Install/Win32.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Win32.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Win32.pm Fri Feb 13 23:35:40 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: Shipwright/trunk/inc/Module/Install/WriteAll.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/WriteAll.pm (original)
+++ Shipwright/trunk/inc/Module/Install/WriteAll.pm Fri Feb 13 23:35:40 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.79';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
More information about the Bps-public-commit
mailing list