Skip to content

Commit

Permalink
Update Module::Install
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason Crome committed May 15, 2024
1 parent 7fc8bd7 commit 52b9b96
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion inc/Module/Install.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ BEGIN {
# 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.19';
$VERSION = '1.21';

# Storage for the pseudo-singleton
$MAIN = undef;
Expand Down
2 changes: 1 addition & 1 deletion inc/Module/Install/Base.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package Module::Install::Base;
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
$VERSION = '1.19';
$VERSION = '1.21';
}

# Suspend handler for "redefined" warnings
Expand Down
2 changes: 1 addition & 1 deletion inc/Module/Install/Can.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use Module::Install::Base ();

use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
$VERSION = '1.19';
$VERSION = '1.21';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Expand Down
2 changes: 1 addition & 1 deletion inc/Module/Install/Fetch.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use Module::Install::Base ();

use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
$VERSION = '1.19';
$VERSION = '1.21';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Expand Down
2 changes: 1 addition & 1 deletion inc/Module/Install/Include.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use Module::Install::Base ();

use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
$VERSION = '1.19';
$VERSION = '1.21';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Expand Down
2 changes: 1 addition & 1 deletion inc/Module/Install/Makefile.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;

use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
$VERSION = '1.19';
$VERSION = '1.21';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Expand Down
12 changes: 7 additions & 5 deletions inc/Module/Install/Metadata.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use Module::Install::Base ();

use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
$VERSION = '1.19';
$VERSION = '1.21';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Expand Down Expand Up @@ -455,12 +455,8 @@ sub author_from {
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',
Expand All @@ -471,6 +467,12 @@ my %license_urls = (
unrestricted => undef,
restrictive => undef,
unknown => undef,

# these are not actually allowed in meta-spec v1.4 but are left here for compatibility:
apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1',
artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php',
lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php',
lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html',
);

sub license {
Expand Down
4 changes: 2 additions & 2 deletions inc/Module/Install/RTx.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ no warnings 'once';
use Term::ANSIColor qw(:constants);
use Module::Install::Base;
use base 'Module::Install::Base';
our $VERSION = '0.42';
our $VERSION = '0.43';

use FindBin;
use File::Glob ();
Expand Down Expand Up @@ -134,7 +134,7 @@ lexicons ::
if( $extra_args->{'remove_files'} ){
$self->include('Module::Install::RTx::Remove');
our @remove_files;
eval { require "etc/upgrade/remove_files" }
eval { require "./etc/upgrade/remove_files" }
or print "No remove file located, no files to remove\n";
$remove_files = join ",", map {"q(\$(DESTDIR)$plugin_path/$name/$_)"} @remove_files;
}
Expand Down
2 changes: 1 addition & 1 deletion inc/Module/Install/Win32.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use Module::Install::Base ();

use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
$VERSION = '1.19';
$VERSION = '1.21';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Expand Down
2 changes: 1 addition & 1 deletion inc/Module/Install/WriteAll.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use Module::Install::Base ();

use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
$VERSION = '1.19';
$VERSION = '1.21';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Expand Down
4 changes: 2 additions & 2 deletions inc/YAML/Tiny.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
use 5.008001; # sane UTF-8 support
use strict;
use warnings;
package YAML::Tiny; # git description: v1.72-7-g8682f63
package YAML::Tiny; # git description: v1.73-12-ge02f827
# XXX-INGY is 5.8.1 too old/broken for utf8?
# XXX-XDG Lancaster consensus was that it was sufficient until
# proven otherwise

our $VERSION = '1.73';
our $VERSION = '1.74';

#####################################################################
# The YAML::Tiny API.
Expand Down

0 comments on commit 52b9b96

Please sign in to comment.