Skip to content
This repository was archived by the owner on Jun 1, 2023. It is now read-only.

Commit bdad759

Browse files
committed
Storable 3.12_02: remove __Storable__.pm
Do the templating as with every other module. Closes [cperl #374]
1 parent 7fd83e1 commit bdad759

File tree

8 files changed

+1483
-1473
lines changed

8 files changed

+1483
-1473
lines changed

MANIFEST

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3574,7 +3574,6 @@ dist/SelfLoader/lib/SelfLoader.pm Load functions only on demand
35743574
dist/SelfLoader/t/01SelfLoader.t See if SelfLoader works
35753575
dist/SelfLoader/t/02SelfLoader-buggy.t See if SelfLoader works
35763576
dist/SelfLoader/t/03taint.t See if SelfLoader works under taint
3577-
dist/Storable/__Storable__.pm Storable extension
35783577
dist/Storable/ChangeLog Storable extension
35793578
dist/Storable/hints/gnukfreebsd.pl Hint for Storable for named architecture
35803579
dist/Storable/hints/gnuknetbsd.pl Hint for Storable for named architecture

Porting/Maintainers.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,7 @@ package Maintainers;
12871287
},
12881288

12891289
'Storable' => {
1290-
'DISTRIBUTION' => 'RURBAN/Storable-3.11_01.tar.gz',
1290+
'DISTRIBUTION' => 'RURBAN/Storable-3.12_02.tar.gz',
12911291
'FILES' => q[dist/Storable],
12921292
'EXCLUDED' => [
12931293
qw( ptr_table.h t/leaks_refcnt.t .travis.yml appveyor.yml ),

dist/Module-CoreList/lib/Module/CoreList.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17666,7 +17666,7 @@ our %delta :const = (
1766617666
'ffi' => '0.01c',
1766717667
'hashiter' => '0.02',
1766817668
'Opcode' => '1.40_03c',
17669-
'Storable' => '3.11_02',
17669+
'Storable' => '3.12_02',
1767017670
'warnings' => '1.43',
1767117671
},
1767217672
removed => {

dist/Storable/Makefile.PL

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Copyright (c) 1995-2000, Raphael Manfredi
3-
# Copyright (c) 2017, Reini Urban
3+
# Copyright (c) 2017-2018, Reini Urban
44
#
55
# You may redistribute only under the same terms as Perl 5, as specified
66
# in the README file that comes with the distribution.
@@ -24,21 +24,19 @@ unless ($ENV{PERL_CORE}) {
2424
}
2525

2626
WriteMakefile(
27-
NAME => 'Storable',
28-
AUTHOR => 'Perl 5 Porters',
29-
LICENSE => 'perl',
30-
DISTNAME => "Storable",
31-
# We now ship this in t/
32-
# PREREQ_PM => { 'Test::More' => '0.41' },
27+
NAME => 'Storable',
28+
AUTHOR => 'Perl 5 Porters',
29+
LICENSE => 'perl',
30+
DISTNAME => "Storable",
3331
PL_FILES => { }, # prevent default behaviour
3432
PM => $pm,
35-
PREREQ_PM => { XSLoader => 0 },
36-
INSTALLDIRS => ($] >= 5.007 && $] < 5.012) ? 'perl' : 'site',
37-
VERSION_FROM => '__Storable__.pm',
38-
ABSTRACT_FROM => '__Storable__.pm',
33+
PREREQ_PM => { XSLoader => 0 },
34+
INSTALLDIRS => ($] >= 5.007 && $] < 5.012) ? 'perl' : 'site',
35+
VERSION_FROM => 'Storable_pm.PL',
36+
ABSTRACT_FROM => 'Storable_pm.PL',
3937
($ExtUtils::MakeMaker::VERSION > 6.45 ?
40-
(META_MERGE => { resources =>
41-
{ bugtracker => 'http://rt.perl.org/perlbug/' },
38+
(META_MERGE => { resources =>
39+
{ bugtracker => 'http://rt.perl.org/perlbug/' },
4240
provides => {
4341
'Storable' => {
4442
file => '__Storable__.pm',
@@ -48,8 +46,8 @@ WriteMakefile(
4846

4947
},
5048
) : ()),
51-
dist => { SUFFIX => 'gz', COMPRESS => 'gzip -f' },
52-
clean => { FILES => 'Storable-* Storable.pm lib' },
49+
dist => { SUFFIX => 'gz', COMPRESS => 'gzip -f' },
50+
clean => { FILES => 'Storable-* Storable.pm lib' },
5351
);
5452

5553
# Unlink the .pm file included with the distribution
@@ -126,7 +124,7 @@ sub postamble {
126124
all :: Storable.pm
127125
$(NOECHO) $(NOOP)
128126
129-
Storable.pm :: Storable_pm.PL __Storable__.pm
127+
Storable.pm :: Storable_pm.PL
130128
$(PERLRUN) Storable_pm.PL
131129
'
132130
}

0 commit comments

Comments
 (0)