Skip to content

Commit 458c62d

Browse files
author
Benjamin Trott
committed
Rewrote Makefile.PL to use Module::Install; cleanup.
1 parent 8ee4a5b commit 458c62d

File tree

7 files changed

+889
-934
lines changed

7 files changed

+889
-934
lines changed

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
META.yml
2+
Makefile
3+
inc/
4+
pm_to_blib
5+
blib/
6+
*~

MANIFEST

+23-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
1-
CREDITS
2-
Changes
3-
MANIFEST
4-
Makefile.PL
5-
README
6-
SIGNATURE
7-
ToDo
81
bin/pgplet
9-
inc/ExtUtils/AutoInstall.pm
2+
Changes
3+
CREDITS
4+
inc/Module/Install.pm
5+
inc/Module/Install/AuthorTests.pm
6+
inc/Module/Install/Base.pm
7+
inc/Module/Install/Can.pm
8+
inc/Module/Install/Fetch.pm
9+
inc/Module/Install/Include.pm
10+
inc/Module/Install/Makefile.pm
11+
inc/Module/Install/Metadata.pm
12+
inc/Module/Install/ReadmeFromPod.pm
13+
inc/Module/Install/Repository.pm
14+
inc/Module/Install/Win32.pm
15+
inc/Module/Install/WriteAll.pm
1016
lib/Crypt/OpenPGP.pm
1117
lib/Crypt/OpenPGP/Armour.pm
1218
lib/Crypt/OpenPGP/Buffer.pm
13-
lib/Crypt/OpenPGP/CFB.pm
1419
lib/Crypt/OpenPGP/Certificate.pm
20+
lib/Crypt/OpenPGP/CFB.pm
1521
lib/Crypt/OpenPGP/Cipher.pm
1622
lib/Crypt/OpenPGP/Ciphertext.pm
1723
lib/Crypt/OpenPGP/Compressed.pm
@@ -31,21 +37,26 @@ lib/Crypt/OpenPGP/Key/Secret/RSA.pm
3137
lib/Crypt/OpenPGP/KeyBlock.pm
3238
lib/Crypt/OpenPGP/KeyRing.pm
3339
lib/Crypt/OpenPGP/KeyServer.pm
34-
lib/Crypt/OpenPGP/MDC.pm
3540
lib/Crypt/OpenPGP/Marker.pm
41+
lib/Crypt/OpenPGP/MDC.pm
3642
lib/Crypt/OpenPGP/Message.pm
3743
lib/Crypt/OpenPGP/OnePassSig.pm
3844
lib/Crypt/OpenPGP/PacketFactory.pm
3945
lib/Crypt/OpenPGP/Plaintext.pm
4046
lib/Crypt/OpenPGP/S2k.pm
41-
lib/Crypt/OpenPGP/SKSessionKey.pm
4247
lib/Crypt/OpenPGP/SessionKey.pm
4348
lib/Crypt/OpenPGP/Signature.pm
4449
lib/Crypt/OpenPGP/Signature/SubPacket.pm
50+
lib/Crypt/OpenPGP/SKSessionKey.pm
4551
lib/Crypt/OpenPGP/Trust.pm
4652
lib/Crypt/OpenPGP/UserID.pm
4753
lib/Crypt/OpenPGP/Util.pm
4854
lib/Crypt/OpenPGP/Words.pm
55+
Makefile.PL
56+
MANIFEST
57+
META.yml
58+
README
59+
SIGNATURE
4960
t/00-compile.t
5061
t/01-util.t
5162
t/02-buffer.t
@@ -66,3 +77,4 @@ t/samples/gpg/ring.pub
6677
t/samples/gpg/ring.sec
6778
t/samples/message.asc
6879
t/test-common.pl
80+
ToDo

MANIFEST.SKIP

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
\bRCS\b
2+
\bCVS\b
3+
\.svn/
4+
\.git/
5+
^MANIFEST\.
6+
^Makefile$
7+
~$
8+
\.old$
9+
^blib/
10+
^pm_to_blib
11+
^MakeMaker-\d
12+
\.gz$
13+
\.cvsignore
14+
\.shipit
15+
\.gitignore

Makefile.PL

+38-70
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,38 @@
1-
# $Id: Makefile.PL,v 1.15 2002/12/10 01:48:09 btrott Exp $
2-
3-
use ExtUtils::MakeMaker qw( prompt WriteMakefile );
4-
use strict;
5-
6-
use Getopt::Long;
7-
my($is_sdk);
8-
GetOptions("sdk", \$is_sdk);
9-
10-
use File::Spec;
11-
use File::Basename qw/dirname/;
12-
use lib File::Spec->catdir(dirname($0), 'inc');
13-
14-
use ExtUtils::AutoInstall (
15-
-core => [
16-
'Data::Buffer' => '0.04',
17-
'MIME::Base64' => 0,
18-
'Math::Pari' => 0,
19-
'Compress::Zlib' => 0,
20-
'LWP::UserAgent' => 0,
21-
'URI::Escape' => 0,
22-
23-
'Crypt::DSA' => 0,
24-
'Crypt::RSA' => 0,
25-
],
26-
27-
'PGP2 Compatibility (Minimum)' => [
28-
-default => $is_sdk,
29-
'Crypt::IDEA' => 0,
30-
'Digest::MD5' => 0,
31-
],
32-
33-
'PGP5 Compatibility (Minimum)' => [
34-
-default => $is_sdk,
35-
'Crypt::DES_EDE3' => 0,
36-
'Digest::SHA1' => 0,
37-
],
38-
39-
'GnuPG Compatibility (Minimum)' => [
40-
-default => $is_sdk,
41-
'Crypt::Rijndael' => 0,
42-
'Crypt::CAST5_PP' => 0,
43-
'Crypt::RIPEMD160' => 0,
44-
],
45-
46-
'Support for all ciphers' => [
47-
-default => $is_sdk,
48-
'Crypt::IDEA' => 0,
49-
'Crypt::DES_EDE3' => 0,
50-
'Crypt::CAST5_PP' => 0,
51-
'Crypt::Blowfish' => 0,
52-
'Crypt::Twofish' => '2.00',
53-
'Crypt::Rijndael' => 0,
54-
],
55-
56-
'Support for all digests' => [
57-
-default => $is_sdk,
58-
'Digest::MD5' => 0,
59-
'Digest::SHA1' => 0,
60-
'Crypt::RIPEMD160' => 0,
61-
],
62-
);
63-
64-
WriteMakefile(
65-
AUTHOR => 'Benjamin Trott <[email protected]>',
66-
ABSTRACT => 'Pure-Perl OpenPGP-compatible PGP implementation',
67-
NAME => 'Crypt::OpenPGP',
68-
VERSION_FROM => 'lib/Crypt/OpenPGP.pm',
69-
DISTNAME => 'Crypt-OpenPGP',
70-
);
1+
use inc::Module::Install;
2+
name 'Crypt-OpenPGP';
3+
all_from 'lib/Crypt/OpenPGP.pm';
4+
readme_from 'lib/Crypt/OpenPGP.pm';
5+
6+
# Core requirements.
7+
requires 'Data::Buffer' => '0.04';
8+
requires 'MIME::Base64';
9+
requires 'Math::Pari';
10+
requires 'Compress::Zlib';
11+
requires 'LWP::UserAgent';
12+
requires 'URI::Escape';
13+
requires 'Crypt::DSA';
14+
requires 'Crypt::RSA';
15+
16+
# PGP2 compat.
17+
requires 'Crypt::IDEA';
18+
requires 'Digest::MD5';
19+
20+
# PGP5 compat.
21+
requires 'Crypt::DES_EDE3';
22+
requires 'Digest::SHA1';
23+
24+
# GnuPG compat.
25+
requires 'Crypt::Rijndael';
26+
requires 'Crypt::CAST5_PP';
27+
requires 'Crypt::RIPEMD160';
28+
29+
# Other ciphers.
30+
requires 'Crypt::Blowfish';
31+
requires 'Crypt::Twofish';
32+
33+
build_requires 'Test::More';
34+
use_test_base;
35+
auto_include_deps;
36+
author_tests('xt');
37+
auto_set_repository;
38+
WriteAll;

0 commit comments

Comments
 (0)