r2065 - in
packages/libmodule-install-perl/branches/upstream/current: .
inc/Module inc/Module/Install lib/Module lib/Module/Install
lib/Module/Install/Admin lib/Module/Install/Makefile t
Krzysztof Krzyzaniak
eloy at costa.debian.org
Wed Feb 1 10:01:36 UTC 2006
Author: eloy
Date: 2006-02-01 10:00:55 +0000 (Wed, 01 Feb 2006)
New Revision: 2065
Removed:
packages/libmodule-install-perl/branches/upstream/current/SIGNATURE
Modified:
packages/libmodule-install-perl/branches/upstream/current/Changes
packages/libmodule-install-perl/branches/upstream/current/MANIFEST
packages/libmodule-install-perl/branches/upstream/current/META.yml
packages/libmodule-install-perl/branches/upstream/current/Makefile.PL
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Base.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Can.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Fetch.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Include.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Makefile.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Metadata.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Win32.pm
packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pod
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Bundle.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Find.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Include.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Makefile.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Manifest.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Metadata.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/ScanDeps.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/WriteAll.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/AutoInstall.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Base.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Build.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Bundle.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Can.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Compiler.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Fetch.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Include.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Inline.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/MakeMaker.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Name.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Version.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Metadata.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/PAR.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Run.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Scripts.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Share.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Win32.pm
packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/WriteAll.pm
packages/libmodule-install-perl/branches/upstream/current/t/3-autoinstall.t
Log:
Load /tmp/tmp.QnmMcO/libmodule-install-perl-0.55 into
packages/libmodule-install-perl/branches/upstream/current.
Modified: packages/libmodule-install-perl/branches/upstream/current/Changes
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/Changes 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/Changes 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,3 +1,28 @@
+[Changes for 0.55 - 2006-01-27]
+
+* This release only not signed (Released by ADAMK who has no keys)
+
+* Another pass over the POD to clean up and remove mistaked (ADAMK)
+
+* Module::Install::Share installs to blib/lib rather than blib/arch.
+ Most files will be non-arch-specific, and it was causing problems
+ down the road with File::ShareDir.
+ All existing working install_share/File::ShareDir continues to work.
+
+* New command auto_include_dependent_dists() to recursively include dependent
+ CPAN distributions for modules declared with build_requires().
+ This differs from auto_include_deps() because it works with whole
+ distribution source trees, not just single modules.
+
+* Fix POD syntax so t/2-pod.t passes.
+ Contributed by: Ishigaki Kenichi
+
+* Disable 5.005-specific qr// construct in t/3-autoinstall.t so
+ Perl 5.004 can build this module again.
+
+* YAML::Syck 0.27+ is now a preferred dependency over YAML 0.35+ for
+ platforms with a C compiler and without either one available.
+
[Changes for 0.54 - 2006-01-11]
* Fix can_run() on Cygwin for real.
Property changes on: packages/libmodule-install-perl/branches/upstream/current/Changes
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libmodule-install-perl/branches/upstream/current/MANIFEST
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/MANIFEST 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/MANIFEST 2006-02-01 10:00:55 UTC (rev 2065)
@@ -49,7 +49,6 @@
MANIFEST.SKIP
META.yml
README
-SIGNATURE
t/1-basic.t
t/2-pod.t
t/3-autoinstall.t
Modified: packages/libmodule-install-perl/branches/upstream/current/META.yml
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/META.yml 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/META.yml 2006-02-01 10:00:55 UTC (rev 2065)
@@ -4,12 +4,12 @@
- example
- inc
- t
-generated_by: Module::Install version 0.54
+generated_by: Module::Install version 0.55
distribution_type: module
-version: 0.54
+version: 0.55
name: Module-Install
author: Audrey Tang <autrijus at autrijus.org>
-license: gpl
+license: perl
provides:
Module::Install::Fetch:
version: 0.01
@@ -53,7 +53,7 @@
version: 0.01
file: lib/Module/Install/Admin/Manifest.pm
Module::Install::Admin:
- version: 0.54
+ version: 0.55
file: lib/Module/Install/Admin.pm
Module::Install::Base::FakeAdmin:
file: lib/Module/Install/Base.pm
@@ -86,7 +86,7 @@
version: 0.02
file: lib/Module/Install/Scripts.pm
Module::Install:
- version: 0.54
+ version: 0.55
file: lib/Module/Install.pm
Module::Install::Win32:
version: 0.02
@@ -100,7 +100,7 @@
version: 0.01
file: lib/Module/Install/Compiler.pm
Module::Install::Share:
- version: 0.01
+ version: 0.02
file: lib/Module/Install/Share.pm
requires:
perl: 5.004
Modified: packages/libmodule-install-perl/branches/upstream/current/Makefile.PL
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/Makefile.PL 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/Makefile.PL 2006-02-01 10:00:55 UTC (rev 2065)
@@ -11,29 +11,33 @@
all_from 'lib/Module/Install.pm';
# If we have YAML::Syck here, don't bother installing YAML.
-requires 'YAML' => 0.35 unless can_use('YAML::Syck' => 0.15);
+if ( can_cc() ) {
+ requires('YAML::Syck' => 0.27) unless can_use('YAML' => 0.35);
+} else {
+ requires('YAML' => 0.35) unless can_use('YAML::Syck' => 0.27);
+}
feature 'Include packages with full dependencies',
recommends
- 'Test::Harness' => 2.03, # merely a dependency of M::CoreList
- 'Test::More' => 0, # ditto
- 'Module::ScanDeps' => 0.28,
- 'Module::CoreList';
+ 'Test::Harness' => 2.03, # merely a dependency of M::CoreList
+ 'Test::More' => 0, # ditto
+ 'Module::ScanDeps' => 0.28,
+ 'Module::CoreList';
feature 'Bundle other CPAN packages',
recommends
- 'CPANPLUS' => 0.040;
+ 'CPANPLUS' => 0.040;
feature 'PAR-based binary distributions',
recommends
- 'PAR::Dist' => 0.03;
+ 'PAR::Dist' => 0.03;
feature 'Module::Build support',
'Archive::Tar' => 0.23,
'ExtUtils::Install' => 0.3,
'ExtUtils::ParseXS',
recommends
- 'Module::Build';
+ 'Module::Build';
no_index
directory => 'example';
@@ -46,5 +50,5 @@
# Still list it as a mandatory dependency for now
requires 'YAML' => 0.35;
-sign;
+# sign;
WriteAll;
Property changes on: packages/libmodule-install-perl/branches/upstream/current/Makefile.PL
___________________________________________________________________
Name: svn:executable
+ *
Deleted: packages/libmodule-install-perl/branches/upstream/current/SIGNATURE
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/SIGNATURE 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/SIGNATURE 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,77 +0,0 @@
-This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.51.
-
-To verify the content in this distribution, first make sure you have
-Module::Signature installed, then type:
-
- % cpansign -v
-
-It will check each file's integrity, as well as the signature's
-validity. If "==> Signature verified OK! <==" is not displayed,
-the distribution may already have been compromised, and you should
-not run its Makefile.PL or Build.PL.
-
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-SHA1 6b9d56ef93c2445007cda1203bf2eea8865d9ed9 Changes
-SHA1 5a719bc1917e640ab583da941586e210da83a18f MANIFEST
-SHA1 d8504618f3e772137facea61a59906d77fffc412 MANIFEST.SKIP
-SHA1 dbb2b2aeea98726403dfbcb4f7aa6a55ed85f997 META.yml
-SHA1 99073b02ba9322ebc63e7665497ff66878d2b7a2 Makefile.PL
-SHA1 d131a0c2e81eeed474b809095878a9aa819badcb README
-SHA1 b0cf6e5a18272351015e6b2bf770a4d3d7b81fe7 inc/Module/AutoInstall.pm
-SHA1 adfed789a44d66f10e610092c8a45d3a308204be inc/Module/Install.pm
-SHA1 efb445738be8e47593d412d57de91bc6a5a87474 inc/Module/Install/AutoInstall.pm
-SHA1 b9f88c65a2a1a2ff53632d2e71ac60e0d52d66f6 inc/Module/Install/Base.pm
-SHA1 f4154feb374971ecdbbc7ab44a55cc9f00057c30 inc/Module/Install/Can.pm
-SHA1 a5389bc01a2c81898654796e0206588229f74b16 inc/Module/Install/Fetch.pm
-SHA1 5f9007e74cb6df03acd616cc2dd350966257162c inc/Module/Install/Include.pm
-SHA1 47a67dc7ff84095409751f3bcf0b9e0ec215f4d6 inc/Module/Install/Makefile.pm
-SHA1 b65cc85073e12b75e94ca9193d454020cd727e65 inc/Module/Install/Metadata.pm
-SHA1 6dea053579084d1a638ddb3c22e86146d1588b28 inc/Module/Install/Win32.pm
-SHA1 afb581b95e7e63ce7618733c2e7284f7e5da9ee7 inc/Module/Install/WriteAll.pm
-SHA1 91f5522687fb8caa3ad2eed15f31a49a7168307b lib/Module/AutoInstall.pm
-SHA1 a5cf37c2cc23f233b1be225e7a54160f01c2e339 lib/Module/Install-Philosophy.pod
-SHA1 b309facf7c63b68ffea4ef93096e954ebdca090e lib/Module/Install.pm
-SHA1 d5a8ce89cf2c7380cd6ab87166b0b584e92558a5 lib/Module/Install.pod
-SHA1 cc7f17ece615d8d3d199492c13723f0a8c83edb8 lib/Module/Install/Admin.pm
-SHA1 57b0f1152c5490287f85b52f4f0d5d849332f960 lib/Module/Install/Admin/Bundle.pm
-SHA1 67e24c386c1a964e845ee97540a5ad1f4b38c495 lib/Module/Install/Admin/Find.pm
-SHA1 6ee0a0a2d969287219b69eeb20a8b314b90839cb lib/Module/Install/Admin/Include.pm
-SHA1 99f1a2f84648a827a8a75204ceda00371a72987b lib/Module/Install/Admin/Makefile.pm
-SHA1 dd389fb52d2dedab2a96cc0b9f9e3185080a2b47 lib/Module/Install/Admin/Manifest.pm
-SHA1 664bb55e14aa22d27f4f2c50b53d11f7e8cf83ed lib/Module/Install/Admin/Metadata.pm
-SHA1 5ba95cbf306f7fb0c96e96f7b6f0f0eb4c27f77f lib/Module/Install/Admin/ScanDeps.pm
-SHA1 ccec6b2cdd2a7d37e36ab167718d1142bfd05a7a lib/Module/Install/Admin/WriteAll.pm
-SHA1 5c17235758de252ef7b6f6da246277d1e6321d10 lib/Module/Install/AutoInstall.pm
-SHA1 12ef08d31f6afe4acf46bd627fee0a268b98be7d lib/Module/Install/Base.pm
-SHA1 02c15969f75db48679d55dfd651946164bbcaca6 lib/Module/Install/Build.pm
-SHA1 a2c881c0171c651f545ddfd6eb9070dfa7e92bcc lib/Module/Install/Bundle.pm
-SHA1 f7c69f70b118013635c9c2b1d3cd8020baab1703 lib/Module/Install/Can.pm
-SHA1 70e8e0ac8d288daa443eca42149ea8cb1d53f735 lib/Module/Install/Compiler.pm
-SHA1 20ec4c053545daa827987ea0d0153f991e55dbaf lib/Module/Install/Fetch.pm
-SHA1 d51f1c421c7c31098272eaff796ac297ac584cbb lib/Module/Install/Include.pm
-SHA1 d15dab5a96deeb578458e7231eaadb5440b895e0 lib/Module/Install/Inline.pm
-SHA1 324da41791c871b41892422104c77c19506a158d lib/Module/Install/MakeMaker.pm
-SHA1 95fcdb103fae03000b6d531c4e8db0e3481296a0 lib/Module/Install/Makefile.pm
-SHA1 a572b91b863aa6b2e087d0deb9234ce4f21224d0 lib/Module/Install/Makefile/Name.pm
-SHA1 f2f05144695375d8ef4e96109284428a08a49127 lib/Module/Install/Makefile/Version.pm
-SHA1 03eb4e5c14d6c86758d38f7f236b09f88fd5194e lib/Module/Install/Metadata.pm
-SHA1 256a646db9716ea7f15c474116dfabf10a3fbea7 lib/Module/Install/PAR.pm
-SHA1 581dab4432dbbe4296062fcda79f7a54907804ab lib/Module/Install/Run.pm
-SHA1 18a6d6ce26048d32fccef1e2ffbe67d485c12c29 lib/Module/Install/Scripts.pm
-SHA1 cbdf015561c516db721d996dc722c82db44ed1db lib/Module/Install/Share.pm
-SHA1 2f2c6535776715797270e8d318a766d472ed410f lib/Module/Install/Win32.pm
-SHA1 949c10fd4a37bb98be37f215b5d1eda2806dafd5 lib/Module/Install/WriteAll.pm
-SHA1 1a054e15bfbd68c6ccb8f30bc4d2badcac543335 lib/inc/Module/Install.pm
-SHA1 cc165528d2e584ffcfaf9bfc8cbc3a814c48d53f t/1-basic.t
-SHA1 7867cff04a8429890fa473fcd8ea51a66d0f6772 t/2-pod.t
-SHA1 34873535b662d7b6833adda1e2aea8630b7d3969 t/3-autoinstall.t
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (FreeBSD)
-
-iD8DBQFDxHbotLPdNzw1AaARAh1aAJ49zzcmsNjTWNlsyCC86yzuKDRflwCbB85c
-7XilO/YrRHpQv2TeuMDBegs=
-=S+vb
------END PGP SIGNATURE-----
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,7 +1,9 @@
#line 1 "inc/Module/Install/AutoInstall.pm - lib/Module/Install/AutoInstall.pm"
package Module::Install::AutoInstall;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw{Module::Install::Base};
+
sub AutoInstall { $_[0] }
sub run {
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Base.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Base.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Base.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -2,9 +2,12 @@
package Module::Install::Base;
# Suspend handler for "redefined" warnings
-BEGIN { my $w = $SIG{__WARN__}; $SIG{__WARN__} = sub { $w } };
+BEGIN {
+ my $w = $SIG{__WARN__};
+ $SIG{__WARN__} = sub { $w };
+}
-#line 30
+#line 36
sub new {
my ($class, %args) = @_;
@@ -18,7 +21,7 @@
bless(\%args, $class);
}
-#line 48
+#line 56
sub AUTOLOAD {
my $self = shift;
@@ -28,20 +31,18 @@
goto &$autoload;
}
-#line 62
+#line 72
sub _top { $_[0]->{_top} }
-#line 73
+#line 85
sub admin {
- my $self = shift;
- $self->_top->{admin} or Module::Install::Base::FakeAdmin->new;
+ $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
}
sub is_admin {
- my $self = shift;
- $self->admin->VERSION;
+ $_[0]->admin->VERSION;
}
sub DESTROY {}
@@ -50,14 +51,16 @@
my $Fake;
sub new { $Fake ||= bless(\@_, $_[0]) }
+
sub AUTOLOAD {}
+
sub DESTROY {}
-1;
-
# Restore warning handler
-BEGIN { $SIG{__WARN__} = $SIG{__WARN__}->() };
+BEGIN {
+ $SIG{__WARN__} = $SIG{__WARN__}->();
+}
-__END__
+1;
-#line 120
+#line 134
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Can.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Can.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Can.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,9 @@
#line 1 "inc/Module/Install/Can.pm - lib/Module/Install/Can.pm"
package Module::Install::Can;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict;
@@ -53,7 +56,7 @@
if ($^O eq 'cygwin') {
require ExtUtils::MM_Cygwin;
require ExtUtils::MM_Win32;
- if (!defined(&ExtUtils::MM_Cygwin::maybe_command)) {
+ if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
*ExtUtils::MM_Cygwin::maybe_command = sub {
my ($self, $file) = @_;
if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Fetch.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Fetch.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Fetch.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,7 +1,9 @@
#line 1 "inc/Module/Install/Fetch.pm - lib/Module/Install/Fetch.pm"
package Module::Install::Fetch;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
sub get_file {
@@ -9,7 +11,7 @@
my ($scheme, $host, $path, $file) =
$args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
- if ($scheme eq 'http' and !eval { require LWP::Simple; 1 }) {
+ if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
$args{url} = $args{ftp_url}
or (warn("LWP support unavailable!\n"), return);
($scheme, $host, $path, $file) =
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Include.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Include.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Include.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,10 +1,12 @@
#line 1 "inc/Module/Install/Include.pm - lib/Module/Install/Include.pm"
package Module::Install::Include;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
sub include { +shift->admin->include(@_) };
sub include_deps { +shift->admin->include_deps(@_) };
sub auto_include { +shift->admin->auto_include(@_) };
sub auto_include_deps { +shift->admin->auto_include_deps(@_) };
-
+sub auto_include_dependent_dists { +shift->admin->auto_include_dependent_dists(@_) }
1;
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Makefile.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Makefile.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Makefile.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,7 +1,9 @@
#line 1 "inc/Module/Install/Makefile.pm - lib/Module/Install/Makefile.pm"
package Module::Install::Makefile;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict 'vars';
@@ -154,4 +156,4 @@
__END__
-#line 286
+#line 288
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Metadata.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Metadata.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Metadata.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,15 +1,13 @@
#line 1 "inc/Module/Install/Metadata.pm - lib/Module/Install/Metadata.pm"
package Module::Install::Metadata;
-use strict 'vars';
use Module::Install::Base;
+ at ISA = qw{Module::Install::Base};
-use vars qw($VERSION @ISA);
-BEGIN {
- $VERSION = '0.06';
- @ISA = 'Module::Install::Base';
-}
+$VERSION = '0.06';
+use strict 'vars';
+
my @scalar_keys = qw{
name module_name abstract author version license
distribution_type perl_version tests
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Win32.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Win32.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/Win32.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,7 +1,9 @@
#line 1 "inc/Module/Install/Win32.pm - lib/Module/Install/Win32.pm"
package Module::Install::Win32;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.02';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,7 +1,9 @@
#line 1 "inc/Module/Install/WriteAll.pm - lib/Module/Install/WriteAll.pm"
package Module::Install::WriteAll;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
sub WriteAll {
my $self = shift;
my %args = (
Modified: packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/inc/Module/Install.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,4 +1,4 @@
-#line 1 "/home/autrijus/work/modinstall/trunk/inc/Module/Install.pm - lib/Module/Install.pm"
+#line 1 "/home/adam/modinstall/trunk/inc/Module/Install.pm - lib/Module/Install.pm"
package Module::Install;
use 5.004;
@@ -6,7 +6,7 @@
use vars qw{$VERSION};
BEGIN {
# Don't forget to update Module::Install::Admin too!
- $VERSION = '0.54';
+ $VERSION = '0.55';
}
# inc::Module::Install must be loaded first
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Bundle.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Bundle.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Bundle.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,9 +1,12 @@
package Module::Install::Admin::Bundle;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.04';
use strict;
+
sub bundle {
my $self = shift;
my $bundle_dir = $self->_top->{bundle};
@@ -15,7 +18,7 @@
# This code is what we _should_ be doing, but CPANPLUS doesn't
# let you have multiple Backends in one program.
- #my $cp = CPANPLUS::Backend->new;
+ # my $cp = CPANPLUS::Backend->new;
#
# Jos Boumans tells us that this is the best way to do what we want
# It still scares me.
@@ -24,9 +27,9 @@
my $conf = $cp->configure_object;
my $modtree = $cp->module_tree;
- $conf->set_conf( verbose => 1 );
+ $conf->set_conf( verbose => 1 );
$conf->set_conf( signature => 0 );
- $conf->set_conf( md5 => 0 );
+ $conf->set_conf( md5 => 0 );
mkdir $bundle_dir;
@@ -35,16 +38,16 @@
while ( my ( $name, $version ) = splice( @_, 0, 2 ) ) {
my $mod = $cp->module_tree($name);
next unless $mod;
- next
- if ( $mod->package_is_perl_core
- or $self->{already_bundled}{$mod->package} );
+ if ( $mod->package_is_perl_core or $self->{already_bundled}{$mod->package} ) {
+ next;
+ }
+
my $where = $mod->fetch( fetchdir => $bundle_dir, );
-
next unless ($where);
my $file = Cwd::abs_path($where);
my $extract_result = $mod->extract(
- files => [$file],
+ files => [ $file ],
extractdir => $bundle_dir,
);
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Find.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Find.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Find.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::Admin::Find;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Include.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Include.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Include.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,10 +1,12 @@
package Module::Install::Admin::Include;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.02';
sub include {
- my ($self, $pattern) = @_;
+ my ( $self, $pattern ) = @_;
foreach my $rv ( $self->admin->glob_in_inc($pattern) ) {
$self->admin->copy_package(@$rv);
@@ -13,26 +15,131 @@
}
sub include_deps {
- my ($self, $pkg) = @_;
+ my ( $self, $pkg ) = @_;
my $deps = $self->admin->scan_dependencies($pkg) or return;
- foreach my $key (sort keys %$deps) {
+ foreach my $key ( sort keys %$deps ) {
$self->include($key);
}
}
sub auto_include {
my $self = shift;
- foreach my $module ( map $_->[0], map @$_, grep $_, $self->build_requires ) {
+ foreach
+ my $module ( map $_->[0], map @$_, grep $_, $self->build_requires )
+ {
$self->include($module);
}
}
sub auto_include_deps {
my $self = shift;
- foreach my $module ( map $_->[0], map @$_, grep $_, $self->build_requires ) {
+ foreach
+ my $module ( map $_->[0], map @$_, grep $_, $self->build_requires )
+ {
$self->include_deps($module);
}
}
+=head2 auto_include_dependent_dists
+
+Grabs everything in this module's build_requires and attempts to
+include everything (at the whole distribution level) recursively.
+
+=cut
+
+sub auto_include_dependent_dists {
+ my $self = shift;
+ foreach
+ my $module ( map $_->[0], map @$_, grep $_, $self->build_requires )
+ {
+ $self->include_dependent_dists($module);
+ }
+}
+
+=head2 include_dependent_dists $package
+
+Given a module package name, recursively include every package that
+module needs.
+
+=cut
+
+sub include_dependent_dists {
+ my ( $self, $pkg ) = @_;
+ return unless ($pkg);
+ return if ( $self->_seen_it($pkg) );
+ $self->include_one_dist($pkg);
+
+ foreach my $mod ( @{ $self->_dist_to_mods( $self->_pkg_to_dist($pkg) ) } )
+ {
+ my $deps = $self->admin->scan_dependencies($mod) or return;
+ foreach my $key ( sort keys %$deps ) {
+ next unless ($key);
+ $self->include_dependent_dists($key);
+ }
+ }
+}
+
+=head2 include_one_dist $module
+
+Given a module name, C<$module>, figures out which modules are in the
+dist containing that module and copies all those files to ./inc. I bet
+there's a way to harness smarter logic from L<PAR>.
+
+=cut
+
+sub include_one_dist {
+ my ( $self, $key ) = @_;
+ my @mods = $self->_dist_to_mods( $self->_pkg_to_dist($key) );
+ foreach my $pattern (@mods) {
+ next unless $pattern;
+ foreach my $rv ( $self->admin->glob_in_inc($pattern) ) {
+ $self->admin->copy_package(@$rv);
+ }
+ }
+}
+
+=for private _pkg_to_dist $modname
+
+Given a module name, returns the file on CPAN containing
+its latest version.
+
+=cut
+
+sub _pkg_to_dist {
+ my $self = shift;
+ my $pkg = shift;
+
+ require CPAN;
+
+ my $mod = CPAN::Shell->expand( Module => $pkg );
+ return unless ($mod);
+ $file = $mod->cpan_file;
+ return $file;
+}
+
+=for private _dist_to_mods $distname
+
+Takes the output of CPAN::Module->cpan_file and return all the modules
+that CPAN.pm knows are in that dist. There's probably a beter way using CPANPLUS
+
+=cut
+
+sub _dist_to_mods {
+ my $self = shift;
+ my $file = shift;
+ my $dist = CPAN::Shell->expand( Distribution => $file );
+ my @mods = $dist->containsmods();
+ return @mods;
+}
+
+sub _seen_it {
+ my $self = shift;
+ my $pattern = shift;
+ if ( $self->{including_dep_dist}{ $self->_pkg_to_dist($pattern) }++ ) {
+ return 1;
+ }
+ return undef;
+}
+
1;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Makefile.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Makefile.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Makefile.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,10 +1,11 @@
package Module::Install::Admin::Makefile;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict 'vars';
-use vars '$VERSION';
use ExtUtils::MakeMaker ();
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Manifest.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Manifest.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Manifest.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::Admin::Manifest;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Metadata.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Metadata.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/Metadata.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,14 +1,12 @@
package Module::Install::Admin::Metadata;
-use strict;
use Module::Install::Base;
+ at ISA = 'Module::Install::Base';
-use vars qw{$VERSION @ISA};
-BEGIN {
- $VERSION = '0.03';
- @ISA = 'Module::Install::Base';
-}
+$VERSION = '0.03';
+use strict;
+
sub remove_meta {
my $self = shift;
my $package = ref($self->_top);
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/ScanDeps.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/ScanDeps.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/ScanDeps.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,15 +1,17 @@
package Module::Install::Admin::ScanDeps;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
sub scan_dependencies {
my ($self, $pkg, $perl_version) = @_;
return if $pkg eq 'perl';
- $perl_version ||= $self->perl_version or die << '.';
+ $perl_version ||= $self->perl_version or die <<'END_MESSAGE';
Please first specify a required perl version, like this:
- requires( perl => '5.004' );
-.
+ requires( perl => '5.005' );
+END_MESSAGE
$perl_version =~ s{^(\d+)\.(\d+)\.(\d+)}{$1 + $2/1_000 + $3/1_000_000}e;
require Module::ScanDeps;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/WriteAll.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/WriteAll.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin/WriteAll.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::Admin::WriteAll;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
sub WriteAll {
@@ -18,7 +20,7 @@
if ($self->sign and !-e 'MANIFEST.SKIP') {
local *FH;
open FH, '>MANIFEST.SKIP' or die $!;
- print FH << '.';
+ print FH <<'END_MANIFEST_SKIP';
#defaults
^Makefile$
^blib/
@@ -26,7 +28,7 @@
^blibdirs$
^Build$
^_build/
-.
+END_MANIFEST_SKIP
close FH;
open FH, '>>MANIFEST' or die $!;
print FH "MANIFEST.SKIP";
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,11 +1,14 @@
package Module::Install::Admin;
-$VERSION = '0.54';
+
+$VERSION = '0.55';
@ISA = 'Module::Install';
use strict 'vars';
use File::Path ();
use inc::Module::Install ();
+=pod
+
=head1 NAME
Module::Install::Admin - Author-side manager for Module::Install
@@ -273,6 +276,8 @@
__END__
+=pod
+
=head1 SEE ALSO
L<Module::Install>
Property changes on: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Admin.pm
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/AutoInstall.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/AutoInstall.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/AutoInstall.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::AutoInstall;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw{Module::Install::Base};
+
sub AutoInstall { $_[0] }
sub run {
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Base.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Base.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Base.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,8 +1,13 @@
package Module::Install::Base;
# Suspend handler for "redefined" warnings
-BEGIN { my $w = $SIG{__WARN__}; $SIG{__WARN__} = sub { $w } };
+BEGIN {
+ my $w = $SIG{__WARN__};
+ $SIG{__WARN__} = sub { $w };
+}
+=pod
+
=head1 NAME
Module::Install::Base - Base class for Module::Install extensions
@@ -11,7 +16,8 @@
In a B<Module::Install> extension:
- use Module::Install::Base; @ISA = qw(Module::Install::Base);
+ use Module::Install::Base;
+ @ISA = qw(Module::Install::Base);
=head1 DESCRIPTION
@@ -41,6 +47,8 @@
bless(\%args, $class);
}
+=pod
+
=item AUTOLOAD
The main dispatcher - copy extensions if missing
@@ -55,6 +63,8 @@
goto &$autoload;
}
+=pod
+
=item _top()
Returns the top-level B<Module::Install> object.
@@ -63,6 +73,8 @@
sub _top { $_[0]->{_top} }
+=pod
+
=item admin()
Returns the C<_top> object's associated B<Module::Install::Admin> object
@@ -73,13 +85,11 @@
=cut
sub admin {
- my $self = shift;
- $self->_top->{admin} or Module::Install::Base::FakeAdmin->new;
+ $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
}
sub is_admin {
- my $self = shift;
- $self->admin->VERSION;
+ $_[0]->admin->VERSION;
}
sub DESTROY {}
@@ -88,16 +98,20 @@
my $Fake;
sub new { $Fake ||= bless(\@_, $_[0]) }
+
sub AUTOLOAD {}
+
sub DESTROY {}
+# Restore warning handler
+BEGIN {
+ $SIG{__WARN__} = $SIG{__WARN__}->();
+}
+
1;
-# Restore warning handler
-BEGIN { $SIG{__WARN__} = $SIG{__WARN__}->() };
+=pod
-__END__
-
=back
=head1 SEE ALSO
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Build.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Build.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Build.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,8 +1,11 @@
package Module::Install::Build;
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
+
use strict;
-use vars qw(@ISA);
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
sub Build { $_[0] }
@@ -55,7 +58,6 @@
# <DrMath> ingy: then my $build = new MyBuilder( ...parameters... );
# $build->write_build_script;
-
1;
__END__
@@ -80,8 +82,8 @@
This module is a wrapper around B<Module::Build>.
-The C<&Build->write> function will pass on keyword/value pair functions
-to C<Module::Build::create_build_script>.
+The C<&Build-E<gt>write> function will pass on keyword/value pair
+functions to C<Module::Build::create_build_script>.
=head2 VERSION
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Bundle.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Bundle.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Bundle.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::Bundle;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.04';
use strict;
@@ -93,6 +95,8 @@
__END__
+=pod
+
=head1 NAME
Module::Install::Bundle - Bundle distributions along with your distribution
@@ -102,24 +106,24 @@
Have your Makefile.PL read as follows:
use inc::Module::Install;
-
+
name 'Foo-Bar';
all_from 'lib/Foo/Bar.pm';
requires 'Baz' => '1.60';
-
+
# one of either:
bundle 'Baz' => '1.60';
# OR:
auto_bundle;
+
+ WriteAll;
- &WriteAll;
-
=head1 DESCRIPTION
Module::Install::Bundle allows you to bundle a CPAN distribution within your
distribution. When your end-users install your distribution, the bundled
-distribution will be installed along with yours, unless a newer version of the
-bundled distribution already exists on their local filesystem.
+distribution will be installed along with yours, unless a newer version of
+the bundled distribution already exists on their local filesystem.
While bundling will increase the size of your distribution, it has several
benefits:
@@ -140,8 +144,8 @@
=item * auto_bundle()
Takes no arguments, will bundle every distribution specified by a C<requires()>.
-When you, as a module author, do a C<perl Makefile.PL> the latest versions of the
-distributions to be bundled will be acquired from CPAN and placed in
+When you, as a module author, do a C<perl Makefile.PL> the latest versions of
+the distributions to be bundled will be acquired from CPAN and placed in
F<inc/BUNDLES/>.
=item * bundle($name, $version)
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Can.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Can.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Can.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,5 +1,8 @@
package Module::Install::Can;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict;
@@ -52,7 +55,7 @@
if ($^O eq 'cygwin') {
require ExtUtils::MM_Cygwin;
require ExtUtils::MM_Win32;
- if (!defined(&ExtUtils::MM_Cygwin::maybe_command)) {
+ if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
*ExtUtils::MM_Cygwin::maybe_command = sub {
my ($self, $file) = @_;
if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Compiler.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Compiler.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Compiler.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,5 +1,8 @@
package Module::Install::Compiler;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict;
@@ -9,17 +12,23 @@
my $self = shift;
require Config;
my $_o = $Config::Config{_o};
- $self->makemaker_args(OBJECT => join ' ', map { substr($_, 0, -2) . $_o } @_);
+ $self->makemaker_args(
+ OBJECT => join ' ', map { substr($_, 0, -2) . $_o } @_
+ );
}
sub inc_paths {
my $self = shift;
- $self->makemaker_args(INC => join ' ', map { "-I$_" } @_);
+ $self->makemaker_args(
+ INC => join ' ', map { "-I$_" } @_
+ );
}
sub lib_paths {
my $self = shift;
- $self->makemaker_args(LIBS => join ' ', map { "-L$_" } @_);
+ $self->makemaker_args(
+ LIBS => join ' ', map { "-L$_" } @_
+ );
}
sub lib_links {
@@ -31,7 +40,9 @@
sub optimize_flags {
my $self = shift;
- $self->makemaker_args(OPTIMIZE => join ' ', @_);
+ $self->makemaker_args(
+ OPTIMIZE => join ' ', @_
+ );
}
1;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Fetch.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Fetch.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Fetch.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::Fetch;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
sub get_file {
@@ -8,7 +10,7 @@
my ($scheme, $host, $path, $file) =
$args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
- if ($scheme eq 'http' and !eval { require LWP::Simple; 1 }) {
+ if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
$args{url} = $args{ftp_url}
or (warn("LWP support unavailable!\n"), return);
($scheme, $host, $path, $file) =
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Include.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Include.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Include.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,9 +1,11 @@
package Module::Install::Include;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
sub include { +shift->admin->include(@_) };
sub include_deps { +shift->admin->include_deps(@_) };
sub auto_include { +shift->admin->auto_include(@_) };
sub auto_include_deps { +shift->admin->auto_include_deps(@_) };
-
+sub auto_include_dependent_dists { +shift->admin->auto_include_dependent_dists(@_) }
1;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Inline.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Inline.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Inline.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::Inline;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/MakeMaker.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/MakeMaker.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/MakeMaker.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::MakeMaker;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use ExtUtils::MakeMaker ();
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Name.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Name.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Name.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::Makefile::Name;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict;
@@ -10,7 +12,9 @@
my @modules = glob('*.pm');
require File::Find;
- File::Find::find(sub { push @modules, $File::Find::name if /\.pm/i }, 'lib');
+ File::Find::find( sub {
+ push @modules, $File::Find::name if /\.pm/i;
+ }, 'lib');
if (@modules == 1) {
local *MODULE;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Version.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Version.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile/Version.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::Makefile::Version;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict;
@@ -10,23 +12,30 @@
my @modules = glob('*.pm');
require File::Find;
- File::Find::find(sub { push @modules, $File::Find::name =~ /\.pm\z/i }, 'lib');
+ File::Find::find( sub {
+ push @modules, $File::Find::name =~ /\.pm\z/i;
+ }, 'lib' );
if (@modules == 1) {
eval {
- $self->version(ExtUtils::MM_Unix->parse_version($modules[0]));
+ $self->version(
+ ExtUtils::MM_Unix->parse_version($modules[0])
+ );
};
print STDERR $@ if $@;
- }
- elsif (my $file = "lib/" . $self->name . ".pm") {
+
+ } elsif ( my $file = "lib/" . $self->name . ".pm" ) {
$file =~ s!-!/!g;
- $self->version(ExtUtils::MM_Unix->parse_version($file)) if -f $file;
+ $self->version(
+ ExtUtils::MM_Unix->parse_version($file)
+ ) if -f $file;
+
}
- $self->version or die << "END";
+ $self->version or die << "END_MESSAGE";
Can't determine a VERSION for this distribution.
Please call the 'version' or 'version_from' function in Makefile.PL.
-END
+END_MESSAGE
}
1;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Makefile.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::Makefile;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict 'vars';
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Metadata.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Metadata.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Metadata.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,14 +1,12 @@
package Module::Install::Metadata;
-use strict 'vars';
use Module::Install::Base;
+ at ISA = qw{Module::Install::Base};
-use vars qw($VERSION @ISA);
-BEGIN {
- $VERSION = '0.06';
- @ISA = 'Module::Install::Base';
-}
+$VERSION = '0.06';
+use strict 'vars';
+
my @scalar_keys = qw{
name module_name abstract author version license
distribution_type perl_version tests
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/PAR.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/PAR.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/PAR.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::PAR;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
sub par_base {
my ($self, $base, $file) = @_;
my $class = ref($self);
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Run.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Run.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Run.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::Run;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
# eventually move the ipc::run / open3 stuff here.
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Scripts.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Scripts.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Scripts.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,10 @@
package Module::Install::Scripts;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.02';
+
use strict;
use File::Basename ();
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Share.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Share.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Share.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -3,29 +3,32 @@
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.01';
+$VERSION = '0.02';
use strict;
sub install_share {
- my $self = shift;
- my $dir = shift;
+ my ($self, $dir) = @_;
if ( ! defined $dir ) {
die "Cannot find the 'share' directory" unless -d 'share';
$dir = 'share';
}
- $self->postamble(<<".");
+ $self->postamble(<<"END_MAKEFILE");
config ::
\t\$(NOECHO) \$(MOD_INSTALL) \\
-\t\t\"$dir\" \$(INST_ARCHAUTODIR)
+\t\t\"$dir\" \$(INST_AUTODIR)
-.
+END_MAKEFILE
}
+1;
+
__END__
+=pod
+
=head1 NAME
Module::Install::Share - Install non-code files for use during runtime
@@ -44,11 +47,11 @@
need to install read-only data files to a location on the file system
for use at run-time.
-XML Schemas, YAML data files, and SQLite databases are examples of the
-sort of things distributions might typically need to have available
+XML Schemas, L<YAML> data files, and L<SQLite> databases are examples of
+the sort of things distributions might typically need to have available
after installation.
-Module::Install::Share is a L<Module::Install> extension that provides
+C<Module::Install::Share> is a L<Module::Install> extension that provides
commands to allow these files to be installed to the applicable location
on disk.
Property changes on: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Share.pm
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Win32.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Win32.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/Win32.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::Win32;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.02';
use strict;
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/WriteAll.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/WriteAll.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install/WriteAll.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -1,6 +1,8 @@
package Module::Install::WriteAll;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
sub WriteAll {
my $self = shift;
my %args = (
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pm
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pm 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pm 2006-02-01 10:00:55 UTC (rev 2065)
@@ -5,7 +5,7 @@
use vars qw{$VERSION};
BEGIN {
# Don't forget to update Module::Install::Admin too!
- $VERSION = '0.54';
+ $VERSION = '0.55';
}
# inc::Module::Install must be loaded first
Property changes on: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pm
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pod
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pod 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pod 2006-02-01 10:00:55 UTC (rev 2065)
@@ -6,8 +6,8 @@
=head1 VERSION
-This document describes version 0.54 of Module::Install, released
-January 11, 2006.
+This document describes version 0.55 of Module::Install, released
+January 27, 2006.
=head1 SYNOPSIS
@@ -16,12 +16,10 @@
# Load the Module::Install bundled in ./inc/
use inc::Module::Install;
- # Name of your distribution
+ # The name of your distribution
name 'Your-Module';
# Get most of the details from the primary module
- # (The filename argument below is optional if it is placed
- # consistently with the "name" above.)
all_from 'lib/Your/Module.pm';
requires 'Carp' => 0;
@@ -54,48 +52,56 @@
=head1 DESCRIPTION
-B<Module::Install> is a package for writing installers for CPAN distributions
-that are clean, simple and minimalistic, act in a strictly correct manner
-with B<both> the L<ExtUtils::MakeMaker> and L<Module::Build> build systems,
-and run on any Perl installation version 5.004 or newer.
+B<Module::Install> is a package for writing installers for CPAN (or
+CPAN-like) distributions that are clean, simple, minimalist, act in a
+strictly correct manner with B<both> the L<ExtUtils::MakeMaker> and
+L<Module::Build> build systems, and will run on any Perl installation
+version 5.004 or newer.
The intent is to make it as easy as possible for CPAN authors (and
especially for first-time CPAN authors) to have installers that follow
-all the best practices for distribution installation, but involve as much
-DWIM (Do What I Mean) as possible when writing them.
+all the best practices for distribution installation, but involve as
+much DWIM (Do What I Mean) as possible when writing them.
=head2 Writing Module::Install Installers
-The quickest way to get started with Module::Install is simply to cut
-and paste the L</SYNOPSIS> from above and create your F<Makefile.PL>
-using it, when modify the file to suit your particular case using the
-list of commands documented in L</COMMANDS> below.
+The quickest way to get started with Module::Install is to copy the
+L</SYNOPSIS> from above and save it as your own F<Makefile.PL>. Then
+modify the file to suit your own particular case, using the list of
+commands documented in L</COMMANDS> below.
-If all you want to do is write an installer, go do that now. You don't
-really need the rest of this description unless you are interested.
+If all you want to do is write an installer, go and do that now. You
+don't really need the rest of this description unless you are
+interested in the details.
=head1 How it Works
The motivation behind B<Module::Install> is that distributions need
-to interact with a large number of different versions of Perl module
-installers (primarily L<CPAN.pm>, L<CPANPLUS.pm>, L<ExtUtils::MakeMaker>
-and L<Module::Build>) which have B<greatly> varying feature and bug
-profiles.
+to interact with a large number of different versions of L<perl> and
+module installers infrastructure, primarily L<CPAN.pm>, L<CPANPLUS.pm>,
+L<ExtUtils::MakeMaker> and L<Module::Build>.
-For example, the L<CPAN.pm> version shipped with Perl 5.005 is now 5+ years
-old and considered highly buggy, yet it still exists on quite a number of
-legacy machines. Rather than try to target one specific installer and/or
-make you add twisty workaround expressions to your code, B<Module::Install>
-will copy part of itself into each module distribution it creates.
+These have accumulated B<greatly> varying feature and bug profiles over
+the years, and it is now very difficult to write an installer that will
+work properly using only the installed versions of these modules,
-This allows new improvements to be used regardless of the age of the system a
-distribution is being installed to, at the cost of a very small increase in the
-size of your module distribution.
+For example, the L<CPAN.pm> version shipped with Perl 5.005 is now 5+
+years old and considered highly buggy, yet it still exists on quite a
+number of legacy machines.
+Rather than try to target one specific installer and/or make you add
+twisty workaround expressions to every piece of install code you write,
+B<Module::Install> will copy part of itself into each module distribution
+it creates.
+
+This allows new improvements to be used in your installers regardless of
+the age of the system a distribution is being installed on, at the cost
+of a small increase in the size of your distribution.
+
=head2 History
-This module was originally written as a smart drop-in replacement for
-B<ExtUtils::MakeMaker> by Brian Ingerson.
+This module was originally written by Brian Ingerson as a smart drop-in
+replacement for L<ExtUtils::MakeMaker>.
For more information, see Brian's I<Creating Module Distributions with
Module::Install> in June 2003 issue of The Perl Journal
@@ -115,23 +121,29 @@
name 'My-Module';
-The B<name> command is a compulsory (and generally the first) command.
+The B<name> command is compulsory command, generally the first.
It provides the name of your distribution, which for a module like
B<Your::Module> would normally be C<Your-Module>.
+This naming scheme is not hard and fast and you should note that
+distributions are actually a seperate naming scheme.
+
+For example the L<LWP> modules come in a distribution called
+C<libwww-perl>.
+
=head2 all_from
all_from 'lib/My/Module.pm';
-For most simple or standard Perl distributions that feature one
-dominant module/class as the base, you can get the most Do What I Mean
-functionality by using the B<all_from> command, which will try to
-extract as much metadata as possible from the Perl and POD in the
-module itself.
+For most simple Perl distributions that feature one dominant module or
+class as the base, you can get the most Do What I Mean functionality by
+using the B<all_from> command, which will try to extract as much
+metadata as possible from the Perl code and POD in that primary module.
-C<all_from> is equivalent to C<abstract_from> + C<author_from> +
-C<version_from> + C<license_from> + C<perl_version_from>.
+Functionally, C<all_from> is equivalent to C<abstract_from> +
+C<author_from> + C<version_from> + C<license_from> +
+C<perl_version_from>. See below for details.
If any of these values are set already B<before> C<all_from> is used,
they will kept and B<not> be overwritten.
@@ -140,12 +152,12 @@
abstract 'This distribution does something';
-All distributions have an abstract, a short description of the entires
-distribution, usually around 30-70 characters long.
+All distributions have an abstract, a short description of the
+distribution as a whole. It is usually around 30-70 characters long.
The C<abstract> command is used to explicitly set the abstract for the
-distribution, at least as far as the distribution metadata file is
-concerned.
+distribution, at least as far as the metadata file for the distribution
+is concerned.
=head2 abstract_from
@@ -153,19 +165,25 @@
The C<abstract_from> command retrieves the abstract from a particular
file contained in the distribution package. Most often this is done
-from the main module, where it will read the POD and use whatever
-is in the C<=head1 NAME> section (with module name removed as needed)
+from the main module, where C<Module::Install> will read the POD and
+use whatever is in the C<=head1 NAME> section (with module name stripped
+if needed)
C<abstract_from> is set as part of C<all_from>.
=head2 author
- author 'Adam Kennedy <cpan at ali.as>';
+ author 'Adam Kennedy <adamk at cpan.org>';
-The distribution metadata contains information on the author of the
-primary author/maintainer of the distribution, in the form of an
-email address.
+The distribution metadata contains information on the primary author
+or the distribution, or the primary maintainer if the original author
+is no longer involved. It should generally be specified in the form
+of an email address.
+It you don't want to give away a real email address, you should use
+the C<CPANID at cpan.org> address you recieve automatically when you
+got your PAUSE account.
+
The C<author> command is used to explicitly set this value.
=head2 author_from
@@ -174,16 +192,16 @@
The C<author_from> command retrieves the author from a particular
file contained in the distribution package. Most often this is done
-from the main module, where it read the POD and use whatever it
-can find in the C<=head1 AUTHOR> section.
+using the main module, where L<Module::Install> will read the POD
+and use whatever it can find in the C<=head1 AUTHOR> section.
=head2 version
version '0.01';
The C<version> command is used to specify the version of the
-distribution, as distinct from the version of any module within the
-distribution.
+distribution, as distinct from the version of any single module within
+the distribution.
Of course, in almost all cases you want it to match the version of the
primary module within the distribution, which you can do using
@@ -198,7 +216,7 @@
done from the main module.
C<version_from> will look for the first time you set C<$VERSION> and use
-the same value, using a method consistent with various other module
+the same value, using a technique consistent with various other module
version scanning tools.
=head2 license
@@ -215,17 +233,21 @@
to include a F<LICENSE> file in the distribution, containing the full
license for the distribution.
+You are also reminded that if the distribution is intended to be uploaded
+to the CPAN, it B<must> be an OSI-approved open source license. Commercial
+software is not permitted on the CPAN.
+
=head2 license_from
license_from 'lib/My/Module.pm';
The C<license_from> command retrieves the distribution license from a
-particular file contained in the distribution package. Most often this is
-done from the main module.
+particular file contained in the distribution package. Most often this
+is done from the main module.
-C<license_from> will look inside the POD within the file for a licensing
-or copyright-related section and scan for a variety of strings that
-identify the general class of license.
+C<license_from> will look inside the POD within the indicated file for
+a licensing or copyright-related section and scan for a variety of
+strings that identify the general class of license.
At this time it supports only the 5 values mentioned above in the
C<license> command summary.
@@ -237,6 +259,10 @@
The C<perl_version> command is used to specify the minimum version of the
perl interpreter your distribution requires.
+When specifying the version, you should try to use the normalised version
+string. Perl version segments are 3 digits long, so a dependency on Perl
+5.6 will become C<'5.006'> and Perl 5.10 will become C<'5.010'>.
+
=head2 perl_version_from
perl_version_from 'lib/My/Module.pm'
@@ -262,7 +288,7 @@
and use this distribution, you must first install these modules first">.
Note that the dependency is on a B<module> and not a distribution. This
-is to ensure that you dependency stays correct, even if the module is
+is to ensure that your dependency stays correct, even if the module is
moved or merged into a different distribtion, as is occasionally the
case.
@@ -282,20 +308,21 @@
and testing of the distribution (often a period of only a few seconds)
but will B<not> be needed after the distribution is installed.
-The most common case by far is for testing modules to be specified
-this way.
+The most common case by far for the use of C<build_requires> is for
+various testing modules to be specified in this way.
The C<build_requires> command is used to allow the installer some
flexibility in how it provides the module.
-For example, the C<include> command is sometimes used to bundle a
-small testing module into the distribution package itself rather than
-inflict another module installation on the user.
+For example, the C<include> command is sometimes used by some authors
+along with C<build_requires> to bundle a small well-tested module into the
+distribution package itself rather than inflict yet another module
+installation on the user.
-In addition, when building a binary operating system packages (such as
-Debian .deb packages) from a CPAN distribution, the testing is done once
-by the packager, and so the C<build_requires> dependency can be safely
-ignored by the binary package.
+As another example, when building a binary operating system packages
+(such as Debian's .deb packages) from a CPAN distribution, the testing
+is done once by the packager, and so the C<build_requires> dependency
+can be safely ignored by the binary package.
=head2 no_index
@@ -317,6 +344,19 @@
The F<inc> and F<t> directories are automatically C<no_index>'ed for
you and do not require a command.
+To summarise, if you can see it on L<http://search.cpan.org/> and you
+shouldn't be able to, you need a C<no_index> entry.
+
+head2 can_run
+
+ can_run 'cvs';
+
+As part of its role as the dominant "glue" language, a log of Perl
+modules run commands or programs on the host.
+
+The C<can_run> command is used to verify that a particular command is
+available on the local host and can be run.
+
=head2 WriteAll
The C<WriteAll> command is generally the last command; it writes out
@@ -524,7 +564,7 @@
=over 4
-=item * Extremely easy to beginners to learn
+=item * Extremely easy for beginners to learn
=item * Does everything ExtUtils::MakeMaker does.
@@ -534,7 +574,7 @@
=item * Requires no installation for end-users.
-=item * Generate stock Makefile.PL for Module::Build users.
+=item * Generates a stock Build.PL for Module::Build users.
=item * Guaranteed forward-compatibility.
@@ -546,17 +586,17 @@
=item * Auto-installation of prerequisites.
-=item * Support for Inline-based modules.
+=item * Support for L<Inline>-based modules.
-=item * Support for File::ShareDir shared data files
+=item * Support for L<File::ShareDir> shared data files
-=item * Support for precompiled PAR binaries.
+=item * Support for precompiled L<PAR> binaries.
=item * Deals with Win32 install issues for you.
-=cut
+=back
-By greatly shrinking and simplifying the syntax B<Module::Install>
+By greatly shrinking and simplifying the syntax, B<Module::Install>
keeps the amount of work required to maintain your F<Makefile.PL>
files to an absolute minimum.
@@ -575,14 +615,15 @@
smallest possible F<Makefile.PL>.
use inc::Module::Install;
+
name 'Method-Alias';
all_from 'lib/Method/Alias.pm';
build_requires 'Test::More' => '0.42';
=head2 File::HomeDir
-L<File::HomeDir> locates your home directorie on any platform. It needs
-an installed that can handle different dependencies on different platforms.
+L<File::HomeDir> locates your home directory on any platform. It needs
+an installer that can handle different dependencies on different platforms.
use inc::Module::Install;
Property changes on: packages/libmodule-install-perl/branches/upstream/current/lib/Module/Install.pod
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libmodule-install-perl/branches/upstream/current/t/3-autoinstall.t
===================================================================
--- packages/libmodule-install-perl/branches/upstream/current/t/3-autoinstall.t 2006-01-30 16:03:52 UTC (rev 2064)
+++ packages/libmodule-install-perl/branches/upstream/current/t/3-autoinstall.t 2006-02-01 10:00:55 UTC (rev 2065)
@@ -2,7 +2,6 @@
use strict;
use Test;
-use Data::Dumper;
BEGIN { plan tests => 6; $^W = 0; };
@@ -37,47 +36,48 @@
# calls the module.
ok(eval <<'.', $@);
use Module::AutoInstall (
- -version => '0.21', # Module::AutoInstall version
- -config => {
- make_args => '--hello' # option(s) for CPAN::Config
+ -version => '0.21', # Module::AutoInstall version
+ -config => {
+ make_args => '--hello' # option(s) for CPAN::Config
},
- -core => [ # core modules
- Package0 => '', # any version would do
+ -core => [ # core modules
+ Package0 => '', # any version would do
],
- 'Feature1' => [
- # do we want to install this feature by default?
- -default => 0,
- Package1 => '0.01',
+ 'Feature1' => [
+ # do we want to install this feature by default?
+ -default => 0,
+ Package1 => '0.01',
],
- 'Feature2' => [
- # associate tests to be disabled along with this
- -tests => [ $0 ],
- Package2 => '0.02',
+ 'Feature2' => [
+ # associate tests to be disabled along with this
+ -tests => [ $0 ],
+ Package2 => '0.02',
],
- 'Feature3' => { # hash reference works, too
- Package3 => '0.03',
+ 'Feature3' => { # hash reference works, too
+ Package3 => '0.03',
},
); '';
.
# simulates a makefile.
WriteMakefile(
- AUTHOR => 'Joe Hacker (joe at hacker.org)',
- ABSTRACT => 'Perl Interface to Joe Hacker',
- NAME => 'Joe::Hacker',
- VERSION_FROM => 'Hacker.pm',
- DISTNAME => 'Joe-Hacker',
- EXE_FILES => [ qw/foo bar baz/ ],
+ AUTHOR => 'Zoe Hacker <joe at hacker.org>',
+ ABSTRACT => 'Perl Interface to Zoe Hacker',
+ NAME => 'Zoe::Hacker',
+ VERSION_FROM => 'Hacker.pm',
+ DISTNAME => 'Zoe-Hacker',
+ EXE_FILES => [ qw/foo bar baz/ ],
);
# XXX - test currently disabled in anticipation of a
# rewrite using Test::MockObject.
-exit;
+__END__
+use Data::Dumper;
$$out =~ s/.*\n//; # strip the version-dependent line.
-ok($$out, qr/\Q*** Checking for dependencies...
+ok($$out =~ /\Q*** Checking for dependencies...
[Core Features]
- Package0 ...failed! (needed)
[Feature1]
@@ -95,12 +95,12 @@
ok(
Data::Dumper::Dumper($mm_args),
Data::Dumper::Dumper({
- ABSTRACT => 'Perl Interface to Joe Hacker',
- test => { 'TESTS' => '' },
- NAME => 'Joe::Hacker',
- DISTNAME => 'Joe-Hacker',
- AUTHOR => 'Joe Hacker (joe at hacker.org)',
- EXE_FILES => [],
- VERSION_FROM => 'Hacker.pm',
+ ABSTRACT => 'Perl Interface to Zoe Hacker',
+ test => { 'TESTS' => '' },
+ NAME => 'Zoe::Hacker',
+ DISTNAME => 'Zoe-Hacker',
+ AUTHOR => 'Zoe Hacker (joe at hacker.org)',
+ EXE_FILES => [],
+ VERSION_FROM => 'Hacker.pm',
})
);
More information about the Pkg-perl-cvs-commits
mailing list