[Bps-public-commit] r17752 - in RTFM-Extension-ArticleTemplate: . inc inc/Module
falcone at bestpractical.com
falcone at bestpractical.com
Thu Jan 15 11:58:40 EST 2009
Author: falcone
Date: Thu Jan 15 11:58:39 2009
New Revision: 17752
Modified:
RTFM-Extension-ArticleTemplate/ (props changed)
RTFM-Extension-ArticleTemplate/inc/ (props changed)
RTFM-Extension-ArticleTemplate/inc/Module/Install.pm
RTFM-Extension-ArticleTemplate/inc/Module/Install/AutoInstall.pm
RTFM-Extension-ArticleTemplate/inc/Module/Install/Base.pm
RTFM-Extension-ArticleTemplate/inc/Module/Install/Can.pm
RTFM-Extension-ArticleTemplate/inc/Module/Install/Fetch.pm
RTFM-Extension-ArticleTemplate/inc/Module/Install/Include.pm
RTFM-Extension-ArticleTemplate/inc/Module/Install/Makefile.pm
RTFM-Extension-ArticleTemplate/inc/Module/Install/Metadata.pm
RTFM-Extension-ArticleTemplate/inc/Module/Install/RTx.pm
RTFM-Extension-ArticleTemplate/inc/Module/Install/Win32.pm
RTFM-Extension-ArticleTemplate/inc/Module/Install/WriteAll.pm
Log:
r43476 at ketch: falcone | 2009-01-15 11:52:12 -0500
* upgrade Module::Install::RTx
Modified: RTFM-Extension-ArticleTemplate/inc/Module/Install.pm
==============================================================================
--- RTFM-Extension-ArticleTemplate/inc/Module/Install.pm (original)
+++ RTFM-Extension-ArticleTemplate/inc/Module/Install.pm Thu Jan 15 11:58:39 2009
@@ -30,11 +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';
-
- *inc::Module::Install::VERSION = *VERSION;
- @inc::Module::Install::ISA = __PACKAGE__;
-
+ $VERSION = '0.70';
}
@@ -85,7 +81,7 @@
# 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" }
+if ( $0 =~ /Build.PL$/i or -f 'Build.PL' ) { die <<"END_DIE" }
Module::Install no longer supports Build.PL.
@@ -99,20 +95,14 @@
-# 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));
-
-
-
-
-
use Cwd ();
use File::Find ();
use File::Path ();
use FindBin;
+*inc::Module::Install::VERSION = *VERSION;
+ at inc::Module::Install::ISA = __PACKAGE__;
+
sub autoload {
my $self = shift;
my $who = $self->_caller;
@@ -125,10 +115,8 @@
goto &$code unless $cwd eq $pwd;
}
$$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
- unless ( uc($1) eq $1 ) {
- unshift @_, ( $self, $1 );
- goto &{$self->can('call')};
- }
+ unshift @_, ( $self, $1 );
+ goto &{$self->can('call')} unless uc($1) eq $1;
};
}
@@ -157,7 +145,8 @@
}
sub preload {
- my $self = shift;
+ my ($self) = @_;
+
unless ( $self->{extensions} ) {
$self->load_extensions(
"$self->{prefix}/$self->{path}", $self
@@ -213,7 +202,6 @@
$args{path} =~ s!::!/!g;
}
$args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm";
- $args{wrote} = 0;
bless( \%args, $class );
}
@@ -289,9 +277,9 @@
# 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 ) {
+ open PKGFILE, "<$subpath.pm" or die "find_extensions: Can't open $subpath.pm: $!";
+ my $in_pod = 0;
+ while ( <PKGFILE> ) {
$in_pod = 1 if /^=\w/;
$in_pod = 0 if /^=cut/;
next if ($in_pod || /^=cut/); # skip pod text
@@ -301,6 +289,7 @@
last;
}
}
+ close PKGFILE;
}
push @found, [ $file, $pkg ];
@@ -309,13 +298,6 @@
@found;
}
-
-
-
-
-#####################################################################
-# Utility Functions
-
sub _caller {
my $depth = 0;
my $call = caller($depth);
@@ -326,44 +308,6 @@
return $call;
}
-sub _read {
- local *FH;
- open FH, "< $_[0]" or die "open($_[0]): $!";
- my $str = do { local $/; <FH> };
- close FH or die "close($_[0]): $!";
- return $str;
-}
-
-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]): $!";
-}
-
-# _version is for processing module versions (eg, 1.03_05) not
-# Perl versions (eg, 5.8.1).
-
-sub _version ($) {
- my $s = shift || 0;
- $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;
-}
-
-# Cloned from Params::Util::_CLASS
-sub _CLASS ($) {
- (
- defined $_[0]
- and
- ! ref $_[0]
- and
- $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*$/s
- ) ? $_[0] : undef;
-}
-
1;
# Copyright 2008 Adam Kennedy.
Modified: RTFM-Extension-ArticleTemplate/inc/Module/Install/AutoInstall.pm
==============================================================================
--- RTFM-Extension-ArticleTemplate/inc/Module/Install/AutoInstall.pm (original)
+++ RTFM-Extension-ArticleTemplate/inc/Module/Install/AutoInstall.pm Thu Jan 15 11:58:39 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: RTFM-Extension-ArticleTemplate/inc/Module/Install/Base.pm
==============================================================================
--- RTFM-Extension-ArticleTemplate/inc/Module/Install/Base.pm (original)
+++ RTFM-Extension-ArticleTemplate/inc/Module/Install/Base.pm Thu Jan 15 11:58:39 2009
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.77';
+$VERSION = '0.70';
# Suspend handler for "redefined" warnings
BEGIN {
@@ -45,8 +45,6 @@
$_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
}
-#line 101
-
sub is_admin {
$_[0]->admin->VERSION;
}
@@ -69,4 +67,4 @@
1;
-#line 146
+#line 138
Modified: RTFM-Extension-ArticleTemplate/inc/Module/Install/Can.pm
==============================================================================
--- RTFM-Extension-ArticleTemplate/inc/Module/Install/Can.pm (original)
+++ RTFM-Extension-ArticleTemplate/inc/Module/Install/Can.pm Thu Jan 15 11:58:39 2009
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.70';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -39,7 +39,6 @@
return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
- next if $dir eq '';
my $abs = File::Spec->catfile($dir, $_[1]);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
@@ -80,4 +79,4 @@
__END__
-#line 158
+#line 157
Modified: RTFM-Extension-ArticleTemplate/inc/Module/Install/Fetch.pm
==============================================================================
--- RTFM-Extension-ArticleTemplate/inc/Module/Install/Fetch.pm (original)
+++ RTFM-Extension-ArticleTemplate/inc/Module/Install/Fetch.pm Thu Jan 15 11:58:39 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.70';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: RTFM-Extension-ArticleTemplate/inc/Module/Install/Include.pm
==============================================================================
--- RTFM-Extension-ArticleTemplate/inc/Module/Install/Include.pm (original)
+++ RTFM-Extension-ArticleTemplate/inc/Module/Install/Include.pm Thu Jan 15 11:58:39 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.70';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: RTFM-Extension-ArticleTemplate/inc/Module/Install/Makefile.pm
==============================================================================
--- RTFM-Extension-ArticleTemplate/inc/Module/Install/Makefile.pm (original)
+++ RTFM-Extension-ArticleTemplate/inc/Module/Install/Makefile.pm Thu Jan 15 11:58:39 2009
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.70';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -36,9 +36,9 @@
sub makemaker_args {
my $self = shift;
- my $args = ( $self->{makemaker_args} ||= {} );
- %$args = ( %$args, @_ );
- return $args;
+ my $args = ($self->{makemaker_args} ||= {});
+ %$args = ( %$args, @_ ) if @_;
+ $args;
}
# For mm args that take multiple space-seperated args,
@@ -63,18 +63,18 @@
sub clean_files {
my $self = shift;
my $clean = $self->makemaker_args->{clean} ||= {};
- %$clean = (
+ %$clean = (
%$clean,
- FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_),
+ FILES => join(' ', grep length, $clean->{FILES}, @_),
);
}
sub realclean_files {
- my $self = shift;
+ my $self = shift;
my $realclean = $self->makemaker_args->{realclean} ||= {};
- %$realclean = (
+ %$realclean = (
%$realclean,
- FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_),
+ FILES => join(' ', grep length, $realclean->{FILES}, @_),
);
}
@@ -116,19 +116,13 @@
# Make sure we have a new enough
require ExtUtils::MakeMaker;
-
- # 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.
-
- $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION );
# Generate the
my $args = $self->makemaker_args;
$args->{DISTNAME} = $self->name;
- $args->{NAME} = $self->module_name || $self->name;
- $args->{VERSION} = $self->version;
+ $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args);
+ $args->{VERSION} = $self->version || $self->determine_VERSION($args);
$args->{NAME} =~ s/-/::/g;
if ( $self->tests ) {
$args->{test} = { TESTS => $self->tests };
@@ -181,9 +175,7 @@
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};
- }
+ $args{dist} = $preop;
}
my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
@@ -250,4 +242,4 @@
__END__
-#line 379
+#line 371
Modified: RTFM-Extension-ArticleTemplate/inc/Module/Install/Metadata.pm
==============================================================================
--- RTFM-Extension-ArticleTemplate/inc/Module/Install/Metadata.pm (original)
+++ RTFM-Extension-ArticleTemplate/inc/Module/Install/Metadata.pm Thu Jan 15 11:58:39 2009
@@ -6,43 +6,25 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.70';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
my @scalar_keys = qw{
- name
- module_name
- abstract
- author
- version
- distribution_type
- tests
- installdirs
+ name module_name abstract author version license
+ distribution_type perl_version tests installdirs
};
my @tuple_keys = qw{
- configure_requires
- build_requires
- requires
- recommends
- bundles
- resources
+ configure_requires build_requires requires recommends bundles
};
-my @resource_keys = qw{
- homepage
- bugtracker
- repository
-};
-
-sub Meta { shift }
-sub Meta_ScalarKeys { @scalar_keys }
-sub Meta_TupleKeys { @tuple_keys }
-sub Meta_ResourceKeys { @resource_keys }
+sub Meta { shift }
+sub Meta_ScalarKeys { @scalar_keys }
+sub Meta_TupleKeys { @tuple_keys }
-foreach my $key ( @scalar_keys ) {
+foreach my $key (@scalar_keys) {
*$key = sub {
my $self = shift;
return $self->{values}{$key} if defined wantarray and !@_;
@@ -51,100 +33,33 @@
};
}
-foreach my $key ( @resource_keys ) {
+foreach my $key (@tuple_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;
- };
-}
-
-sub requires {
- my $self = shift;
- while ( @_ ) {
- my $module = shift or last;
- my $version = shift || 0;
- push @{ $self->{values}{requires} }, [ $module, $version ];
- }
- $self->{values}{requires};
-}
-
-sub build_requires {
- my $self = shift;
- while ( @_ ) {
- my $module = shift or last;
- my $version = shift || 0;
- push @{ $self->{values}{build_requires} }, [ $module, $version ];
- }
- $self->{values}{build_requires};
-}
-
-sub configure_requires {
- my $self = shift;
- while ( @_ ) {
- my $module = shift or last;
- my $version = shift || 0;
- push @{ $self->{values}{configure_requires} }, [ $module, $version ];
- }
- $self->{values}{configure_requires};
-}
-
-sub recommends {
- my $self = shift;
- while ( @_ ) {
- my $module = shift or last;
- my $version = shift || 0;
- push @{ $self->{values}{recommends} }, [ $module, $version ];
- }
- $self->{values}{recommends};
-}
-
-sub bundles {
- my $self = shift;
- while ( @_ ) {
- my $module = shift or last;
- my $version = shift || 0;
- push @{ $self->{values}{bundles} }, [ $module, $version ];
- }
- $self->{values}{bundles};
-}
-
-# Resource handling
-my %lc_resource = map { $_ => 1 } qw{
- homepage
- license
- bugtracker
- repository
-};
+ return $self->{values}{$key} unless @_;
-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'");
+ 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 @rv, $rv;
}
- $self->{values}{resources} ||= [];
- push @{ $self->{values}{resources} }, [ $name, $value ];
- }
- $self->{values}{resources};
+ push @{ $self->{values}{$key} }, @rv;
+ @rv;
+ };
}
# 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(@_) }
+sub test_requires { shift->build_requires(@_) }
+sub install_requires { shift->build_requires(@_) }
# Aliases for installdirs options
sub install_as_core { $_[0]->installdirs('perl') }
@@ -154,90 +69,45 @@
sub sign {
my $self = shift;
- return $self->{values}{sign} if defined wantarray and ! @_;
- $self->{values}{sign} = ( @_ ? $_[0] : 1 );
+ return $self->{'values'}{'sign'} if defined wantarray and ! @_;
+ $self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 );
return $self;
}
sub dynamic_config {
my $self = shift;
unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to dynamic_config\n";
+ warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n";
return $self;
}
- $self->{values}{dynamic_config} = $_[0] ? 1 : 0;
- return 1;
-}
-
-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()"
- );
-
- # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
- # numbers (eg, 5.006001 or 5.008009).
-
- $version =~ s/^(\d+)\.(\d+)\.(\d+)$/sprintf("%d.%03d%03d",$1,$2,$3)/e;
-
- $version =~ s/_.+$//;
- $version = $version + 0; # Numify
- 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 {
- my $self = shift;
- return $self->{values}{license} unless @_;
- my $license = shift or die(
- 'Did not provide a value to license()'
- );
- $self->{values}{license} = $license;
-
- # Automatically fill in license URLs
- if ( $license eq 'perl' ) {
- $self->resources( license => 'http://dev.perl.org/licenses/' );
- }
-
- return 1;
+ $self->{'values'}{'dynamic_config'} = $_[0] ? 1 : 0;
+ return $self;
}
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"
- );
+ 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");
- }
+ die "all_from: cannot find $file from $name" unless -e $file;
}
- unless ( -f $file ) {
- die("The path '$file' does not exist, or is not a 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;
+ # The remaining probes read from POD sections; if the file
+ # has an accompanying .pod, use that instead
+ my $pod = $file;
+ if ( $pod =~ s/\.pm$/.pod/i and -e $pod ) {
+ $file = $pod;
+ }
+
+ $self->author_from($file) unless $self->author;
+ $self->license_from($file) unless $self->license;
+ $self->abstract_from($file) unless $self->abstract;
}
sub provides {
@@ -299,8 +169,8 @@
while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
$self->feature( $name, @$mods );
}
- return $self->{values}{features}
- ? @{ $self->{values}{features} }
+ return $self->{values}->{features}
+ ? @{ $self->{values}->{features} }
: ();
}
@@ -313,10 +183,10 @@
sub read {
my $self = shift;
- $self->include_deps( 'YAML::Tiny', 0 );
+ $self->include_deps( 'YAML', 0 );
- require YAML::Tiny;
- my $data = YAML::Tiny::LoadFile('META.yml');
+ 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 ) {
@@ -356,51 +226,35 @@
);
}
-# 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 _slurp {
+ local *FH;
+ open FH, "< $_[1]" or die "Cannot open $_[1].pod: $!";
+ do { local $/; <FH> };
}
sub perl_version_from {
- my $self = shift;
+ my ( $self, $file ) = @_;
if (
- Module::Install::_read($_[0]) =~ m/
+ $self->_slurp($file) =~ m/
^
- (?:use|require) \s*
+ use \s*
v?
([\d_\.]+)
\s* ;
/ixms
) {
- my $perl_version = $1;
- $perl_version =~ s{_}{}g;
- $self->perl_version($perl_version);
+ my $v = $1;
+ $v =~ s{_}{}g;
+ $self->perl_version($1);
} else {
- warn "Cannot determine perl version info from $_[0]\n";
+ warn "Cannot determine perl version info from $file\n";
return;
}
}
sub author_from {
- my $self = shift;
- my $content = Module::Install::_read($_[0]);
+ my ( $self, $file ) = @_;
+ my $content = $self->_slurp($file);
if ($content =~ m/
=head \d \s+ (?:authors?)\b \s*
([^\n]*)
@@ -414,14 +268,15 @@
$author =~ s{E<gt>}{>}g;
$self->author($author);
} else {
- warn "Cannot determine author info from $_[0]\n";
+ warn "Cannot determine author info from $file\n";
}
}
sub license_from {
- my $self = shift;
+ my ( $self, $file ) = @_;
+
if (
- Module::Install::_read($_[0]) =~ m/
+ $self->_slurp($file) =~ m/
(
=head \d \s+
(?:licen[cs]e|licensing|copyright|legal)\b
@@ -433,12 +288,8 @@
my $license_text = $1;
my @phrases = (
'under the same (?:terms|license) as perl itself' => '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,
'BSD license' => 'bsd', 1,
'Artistic license' => 'artistic', 1,
'GPL' => 'gpl', 1,
@@ -452,7 +303,7 @@
$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";
+ warn "LEGAL WARNING: 'All rights reserved' may invalidate Open Source licenses. Consider removing it.";
}
$self->license($license);
return 1;
@@ -460,41 +311,8 @@
}
}
- warn "Cannot determine license info from $_[0]\n";
+ warn "Cannot determine license info from $file\n";
return 'unknown';
}
-sub bugtracker_from {
- my $self = shift;
- my $content = Module::Install::_read($_[0]);
- my @links = $content =~ m/L\<(http\:\/\/rt\.cpan\.org\/[^>]+)\>/g;
- unless ( @links ) {
- warn "Cannot determine bugtracker info from $_[0]\n";
- return 0;
- }
- if ( @links > 1 ) {
- warn "Found more than on rt.cpan.org link in $_[0]\n";
- return 0;
- }
-
- # Set the bugtracker
- bugtracker( $links[0] );
- return 1;
-}
-
-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: RTFM-Extension-ArticleTemplate/inc/Module/Install/RTx.pm
==============================================================================
--- RTFM-Extension-ArticleTemplate/inc/Module/Install/RTx.pm (original)
+++ RTFM-Extension-ArticleTemplate/inc/Module/Install/RTx.pm Thu Jan 15 11:58:39 2009
@@ -8,7 +8,7 @@
use Module::Install::Base;
use base 'Module::Install::Base';
-our $VERSION = '0.23';
+our $VERSION = '0.24';
use FindBin;
use File::Glob ();
Modified: RTFM-Extension-ArticleTemplate/inc/Module/Install/Win32.pm
==============================================================================
--- RTFM-Extension-ArticleTemplate/inc/Module/Install/Win32.pm (original)
+++ RTFM-Extension-ArticleTemplate/inc/Module/Install/Win32.pm Thu Jan 15 11:58:39 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.70';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: RTFM-Extension-ArticleTemplate/inc/Module/Install/WriteAll.pm
==============================================================================
--- RTFM-Extension-ArticleTemplate/inc/Module/Install/WriteAll.pm (original)
+++ RTFM-Extension-ArticleTemplate/inc/Module/Install/WriteAll.pm Thu Jan 15 11:58:39 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.70';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
More information about the Bps-public-commit
mailing list