Skip to content

Commit 8ba36f8

Browse files
committed
Makefile.PL fix for missing Test::NoWarnings build requirement.
Along with appropriate update to Github Action. Also we don't care about ExtUtils::MakeMaker version number anymore. This fixes GH#175.
1 parent a02c0d9 commit 8ba36f8

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

.github/workflows/action.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,6 @@ jobs:
5050
- run: sudo -E maint/scripts/03_install_oracle_instantclient_rpm.bash
5151
- run: . /etc/profile
5252
- run: perl -V
53-
- run: cpanm DBI Test::NoWarnings
53+
- run: cpanm DBI # DBI must be installed before we can build a DBD.
54+
- run: cpanm --installdeps .
5455
- run: perl Makefile.PL && make && make test

Makefile.PL

+8-11
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ my %opts = (
4545
NAME => 'DBD::Oracle',
4646
VERSION_FROM => 'lib/DBD/Oracle.pm',
4747
PREREQ_PM => { "Test::Simple" => 0.90, # actually Test::More pkg in T::S dist
48+
"Test::NoWarnings" => 1.00,
4849
"DBI" => 1.623},
4950
OBJECT => '$(O_FILES)',
5051
DEFINE => '',
@@ -59,20 +60,16 @@ my %opts = (
5960
configure_requires => { "DBI" => '1.623' },
6061
build_requires => {"DBI" => '1.623',
6162
"ExtUtils::MakeMaker" => 0,
62-
"Test::Simple" => '0.90'},
63+
"Test::Simple" => '0.90',
64+
"Test::NoWarnings" => "1.00"},
6365
},
6466
);
65-
my $eumm = $ExtUtils::MakeMaker::VERSION;
66-
$eumm =~ tr/_//d;
67-
68-
if ($eumm >= 5.43) {
69-
$opts{AUTHOR} = 'Tim Bunce ([email protected])';
70-
$opts{ABSTRACT_FROM} = 'lib/DBD/Oracle.pm';
71-
$opts{PREREQ_PM} = { DBI => 1.623 };
72-
$opts{CAPI} = 'TRUE' if $Config{archname} =~ /-object\b/i;
73-
}
7467

75-
$opts{LICENSE} = 'perl' if $eumm >= 6.3002;
68+
$opts{AUTHOR} = 'Tim Bunce ([email protected])';
69+
$opts{ABSTRACT_FROM} = 'lib/DBD/Oracle.pm';
70+
$opts{CAPI} = 'TRUE' if $Config{archname} =~ /-object\b/i;
71+
72+
$opts{LICENSE} = 'perl';
7673
$opts{CCFLAGS} = "-P $Config{ccflags}" if $Config{cc} eq 'bcc32'; # force C++
7774
$opts{LINKTYPE} = 'static' if $Config{dlsrc} =~ /dl_none/;
7875

0 commit comments

Comments
 (0)