Skip to content

Commit 5cf361f

Browse files
committed
Makefile.PL: port WriteMakefile1 from Hash::Merge
... and tidy the rest of the file to have one style Signed-off-by: Jens Rehsack <[email protected]>
1 parent 920d512 commit 5cf361f

File tree

1 file changed

+30
-27
lines changed

1 file changed

+30
-27
lines changed

Makefile.PL

+30-27
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ my %CONFLICTS = (
5959
WriteMakefile1(
6060
MIN_PERL_VERSION => '5.008',
6161
META_MERGE => {
62-
'meta-spec' => { version => 2 },
62+
'meta-spec' => {version => 2},
6363
resources => {
6464
homepage => 'https://metacpan.org/release/SQL-Statement',
6565
x_IRC => "irc://irc.perl.org/#dbi",
@@ -123,26 +123,26 @@ WriteMakefile1(
123123
TEST_REQUIRES => \%TEST_DEPS,
124124
LICENSE => 'perl',
125125
AUTHOR => 'Jeff Zucker <[email protected]>, Jens Rehsack <[email protected]>',
126-
test => { TESTS => 't/*.t xt/*.t' },
126+
test => {TESTS => 't/*.t xt/*.t'},
127127
);
128128

129129
sub CheckConflicts
130130
{
131131
my %params = @_;
132-
my %conflicts = %{ $params{CONFLICTS} };
132+
my %conflicts = %{$params{CONFLICTS}};
133133
my $found = 0;
134134

135-
while ( my ( $module, $version ) = each(%conflicts) )
135+
while (my ($module, $version) = each(%conflicts))
136136
{
137137
undef $@;
138138
eval "require $module";
139139
next if $@;
140140
my $installed = eval "\$" . $module . "::VERSION";
141-
if ( $installed le $version )
141+
if ($installed le $version)
142142
{
143143
++$found;
144-
my $msg = $module eq $params{NAME} ? $selfConflictMsg : $conflictMsg;
145-
my $warning = sprintf( $msg, $module, $installed );
144+
my $msg = $module eq $params{NAME} ? $selfConflictMsg : $conflictMsg;
145+
my $warning = sprintf($msg, $module, $installed);
146146
warn $warning;
147147
}
148148
}
@@ -151,41 +151,44 @@ sub CheckConflicts
151151
}
152152

153153
sub WriteMakefile1
154-
{ #Written by Alexandr Ciornii, version 0.21. Added by eumm-upgrade.
154+
{ # originally written by Alexandr Ciornii, version 0.21. Added by eumm-upgrade.
155155
my %params = @_;
156156
my $eumm_version = $ExtUtils::MakeMaker::VERSION;
157157
$eumm_version = eval $eumm_version;
158-
die "EXTRA_META is deprecated" if ( exists( $params{EXTRA_META} ) );
159-
die "License not specified" if ( !exists( $params{LICENSE} ) );
158+
die "EXTRA_META is deprecated" if (exists($params{EXTRA_META}));
159+
die "License not specified" if (!exists($params{LICENSE}));
160160
$params{TEST_REQUIRES}
161161
and $eumm_version < 6.6303
162-
and $params{BUILD_REQUIRES} = { %{ $params{BUILD_REQUIRES} || {} }, %{ delete $params{TEST_REQUIRES} } };
162+
and $params{BUILD_REQUIRES} = {%{$params{BUILD_REQUIRES} || {}}, %{delete $params{TEST_REQUIRES}}};
163163
#EUMM 6.5502 has problems with BUILD_REQUIRES
164164
$params{BUILD_REQUIRES}
165165
and $eumm_version < 6.5503
166-
and $params{PREREQ_PM} = { %{ $params{PREREQ_PM} || {} }, %{ delete $params{BUILD_REQUIRES} } };
166+
and $params{PREREQ_PM} = {%{$params{PREREQ_PM} || {}}, %{delete $params{BUILD_REQUIRES}}};
167167
ref $params{AUTHOR}
168168
and "ARRAY" eq ref $params{AUTHOR}
169169
and $eumm_version < 6.5702
170-
and $params{AUTHOR} = join( ", ", @{ $params{AUTHOR} } );
171-
delete $params{CONFIGURE_REQUIRES} if ( $eumm_version < 6.52 );
172-
delete $params{MIN_PERL_VERSION} if ( $eumm_version < 6.48 );
173-
delete $params{META_MERGE} if ( $eumm_version < 6.46 );
174-
delete $params{META_ADD}{prereqs} if ( $eumm_version < 6.58 );
175-
delete $params{META_ADD}{'meta-spec'} if ( $eumm_version < 6.58 );
176-
delete $params{META_ADD} if ( $eumm_version < 6.46 );
177-
delete $params{LICENSE} if ( $eumm_version < 6.31 );
178-
delete $params{AUTHOR} if ( $] < 5.005 );
179-
delete $params{ABSTRACT_FROM} if ( $] < 5.005 );
180-
delete $params{BINARY_LOCATION} if ( $] < 5.005 );
170+
and $params{AUTHOR} = join(", ", @{$params{AUTHOR}});
171+
delete $params{CONFIGURE_REQUIRES} if ($eumm_version < 6.52);
172+
delete $params{MIN_PERL_VERSION} if ($eumm_version < 6.48);
173+
delete $params{META_MERGE} if ($eumm_version < 6.46);
174+
delete $params{META_ADD}{prereqs} if ($eumm_version < 6.58);
175+
delete $params{META_ADD}{'meta-spec'} if ($eumm_version < 6.58);
176+
delete $params{META_ADD} if ($eumm_version < 6.46);
177+
delete $params{LICENSE} if ($eumm_version < 6.31);
178+
delete $params{AUTHOR} if ($] < 5.005);
179+
delete $params{ABSTRACT_FROM} if ($] < 5.005);
180+
delete $params{BINARY_LOCATION} if ($] < 5.005);
181181

182182
# more or less taken from Moose' Makefile.PL
183-
if ( $params{CONFLICTS} )
183+
if ($params{CONFLICTS})
184184
{
185185
my $ok = CheckConflicts(%params);
186-
exit(0) if ( $params{PREREQ_FATAL} and not $ok );
187-
my $cpan_smoker = grep { $_ =~ m/(?:CR_SMOKER|CPAN_REPORTER|AUTOMATED_TESTING)/ } keys %ENV;
188-
unless ( $cpan_smoker || $ENV{PERL_MM_USE_DEFAULT} || $ENV{SQL_STATEMENT_WARN_UPDATE} )
186+
exit(0) if ($params{PREREQ_FATAL} and not $ok);
187+
my $cpan_smoker = grep { $_ =~ m/(?:CR_SMOKER|CPAN_REPORTER|AUTOMATED_TESTING)/ }
188+
keys %ENV;
189+
unless ($cpan_smoker
190+
|| $ENV{PERL_MM_USE_DEFAULT}
191+
|| $ENV{SQL_STATEMENT_WARN_UPDATE})
189192
{
190193
sleep 4 unless ($ok);
191194
}

0 commit comments

Comments
 (0)