From: Tels Date: Sat, 24 Feb 2007 10:24:36 +0000 (-0800) Subject: import Devel-Size 0.65 from CPAN X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0430b7f7f7dea4bc4c9d7b05fced5234ddb53bb9;p=p5sagit%2FDevel-Size.git import Devel-Size 0.65 from CPAN git-cpan-module: Devel-Size git-cpan-version: 0.65 git-cpan-authorid: TELS git-cpan-file: authors/id/T/TE/TELS/devel/Devel-Size-0.65.tar.gz --- diff --git a/Build.PL b/Build.PL new file mode 100644 index 0000000..82352be --- /dev/null +++ b/Build.PL @@ -0,0 +1,5 @@ +#!/usr/bin/perl -w + +# Dear Distribution Packager. This use of require is intentional. +# Module::Install detects Build.PL usage and acts accordingly. +require 'Makefile.PL'; diff --git a/Changes b/CHANGES old mode 100755 new mode 100644 similarity index 78% rename from Changes rename to CHANGES index 3815b8c..34f600a --- a/Changes +++ b/CHANGES @@ -1,54 +1,68 @@ Revision history for Perl extension Devel::Size. -0.01 Mon Oct 7 01:05:32 2002 - - original version; created by h2xs 1.2 with options - -A -n Devel::Size +0.65 2007-02-24 Tels 15 tests + * fix the test failings under 64 bit (bugs #21037, #18596, #21404) + * fix wrong size for strings (bug #17586) + * reverse Changelog (bug #16636) + * Size.xs: remove unused variable "count" + * Size.xs: fix warnings about missing () + * Size.xs: fix size of array refs when AvALLOC == 0 + * Modernize package: + + maintained by me, signed with my key + + bundle Module::Install and use it + + add POD tests + + rewrite tests to use Test::More; add more tests -0.53 Thu Oct 10 12:30:00 2002 - - Finally started updating Changes file - - Applied doc patch from Ann Barcomb - - Got globs sizing right +0.64 Mon Dec 19 18:46:00 2005 + - Patch to make Devel::Size compile on bleadperl (Courtesy of + Nick Clark) + - Fix up the PVIV string size calcs (Courtesy of Andrew Shirrayev) -0.54 Sat Oct 12 14:11:00 2002 - - Applied a patch to get it working on 5.8.0 under Tru64 +0.63 Thu Jun 30 14:29:43 2005 + - Turns out that OP_TRANS is a basic op, not a loop op. This + is a bug in versions of perl 5.8.x before 5.8.7. Work around + it. -0.55 Sat Feb 22 17:21:00 2003 - - Fixed a bad size calculation (we were overestimating by one byte) - - Updated the docs to show some of the places that there might be 'dark' - memory that Devel::Size can't see. - - Added in tests from Ken Williams +0.62 Tue Jun 28 11:59:00 2005 + - Took out // comments + - Added in copyright notice + - Some small amount of regex parsing + - Suppress multiple copies of each warning on each call -0.56 Mon Feb 24 12:10:13 2003 - - Chopped out some C++ comments. D'oh! Version incremented for CPAN +0.61 Mon Jun 27 16:19:00 2005 + - Added more checks for formats + - Got CVs sizing right -0.57 Thu Mar 20 13:21:14 2003 - - setting $Devel::Size::warn to 0 disables not complete warnings +0.59 Sat Nov 27 16:42:42 2004 + - Applied documentation and sane warning patch from Nigel Sandever + - Taught Devel::Size how to size up IO and globs properly 0.58 Fri Jul 18 11:42:32 2003 - Fix for problems triggered by perl 5.8.0 and up, more tests, and removal of an "our" for better backwards compatibility. (Courtesy of Marcus Holland-Moritz ) -0.59 Sat Nov 27 16:42:42 2004 - - Applied documentation and sane warning patch from Nigel Sandever - - Taught Devel::Size how to size up IO and globs properly +0.57 Thu Mar 20 13:21:14 2003 + - setting $Devel::Size::warn to 0 disables not complete warnings -0.61 Mon Jun 27 16:19:00 2005 - - Added more checks for formats - - Got CVs sizing right +0.56 Mon Feb 24 12:10:13 2003 + - Chopped out some C++ comments. D'oh! Version incremented for CPAN -0.62 Tue Jun 28 11:59:00 2005 - - Took out // comments - - Added in copyright notice - - Some small amount of regex parsing - - Suppress multiple copies of each warning on each call +0.55 Sat Feb 22 17:21:00 2003 + - Fixed a bad size calculation (we were overestimating by one byte) + - Updated the docs to show some of the places that there might be 'dark' + memory that Devel::Size can't see. + - Added in tests from Ken Williams -0.63 Thu Jun 30 14:29:43 2005 - - Turns out that OP_TRANS is a basic op, not a loop op. This - is a bug in versions of perl 5.8.x before 5.8.7. Work around - it. +0.54 Sat Oct 12 14:11:00 2002 + - Applied a patch to get it working on 5.8.0 under Tru64 + +0.53 Thu Oct 10 12:30:00 2002 + - Finally started updating Changes file + - Applied doc patch from Ann Barcomb + - Got globs sizing right + +0.01 Mon Oct 7 01:05:32 2002 + - original version; created by h2xs 1.2 with options + -A -n Devel::Size -0.64 Mon Dec 19 18:46:00 2005 - - Patch to make Devel::Size compile on bleadperl (Courtesy of - Nick Clark) - - Fix up the PVIV string size calcs (Courtesy of Andrew Shirrayev) \ No newline at end of file diff --git a/MANIFEST b/MANIFEST old mode 100755 new mode 100644 index 21b8387..158926e --- a/MANIFEST +++ b/MANIFEST @@ -1,7 +1,21 @@ -Changes -MANIFEST +Build.PL +CHANGES +inc/Module/Install.pm +inc/Module/Install/Base.pm +inc/Module/Install/Build.pm +inc/Module/Install/Can.pm +inc/Module/Install/Fetch.pm +inc/Module/Install/Makefile.pm +inc/Module/Install/Metadata.pm +inc/Module/Install/Win32.pm +inc/Module/Install/WriteAll.pm +lib/Devel/Size.pm Makefile.PL -Size.pm +MANIFEST +MANIFEST.SKIP +META.yml Module meta-data (added by MakeMaker) +SIGNATURE Size.xs t/basic.t -META.yml Module meta-data (added by MakeMaker) +t/pod.t +t/pod_cov.t diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP new file mode 100644 index 0000000..8b9d4e4 --- /dev/null +++ b/MANIFEST.SKIP @@ -0,0 +1,13 @@ +# This file defines regluar expressions that, when matching a file, +# prevent this file to be added to the MANIFEST during a +# +# make manifest +# command. +# +^Devel-Size.*\.tar\.gz +^Makefile.old +^Makefile\z +^pm_to_blib +^MANIFEST.(bak|old) +^Size.(c|o|bs) +^blib.* diff --git a/META.yml b/META.yml index 4c20f43..de58cc2 100644 --- a/META.yml +++ b/META.yml @@ -1,10 +1,18 @@ -# http://module-build.sourceforge.net/META-spec.html -#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# -name: Devel-Size -version: 0.64 -version_from: Size.pm -installdirs: site -requires: - +abstract: Perl extension for finding the memory usage of Perl variables +author: Tels +build_requires: + Test::More: 0.42 distribution_type: module -generated_by: ExtUtils::MakeMaker version 6.17 +generated_by: Module::Install version 0.64 +license: perl +name: Devel-Size +no_index: + directory: + - examples + - inc + - t +recommends: + Devel::Size::Report: 0.11 +requires: + DynaLoader: 0 +version: 0.65 diff --git a/Makefile.PL b/Makefile.PL old mode 100755 new mode 100644 index 6426fb2..714a196 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,11 +1,29 @@ -use ExtUtils::MakeMaker; -# See lib/ExtUtils/MakeMaker.pm for details of how to influence -# the contents of the Makefile that is written. -WriteMakefile( - 'NAME' => 'Devel::Size', - 'VERSION_FROM' => 'Size.pm', # finds $VERSION - 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1 - 'LIBS' => [''], # e.g., '-lm' - 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' - 'INC' => '', # e.g., '-I/usr/include/other' -); + +use strict; + +# Load the Module::Install bundled in ./inc/ +use inc::Module::Install; + +# The name of your distribution +name 'Devel-Size'; + +# Get most of the details from the primary module +all_from 'lib/Devel/Size.pm'; + +requires 'DynaLoader' => 0; + +recommends 'Devel::Size::Report' => 0.11; + +build_requires 'Test::More' => 0.42; + +license 'perl'; + +# It seems not to be possible to specifiy two authors here :/ +# Nor does a "maintainer" property exist +author 'Tels '; + +# Do not index these +no_index directory => 'examples'; + +# Generate the Makefile +WriteAll; diff --git a/SIGNATURE b/SIGNATURE new file mode 100644 index 0000000..ddc2fa6 --- /dev/null +++ b/SIGNATURE @@ -0,0 +1,47 @@ +This file contains message digests of all files listed in MANIFEST, +signed via the Module::Signature module, version 0.54. + +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 38dd40d4fe9a8a408648f2f2c1a2a3ac76bbac72 Build.PL +SHA1 4a8ab802f0246e9161adf3226bcea18eb3e2e1f1 CHANGES +SHA1 34c2335f7a87ba91a983fe877e916ea4481dd10e MANIFEST +SHA1 134aae6f44102ce9b0f7fa7a3710e41a0cd23646 MANIFEST.SKIP +SHA1 aeb7a1f4ec3bff0aaa86899465ff5fed8b55c44c META.yml +SHA1 6ed187e4890948dacf792b44ab18fa143a580ace Makefile.PL +SHA1 498997a1a0785e1088db3fc85a47583cd1ad02cf Size.xs +SHA1 9b2f9d83bcf77860f53a0c07c90a4a59ad9f5df1 inc/Module/Install.pm +SHA1 abe32855d75ab13747cf65765af9947b7a8c3057 inc/Module/Install/Base.pm +SHA1 da9dfbb8ae4a8a8bac0ab9cd7ef7dc89e4cb5dbe inc/Module/Install/Build.pm +SHA1 95b81d1e91bd634467bf633571eff4420e9c04eb inc/Module/Install/Can.pm +SHA1 1fe98c63cf9d7271c8cb4183ba230f152df69e26 inc/Module/Install/Fetch.pm +SHA1 2249171a2b72cd73ff2c0a06597d29f86e5df456 inc/Module/Install/Makefile.pm +SHA1 381bb98ea3877bba49ae85e7a7ea130645fd3dbf inc/Module/Install/Metadata.pm +SHA1 0c2118868ef82ac517eb6d9c3bd93e6eb9bbf83e inc/Module/Install/Win32.pm +SHA1 e827d6d43771032fa3df35c0ad5e5698d0e54cda inc/Module/Install/WriteAll.pm +SHA1 f5e212f4a473774994d5c61fb00c964eeb3bf70b lib/Devel/Size.pm +SHA1 2a822b188f485321f42dadc8070a149fa3739345 t/basic.t +SHA1 dc638392e64661dd07deeba11f67e35650a6384a t/pod.t +SHA1 cab9b9f7a912f8a18e5301841da22dead08d00f3 t/pod_cov.t +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iQEVAwUBReARkXcLPEOTuEwVAQIS7Af+PZZ+sHiOy24JgA9uGb1Liqk2yh7w5Lm9 +H2mm2alzmdJE8UJZem4p4UdNJu7GKpYXwS3V4+3hm9QRxgW8OKc4Lk2n6tB9183Z +bb384K8OSCZ+vl4uqfNDl0ZpC+zZTZGJYksuIEOKfuyqQ4grd4mRZvAh3q/+T2sV +8urvEccXw0R66kYpxjFTv2/Y5LYZV1/Aa4nPtYaI01cRuKvf0X4eZEYaL7ZAN3d4 +0rDgZHK5WEIXObvRl2hdrd9a1+mo4maCzkbv0l3+vPPU1wfvdP9S48cr/LsYTwno +ERj9tUPeNyiKkOZMRWzBp2Dywmru6snDGZaQ14xg3DZHThU5JLRYwA== +=9TvO +-----END PGP SIGNATURE----- diff --git a/Size.xs b/Size.xs old mode 100755 new mode 100644 index 76a4f55..be6cf53 --- a/Size.xs +++ b/Size.xs @@ -40,7 +40,7 @@ cc_opclass(OP *o) return OPc_PADOP; #endif - if (o->op_type = OP_TRANS) { + if ((o->op_type = OP_TRANS)) { return OPc_BASEOP; } @@ -400,7 +400,9 @@ UV thing_size(SV *orig_thing, HV *tracking_hash) { case SVt_PVIV: total_size += sizeof(XPVIV); total_size += SvLEN(thing); - total_size += SvIVX(thing); + if(SvOOK(thing)) { + total_size += SvIVX(thing); + } break; /* A string with a float part? */ case SVt_PVNV: @@ -412,11 +414,13 @@ UV thing_size(SV *orig_thing, HV *tracking_hash) { total_size += SvLEN(thing); total_size += magic_size(thing, tracking_hash); break; +#if PERL_VERSION <= 8 case SVt_PVBM: total_size += sizeof(XPVBM); total_size += SvLEN(thing); total_size += magic_size(thing, tracking_hash); break; +#endif case SVt_PVLV: total_size += sizeof(XPVLV); total_size += SvLEN(thing); @@ -431,7 +435,16 @@ UV thing_size(SV *orig_thing, HV *tracking_hash) { total_size += sizeof(SV *) * AvMAX(thing); } /* Add in the bits on the other side of the beginning */ - total_size += (sizeof(SV *) * (AvARRAY(thing) - AvALLOC(thing))); + + /* + printf ("total_size %li, sizeof(SV *) %li, AvARRAY(thing) %li, AvALLOC(thing)%li , sizeof(ptr) %li \n", + total_size, sizeof(SV*), AvARRAY(thing), AvALLOC(thing), sizeof( thing )); */ + + /* under Perl 5.8.8 64bit threading, AvARRAY(thing) was a pointer while AvALLOC was 0, + resulting in grossly overstated sized for arrays */ + if (AvALLOC(thing) != 0) { + total_size += (sizeof(SV *) * (AvARRAY(thing) - AvALLOC(thing))); + } /* Is there something hanging off the arylen element? */ if (AvARYLEN(thing)) { if (check_new(tracking_hash, AvARYLEN(thing))) { @@ -512,22 +525,22 @@ UV thing_size(SV *orig_thing, HV *tracking_hash) { total_size += sizeof(GP); { SV *generic_thing; - if (generic_thing = (SV *)(GvGP(thing)->gp_sv)) { + if ((generic_thing = (SV *)(GvGP(thing)->gp_sv))) { total_size += thing_size(generic_thing, tracking_hash); } - if (generic_thing = (SV *)(GvGP(thing)->gp_form)) { + if ((generic_thing = (SV *)(GvGP(thing)->gp_form))) { total_size += thing_size(generic_thing, tracking_hash); } - if (generic_thing = (SV *)(GvGP(thing)->gp_av)) { + if ((generic_thing = (SV *)(GvGP(thing)->gp_av))) { total_size += thing_size(generic_thing, tracking_hash); } - if (generic_thing = (SV *)(GvGP(thing)->gp_hv)) { + if ((generic_thing = (SV *)(GvGP(thing)->gp_hv))) { total_size += thing_size(generic_thing, tracking_hash); } - if (generic_thing = (SV *)(GvGP(thing)->gp_egv)) { + if ((generic_thing = (SV *)(GvGP(thing)->gp_egv))) { total_size += thing_size(generic_thing, tracking_hash); } - if (generic_thing = (SV *)(GvGP(thing)->gp_cv)) { + if ((generic_thing = (SV *)(GvGP(thing)->gp_cv))) { total_size += thing_size(generic_thing, tracking_hash); } } @@ -644,8 +657,6 @@ CODE: IV size = 0; SV *warn_flag; - IV count = 0; - /* Size starts at zero */ RETVAL = 0; @@ -693,7 +704,7 @@ CODE: /* Run through them all */ for (index = 0; index <= av_len(tempAV); index++) { /* Did we get something? */ - if (tempSV = av_fetch(tempAV, index, 0)) { + if ((tempSV = av_fetch(tempAV, index, 0))) { /* Was it undef? */ if (*tempSV != &PL_sv_undef) { /* Apparently not. Save it for later */ @@ -709,7 +720,7 @@ CODE: /* Is there anything in here? */ if (hv_iterinit((HV *)thing)) { HE *temp_he; - while (temp_he = hv_iternext((HV *)thing)) { + while ((temp_he = hv_iternext((HV *)thing))) { av_push(pending_array, hv_iterval((HV *)thing, temp_he)); } } diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm new file mode 100644 index 0000000..0330b0e --- /dev/null +++ b/inc/Module/Install.pm @@ -0,0 +1,281 @@ +#line 1 +package Module::Install; + +# For any maintainers: +# The load order for Module::Install is a bit magic. +# It goes something like this... +# +# IF ( host has Module::Install installed, creating author mode ) { +# 1. Makefile.PL calls "use inc::Module::Install" +# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install +# 3. The installed version of inc::Module::Install loads +# 4. inc::Module::Install calls "require Module::Install" +# 5. The ./inc/ version of Module::Install loads +# } ELSE { +# 1. Makefile.PL calls "use inc::Module::Install" +# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install +# 3. The ./inc/ version of Module::Install loads +# } + +use 5.004; +use strict 'vars'; + +use vars qw{$VERSION}; +BEGIN { + # All Module::Install core packages now require synchronised versions. + # This will be used to ensure we don't accidentally load old or + # different versions of modules. + # This is not enforced yet, but will be some time in the next few + # releases once we can make sure it won't clash with custom + # Module::Install extensions. + $VERSION = '0.64'; +} + +# Whether or not inc::Module::Install is actually loaded, the +# $INC{inc/Module/Install.pm} is what will still get set as long as +# the caller loaded module this in the documented manner. +# If not set, the caller may NOT have loaded the bundled version, and thus +# they may not have a MI version that works with the Makefile.PL. This would +# result in false errors or unexpected behaviour. And we don't want that. +my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; +unless ( $INC{$file} ) { + die <<"END_DIE"; +Please invoke ${\__PACKAGE__} with: + + use inc::${\__PACKAGE__}; + +not: + + use ${\__PACKAGE__}; + +END_DIE +} + +# If the script that is loading Module::Install is from the future, +# then make will detect this and cause it to re-run over and over +# again. This is bad. Rather than taking action to touch it (which +# is unreliable on some platforms and requires write permissions) +# for now we should catch this and refuse to run. +if ( -f $0 and (stat($0))[9] > time ) { + die << "END_DIE"; +Your installer $0 has a modification time in the future. + +This is known to create infinite loops in make. + +Please correct this, then run $0 again. + +END_DIE +} + +use Cwd (); +use File::Find (); +use File::Path (); +use FindBin; + +*inc::Module::Install::VERSION = *VERSION; +@inc::Module::Install::ISA = __PACKAGE__; + +sub autoload { + my $self = shift; + my $who = $self->_caller; + my $cwd = Cwd::cwd(); + my $sym = "${who}::AUTOLOAD"; + $sym->{$cwd} = sub { + my $pwd = Cwd::cwd(); + if ( my $code = $sym->{$pwd} ) { + # delegate back to parent dirs + goto &$code unless $cwd eq $pwd; + } + $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym"; + unshift @_, ($self, $1); + goto &{$self->can('call')} unless uc($1) eq $1; + }; +} + +sub import { + my $class = shift; + my $self = $class->new(@_); + my $who = $self->_caller; + + unless ( -f $self->{file} ) { + require "$self->{path}/$self->{dispatch}.pm"; + File::Path::mkpath("$self->{prefix}/$self->{author}"); + $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); + $self->{admin}->init; + @_ = ($class, _self => $self); + goto &{"$self->{name}::import"}; + } + + *{"${who}::AUTOLOAD"} = $self->autoload; + $self->preload; + + # Unregister loader and worker packages so subdirs can use them again + delete $INC{"$self->{file}"}; + delete $INC{"$self->{path}.pm"}; +} + +sub preload { + my ($self) = @_; + + unless ( $self->{extensions} ) { + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ); + } + + my @exts = @{$self->{extensions}}; + unless ( @exts ) { + my $admin = $self->{admin}; + @exts = $admin->load_all_extensions; + } + + my %seen; + foreach my $obj ( @exts ) { + while (my ($method, $glob) = each %{ref($obj) . '::'}) { + next unless $obj->can($method); + next if $method =~ /^_/; + next if $method eq uc($method); + $seen{$method}++; + } + } + + my $who = $self->_caller; + foreach my $name ( sort keys %seen ) { + *{"${who}::$name"} = sub { + ${"${who}::AUTOLOAD"} = "${who}::$name"; + goto &{"${who}::AUTOLOAD"}; + }; + } +} + +sub new { + my ($class, %args) = @_; + + # ignore the prefix on extension modules built from top level. + my $base_path = Cwd::abs_path($FindBin::Bin); + unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { + delete $args{prefix}; + } + + return $args{_self} if $args{_self}; + + $args{dispatch} ||= 'Admin'; + $args{prefix} ||= 'inc'; + $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); + $args{bundle} ||= 'inc/BUNDLES'; + $args{base} ||= $base_path; + $class =~ s/^\Q$args{prefix}\E:://; + $args{name} ||= $class; + $args{version} ||= $class->VERSION; + unless ( $args{path} ) { + $args{path} = $args{name}; + $args{path} =~ s!::!/!g; + } + $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; + + bless( \%args, $class ); +} + +sub call { + my ($self, $method) = @_; + my $obj = $self->load($method) or return; + splice(@_, 0, 2, $obj); + goto &{$obj->can($method)}; +} + +sub load { + my ($self, $method) = @_; + + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ) unless $self->{extensions}; + + foreach my $obj (@{$self->{extensions}}) { + return $obj if $obj->can($method); + } + + my $admin = $self->{admin} or die <<"END_DIE"; +The '$method' method does not exist in the '$self->{prefix}' path! +Please remove the '$self->{prefix}' directory and run $0 again to load it. +END_DIE + + my $obj = $admin->load($method, 1); + push @{$self->{extensions}}, $obj; + + $obj; +} + +sub load_extensions { + my ($self, $path, $top) = @_; + + unless ( grep { lc $_ eq lc $self->{prefix} } @INC ) { + unshift @INC, $self->{prefix}; + } + + foreach my $rv ( $self->find_extensions($path) ) { + my ($file, $pkg) = @{$rv}; + next if $self->{pathnames}{$pkg}; + + local $@; + my $new = eval { require $file; $pkg->can('new') }; + unless ( $new ) { + warn $@ if $@; + next; + } + $self->{pathnames}{$pkg} = delete $INC{$file}; + push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); + } + + $self->{extensions} ||= []; +} + +sub find_extensions { + my ($self, $path) = @_; + + my @found; + File::Find::find( sub { + my $file = $File::Find::name; + return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; + my $subpath = $1; + return if lc($subpath) eq lc($self->{dispatch}); + + $file = "$self->{path}/$subpath.pm"; + my $pkg = "$self->{name}::$subpath"; + $pkg =~ s!/!::!g; + + # If we have a mixed-case package name, assume case has been preserved + # correctly. Otherwise, root through the file to locate the case-preserved + # version of the package name. + if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { + open PKGFILE, "<$subpath.pm" or die "find_extensions: Can't open $subpath.pm: $!"; + my $in_pod = 0; + while ( ) { + $in_pod = 1 if /^=\w/; + $in_pod = 0 if /^=cut/; + next if ($in_pod || /^=cut/); # skip pod text + next if /^\s*#/; # and comments + if ( m/^\s*package\s+($pkg)\s*;/i ) { + $pkg = $1; + last; + } + } + close PKGFILE; + } + + push @found, [ $file, $pkg ]; + }, $path ) if -d $path; + + @found; +} + +sub _caller { + my $depth = 0; + my $call = caller($depth); + while ( $call eq __PACKAGE__ ) { + $depth++; + $call = caller($depth); + } + return $call; +} + +1; diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm new file mode 100644 index 0000000..30a24ca --- /dev/null +++ b/inc/Module/Install/Base.pm @@ -0,0 +1,70 @@ +#line 1 +package Module::Install::Base; + +$VERSION = '0.64'; + +# Suspend handler for "redefined" warnings +BEGIN { + my $w = $SIG{__WARN__}; + $SIG{__WARN__} = sub { $w }; +} + +### This is the ONLY module that shouldn't have strict on +# use strict; + +#line 41 + +sub new { + my ($class, %args) = @_; + + foreach my $method ( qw(call load) ) { + *{"$class\::$method"} = sub { + shift()->_top->$method(@_); + } unless defined &{"$class\::$method"}; + } + + bless( \%args, $class ); +} + +#line 61 + +sub AUTOLOAD { + my $self = shift; + local $@; + my $autoload = eval { $self->_top->autoload } or return; + goto &$autoload; +} + +#line 76 + +sub _top { $_[0]->{_top} } + +#line 89 + +sub admin { + $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new; +} + +sub is_admin { + $_[0]->admin->VERSION; +} + +sub DESTROY {} + +package Module::Install::Base::FakeAdmin; + +my $Fake; +sub new { $Fake ||= bless(\@_, $_[0]) } + +sub AUTOLOAD {} + +sub DESTROY {} + +# Restore warning handler +BEGIN { + $SIG{__WARN__} = $SIG{__WARN__}->(); +} + +1; + +#line 138 diff --git a/inc/Module/Install/Build.pm b/inc/Module/Install/Build.pm new file mode 100644 index 0000000..2230386 --- /dev/null +++ b/inc/Module/Install/Build.pm @@ -0,0 +1,69 @@ +#line 1 +package Module::Install::Build; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +sub Build { $_[0] } + +sub write { + my $self = shift; + die "Build->write() takes no arguments\n" if @_; + + my %args; + my $build; + + $args{dist_name} = $self->name || $self->determine_NAME($self->{args}); + $args{license} = $self->license; + $args{test_files} = $self->tests; + $args{dist_version} = $self->version || $self->determine_VERSION($self->{args}); + $args{dist_abstract} = $self->abstract; + $args{dist_author} = $self->author; + $args{sign} = $self->sign; + $args{no_index} = $self->no_index; + + foreach my $key (qw(build_requires requires recommends conflicts)) { + my $val = eval "\$self->$key" or next; + $args{$key} = { map @$_, @$val }; + } + + %args = map {($_, $args{$_})} grep {defined($args{$_})} keys %args; + + require Module::Build; + $build = Module::Build->new(%args); + $build->add_to_cleanup(split /\s+/, $self->clean_files); + $build->create_build_script; +} + +sub ACTION_reset { + my ($self) = @_; + die "XXX - Can't get this working yet"; + require File::Path; + warn "Removing inc\n"; + rmpath('inc'); +} + +sub ACTION_dist { + my ($self) = @_; + die "XXX - Can't get this working yet"; +} + +# DrMath: is there an OO way to add actions to Module::Build?? +# ingy: yeah +# ingy: package MyBuilder; use w(Module::Build; @ISA = qw(w(Module::Build); sub ACTION_ingy +# {...} +# ingy: then my $build = new MyBuilder( ...parameters... ); +# $build->write_build_script; + +1; + +__END__ + +#line 180 diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm new file mode 100644 index 0000000..1c01e22 --- /dev/null +++ b/inc/Module/Install/Can.pm @@ -0,0 +1,82 @@ +#line 1 +package Module::Install::Can; + +use strict; +use Module::Install::Base; +use Config (); +### This adds a 5.005 Perl version dependency. +### This is a bug and will be fixed. +use File::Spec (); +use ExtUtils::MakeMaker (); + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +# check if we can load some module +### Upgrade this to not have to load the module if possible +sub can_use { + my ($self, $mod, $ver) = @_; + $mod =~ s{::|\\}{/}g; + $mod .= '.pm' unless $mod =~ /\.pm$/i; + + my $pkg = $mod; + $pkg =~ s{/}{::}g; + $pkg =~ s{\.pm$}{}i; + + local $@; + eval { require $mod; $pkg->VERSION($ver || 0); 1 }; +} + +# check if we can run some command +sub can_run { + my ($self, $cmd) = @_; + + my $_cmd = $cmd; + return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); + + for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { + my $abs = File::Spec->catfile($dir, $_[1]); + return $abs if (-x $abs or $abs = MM->maybe_command($abs)); + } + + return; +} + +# can we locate a (the) C compiler +sub can_cc { + my $self = shift; + my @chunks = split(/ /, $Config::Config{cc}) or return; + + # $Config{cc} may contain args; try to find out the program part + while (@chunks) { + return $self->can_run("@chunks") || (pop(@chunks), next); + } + + return; +} + +# Fix Cygwin bug on maybe_command(); +if ( $^O eq 'cygwin' ) { + require ExtUtils::MM_Cygwin; + require ExtUtils::MM_Win32; + 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')) { + ExtUtils::MM_Win32->maybe_command($file); + } else { + ExtUtils::MM_Unix->maybe_command($file); + } + } + } +} + +1; + +__END__ + +#line 157 diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm new file mode 100644 index 0000000..24c0c02 --- /dev/null +++ b/inc/Module/Install/Fetch.pm @@ -0,0 +1,93 @@ +#line 1 +package Module::Install::Fetch; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +sub get_file { + my ($self, %args) = @_; + my ($scheme, $host, $path, $file) = + $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; + + 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) = + $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; + } + + $|++; + print "Fetching '$file' from $host... "; + + unless (eval { require Socket; Socket::inet_aton($host) }) { + warn "'$host' resolve failed!\n"; + return; + } + + return unless $scheme eq 'ftp' or $scheme eq 'http'; + + require Cwd; + my $dir = Cwd::getcwd(); + chdir $args{local_dir} or return if exists $args{local_dir}; + + if (eval { require LWP::Simple; 1 }) { + LWP::Simple::mirror($args{url}, $file); + } + elsif (eval { require Net::FTP; 1 }) { eval { + # use Net::FTP to get past firewall + my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600); + $ftp->login("anonymous", 'anonymous@example.com'); + $ftp->cwd($path); + $ftp->binary; + $ftp->get($file) or (warn("$!\n"), return); + $ftp->quit; + } } + elsif (my $ftp = $self->can_run('ftp')) { eval { + # no Net::FTP, fallback to ftp.exe + require FileHandle; + my $fh = FileHandle->new; + + local $SIG{CHLD} = 'IGNORE'; + unless ($fh->open("|$ftp -n")) { + warn "Couldn't open ftp: $!\n"; + chdir $dir; return; + } + + my @dialog = split(/\n/, <<"END_FTP"); +open $host +user anonymous anonymous\@example.com +cd $path +binary +get $file $file +quit +END_FTP + foreach (@dialog) { $fh->print("$_\n") } + $fh->close; + } } + else { + warn "No working 'ftp' program available!\n"; + chdir $dir; return; + } + + unless (-f $file) { + warn "Fetching failed: $@\n"; + chdir $dir; return; + } + + return if exists $args{size} and -s $file != $args{size}; + system($args{run}) if exists $args{run}; + unlink($file) if $args{remove}; + + print(((!exists $args{check_for} or -e $args{check_for}) + ? "done!" : "failed! ($!)"), "\n"); + chdir $dir; return !$?; +} + +1; diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm new file mode 100644 index 0000000..96c7e17 --- /dev/null +++ b/inc/Module/Install/Makefile.pm @@ -0,0 +1,208 @@ +#line 1 +package Module::Install::Makefile; + +use strict 'vars'; +use Module::Install::Base; +use ExtUtils::MakeMaker (); + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +sub Makefile { $_[0] } + +my %seen = (); + +sub prompt { + shift; + + # Infinite loop protection + my @c = caller(); + if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { + die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; + } + + # In automated testing, always use defaults + if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) { + local $ENV{PERL_MM_USE_DEFAULT} = 1; + goto &ExtUtils::MakeMaker::prompt; + } else { + goto &ExtUtils::MakeMaker::prompt; + } +} + +sub makemaker_args { + my $self = shift; + my $args = ($self->{makemaker_args} ||= {}); + %$args = ( %$args, @_ ) if @_; + $args; +} + +# For mm args that take multiple space-seperated args, +# append an argument to the current list. +sub makemaker_append { + my $self = shift; + my $name = shift; + my $args = $self->makemaker_args; + $args->{name} = defined $args->{$name} + ? join( ' ', $args->{name}, @_ ) + : join( ' ', @_ ); +} + +sub build_subdirs { + my $self = shift; + my $subdirs = $self->makemaker_args->{DIR} ||= []; + for my $subdir (@_) { + push @$subdirs, $subdir; + } +} + +sub clean_files { + my $self = shift; + my $clean = $self->makemaker_args->{clean} ||= {}; + %$clean = ( + %$clean, + FILES => join(' ', grep length, $clean->{FILES}, @_), + ); +} + +sub realclean_files { + my $self = shift; + my $realclean = $self->makemaker_args->{realclean} ||= {}; + %$realclean = ( + %$realclean, + FILES => join(' ', grep length, $realclean->{FILES}, @_), + ); +} + +sub libs { + my $self = shift; + my $libs = ref $_[0] ? shift : [ shift ]; + $self->makemaker_args( LIBS => $libs ); +} + +sub inc { + my $self = shift; + $self->makemaker_args( INC => shift ); +} + +sub write { + my $self = shift; + die "&Makefile->write() takes no arguments\n" if @_; + + my $args = $self->makemaker_args; + $args->{DISTNAME} = $self->name; + $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args); + $args->{VERSION} = $self->version || $self->determine_VERSION($args); + $args->{NAME} =~ s/-/::/g; + if ( $self->tests ) { + $args->{test} = { TESTS => $self->tests }; + } + if ($] >= 5.005) { + $args->{ABSTRACT} = $self->abstract; + $args->{AUTHOR} = $self->author; + } + if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) { + $args->{NO_META} = 1; + } + if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) { + $args->{SIGN} = 1; + } + unless ( $self->is_admin ) { + delete $args->{SIGN}; + } + + # merge both kinds of requires into prereq_pm + my $prereq = ($args->{PREREQ_PM} ||= {}); + %$prereq = ( %$prereq, map { @$_ } map { @$_ } grep $_, + ($self->build_requires, $self->requires) ); + + # merge both kinds of requires into prereq_pm + my $subdirs = ($args->{DIR} ||= []); + if ($self->bundles) { + foreach my $bundle (@{ $self->bundles }) { + my ($file, $dir) = @$bundle; + push @$subdirs, $dir if -d $dir; + delete $prereq->{$file}; + } + } + + if ( my $perl_version = $self->perl_version ) { + eval "use $perl_version; 1" + or die "ERROR: perl: Version $] is installed, " + . "but we need version >= $perl_version"; + } + + my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args; + if ($self->admin->preop) { + $args{dist} = $self->admin->preop; + } + + my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); + $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); +} + +sub fix_up_makefile { + my $self = shift; + my $makefile_name = shift; + my $top_class = ref($self->_top) || ''; + my $top_version = $self->_top->VERSION || ''; + + my $preamble = $self->preamble + ? "# Preamble by $top_class $top_version\n" + . $self->preamble + : ''; + my $postamble = "# Postamble by $top_class $top_version\n" + . ($self->postamble || ''); + + local *MAKEFILE; + open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + my $makefile = do { local $/; }; + close MAKEFILE or die $!; + + $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; + $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; + $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; + $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; + $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; + + # Module::Install will never be used to build the Core Perl + # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks + # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist + $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; + #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; + + # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. + $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g; + + # XXX - This is currently unused; not sure if it breaks other MM-users + # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; + + open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + print MAKEFILE "$preamble$makefile$postamble" or die $!; + close MAKEFILE or die $!; + + 1; +} + +sub preamble { + my ($self, $text) = @_; + $self->{preamble} = $text . $self->{preamble} if defined $text; + $self->{preamble}; +} + +sub postamble { + my ($self, $text) = @_; + $self->{postamble} ||= $self->admin->postamble; + $self->{postamble} .= $text if defined $text; + $self->{postamble} +} + +1; + +__END__ + +#line 334 diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm new file mode 100644 index 0000000..6c80832 --- /dev/null +++ b/inc/Module/Install/Metadata.pm @@ -0,0 +1,315 @@ +#line 1 +package Module::Install::Metadata; + +use strict 'vars'; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +my @scalar_keys = qw{ + name module_name abstract author version license + distribution_type perl_version tests +}; + +my @tuple_keys = qw{ + build_requires requires recommends bundles +}; + +sub Meta { shift } +sub Meta_ScalarKeys { @scalar_keys } +sub Meta_TupleKeys { @tuple_keys } + +foreach my $key (@scalar_keys) { + *$key = sub { + my $self = shift; + return $self->{values}{$key} if defined wantarray and !@_; + $self->{values}{$key} = shift; + return $self; + }; +} + +foreach my $key (@tuple_keys) { + *$key = sub { + my $self = shift; + return $self->{values}{$key} unless @_; + + my @rv; + while (@_) { + my $module = shift or last; + my $version = shift || 0; + if ( $module eq 'perl' ) { + $version =~ s{^(\d+)\.(\d+)\.(\d+)} + {$1 + $2/1_000 + $3/1_000_000}e; + $self->perl_version($version); + next; + } + my $rv = [ $module, $version ]; + push @rv, $rv; + } + push @{ $self->{values}{$key} }, @rv; + @rv; + }; +} + +sub sign { + my $self = shift; + return $self->{'values'}{'sign'} if defined wantarray and !@_; + $self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 ); + return $self; +} + +sub dynamic_config { + my $self = shift; + unless ( @_ ) { + warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n"; + return $self; + } + $self->{'values'}{'dynamic_config'} = $_[0] ? 1 : 0; + return $self; +} + +sub all_from { + my ( $self, $file ) = @_; + + unless ( defined($file) ) { + my $name = $self->name + or die "all_from called with no args without setting name() first"; + $file = join('/', 'lib', split(/-/, $name)) . '.pm'; + $file =~ s{.*/}{} unless -e $file; + die "all_from: cannot find $file from $name" unless -e $file; + } + + $self->version_from($file) unless $self->version; + $self->perl_version_from($file) unless $self->perl_version; + + # The remaining probes read from POD sections; if the file + # has an accompanying .pod, use that instead + my $pod = $file; + if ( $pod =~ s/\.pm$/.pod/i and -e $pod ) { + $file = $pod; + } + + $self->author_from($file) unless $self->author; + $self->license_from($file) unless $self->license; + $self->abstract_from($file) unless $self->abstract; +} + +sub provides { + my $self = shift; + my $provides = ( $self->{values}{provides} ||= {} ); + %$provides = (%$provides, @_) if @_; + return $provides; +} + +sub auto_provides { + my $self = shift; + return $self unless $self->is_admin; + + unless (-e 'MANIFEST') { + warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; + return $self; + } + + # Avoid spurious warnings as we are not checking manifest here. + + local $SIG{__WARN__} = sub {1}; + require ExtUtils::Manifest; + local *ExtUtils::Manifest::manicheck = sub { return }; + + require Module::Build; + my $build = Module::Build->new( + dist_name => $self->name, + dist_version => $self->version, + license => $self->license, + ); + $self->provides(%{ $build->find_dist_packages || {} }); +} + +sub feature { + my $self = shift; + my $name = shift; + my $features = ( $self->{values}{features} ||= [] ); + + my $mods; + + if ( @_ == 1 and ref( $_[0] ) ) { + # The user used ->feature like ->features by passing in the second + # argument as a reference. Accomodate for that. + $mods = $_[0]; + } else { + $mods = \@_; + } + + my $count = 0; + push @$features, ( + $name => [ + map { + ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ + : @$_ + : $_ + } @$mods + ] + ); + + return @$features; +} + +sub features { + my $self = shift; + while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { + $self->feature( $name, @$mods ); + } + return $self->{values}->{features} + ? @{ $self->{values}->{features} } + : (); +} + +sub no_index { + my $self = shift; + my $type = shift; + push @{ $self->{values}{no_index}{$type} }, @_ if $type; + return $self->{values}{no_index}; +} + +sub read { + my $self = shift; + $self->include_deps( 'YAML', 0 ); + + require YAML; + my $data = YAML::LoadFile('META.yml'); + + # Call methods explicitly in case user has already set some values. + while ( my ( $key, $value ) = each %$data ) { + next unless $self->can($key); + if ( ref $value eq 'HASH' ) { + while ( my ( $module, $version ) = each %$value ) { + $self->can($key)->($self, $module => $version ); + } + } + else { + $self->can($key)->($self, $value); + } + } + return $self; +} + +sub write { + my $self = shift; + return $self unless $self->is_admin; + $self->admin->write_meta; + return $self; +} + +sub version_from { + my ( $self, $file ) = @_; + require ExtUtils::MM_Unix; + $self->version( ExtUtils::MM_Unix->parse_version($file) ); +} + +sub abstract_from { + my ( $self, $file ) = @_; + require ExtUtils::MM_Unix; + $self->abstract( + bless( + { DISTNAME => $self->name }, + 'ExtUtils::MM_Unix' + )->parse_abstract($file) + ); +} + +sub _slurp { + my ( $self, $file ) = @_; + + local *FH; + open FH, "< $file" or die "Cannot open $file.pod: $!"; + do { local $/; }; +} + +sub perl_version_from { + my ( $self, $file ) = @_; + + if ( + $self->_slurp($file) =~ m/ + ^ + use \s* + v? + ([\d_\.]+) + \s* ; + /ixms + ) + { + my $v = $1; + $v =~ s{_}{}g; + $self->perl_version($1); + } + else { + warn "Cannot determine perl version info from $file\n"; + return; + } +} + +sub author_from { + my ( $self, $file ) = @_; + my $content = $self->_slurp($file); + if ($content =~ m/ + =head \d \s+ (?:authors?)\b \s* + ([^\n]*) + | + =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* + .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* + ([^\n]*) + /ixms) { + my $author = $1 || $2; + $author =~ s{E}{<}g; + $author =~ s{E}{>}g; + $self->author($author); + } + else { + warn "Cannot determine author info from $file\n"; + } +} + +sub license_from { + my ( $self, $file ) = @_; + + if ( + $self->_slurp($file) =~ m/ + =head \d \s+ + (?:licen[cs]e|licensing|copyright|legal)\b + (.*?) + (=head\\d.*|=cut.*|) + \z + /ixms + ) + { + my $license_text = $1; + my @phrases = ( + 'under the same (?:terms|license) as perl itself' => 'perl', + 'GNU public license' => 'gpl', + 'GNU lesser public license' => 'gpl', + 'BSD license' => 'bsd', + 'Artistic license' => 'artistic', + 'GPL' => 'gpl', + 'LGPL' => 'lgpl', + 'BSD' => 'bsd', + 'Artistic' => 'artistic', + ); + while ( my ( $pattern, $license ) = splice( @phrases, 0, 2 ) ) { + $pattern =~ s{\s+}{\\s+}g; + if ( $license_text =~ /\b$pattern\b/i ) { + $self->license($license); + return 1; + } + } + } + + warn "Cannot determine license info from $file\n"; + return 'unknown'; +} + +1; diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm new file mode 100644 index 0000000..2ec7d66 --- /dev/null +++ b/inc/Module/Install/Win32.pm @@ -0,0 +1,65 @@ +#line 1 +package Module::Install::Win32; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +# determine if the user needs nmake, and download it if needed +sub check_nmake { + my $self = shift; + $self->load('can_run'); + $self->load('get_file'); + + require Config; + return unless ( + $^O eq 'MSWin32' and + $Config::Config{make} and + $Config::Config{make} =~ /^nmake\b/i and + ! $self->can_run('nmake') + ); + + print "The required 'nmake' executable not found, fetching it...\n"; + + require File::Basename; + my $rv = $self->get_file( + url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe', + ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe', + local_dir => File::Basename::dirname($^X), + size => 51928, + run => 'Nmake15.exe /o > nul', + check_for => 'Nmake.exe', + remove => 1, + ); + + if (!$rv) { + die <<'END_MESSAGE'; + +------------------------------------------------------------------------------- + +Since you are using Microsoft Windows, you will need the 'nmake' utility +before installation. It's available at: + + http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe + or + ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe + +Please download the file manually, save it to a directory in %PATH% (e.g. +C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to +that directory, and run "Nmake15.exe" from there; that will create the +'nmake.exe' file needed by this module. + +You may then resume the installation process described in README. + +------------------------------------------------------------------------------- +END_MESSAGE + } +} + +1; diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm new file mode 100644 index 0000000..3546e61 --- /dev/null +++ b/inc/Module/Install/WriteAll.pm @@ -0,0 +1,43 @@ +#line 1 +package Module::Install::WriteAll; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.64'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +sub WriteAll { + my $self = shift; + my %args = ( + meta => 1, + sign => 0, + inline => 0, + check_nmake => 1, + @_ + ); + + $self->sign(1) if $args{sign}; + $self->Meta->write if $args{meta}; + $self->admin->WriteAll(%args) if $self->is_admin; + + if ( $0 =~ /Build.PL$/i ) { + $self->Build->write; + } else { + $self->check_nmake if $args{check_nmake}; + unless ( $self->makemaker_args->{'PL_FILES'} ) { + $self->makemaker_args( PL_FILES => {} ); + } + if ($args{inline}) { + $self->Inline->write; + } else { + $self->Makefile->write; + } + } +} + +1; diff --git a/Size.pm b/lib/Devel/Size.pm old mode 100755 new mode 100644 similarity index 94% rename from Size.pm rename to lib/Devel/Size.pm index 5c4ffba..4f8fe1b --- a/Size.pm +++ b/lib/Devel/Size.pm @@ -1,37 +1,27 @@ package Devel::Size; use strict; -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD %EXPORT_TAGS $warn); +use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $warn); require Exporter; require DynaLoader; @ISA = qw(Exporter DynaLoader); -# Items to export into callers namespace by default. Note: do not export -# names by default without a very good reason. Use EXPORT_OK instead. -# Do not simply export all your public functions/methods/constants. - # This allows declaration use Devel::Size ':all'; -# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK -# will save memory. %EXPORT_TAGS = ( 'all' => [ qw( size total_size ) ] ); @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } ); -@EXPORT = qw( - -); -$VERSION = '0.64'; +@EXPORT = qw( ); +$VERSION = '0.65'; bootstrap Devel::Size $VERSION; $warn = 1; -# Preloaded methods go here. - 1; __END__ @@ -157,7 +147,7 @@ still have almost no memory actually allocated to the program running. =head2 Perl Perl's memory allocation scheme is a bit convoluted, and more complex -than can really be addressed here, but there is one common spot where perl's +than can really be addressed here, but there is one common spot where Perl's memory allocation is unintuitive, and that's for hash keys. When you have a hash, each entry has a structure that points to the @@ -247,15 +237,18 @@ Dan Sugalski dan@sidhe.org Small portion taken from the B module as shipped with perl 5.6.2. +Maintained now by Tels + =head1 COPYRIGHT Copyright (C) 2005 Dan Sugalski. +Copyright (C) 2007 Tels This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. =head1 SEE ALSO -perl(1). +perl(1), L. =cut diff --git a/t/basic.t b/t/basic.t old mode 100755 new mode 100644 index 4221cdd..bcb99ad --- a/t/basic.t +++ b/t/basic.t @@ -1,22 +1,32 @@ -# Before `make install' is performed this script should be runnable with -# `make test'. After `make install' it should work as `perl test.pl' +#!/usr/bin/perl -w -######################### We start with some black magic to print on failure. +use Test::More; +use strict; + +my $tests; -# Change 1..1 below to 1..last_test_to_print . -# (It may become useful if the test is moved to ./t subdirectory.) +BEGIN + { + chdir 't' if -d 't'; + plan tests => 13; -BEGIN { $| = 1; print "1..8\n"; } -END {print "not ok 1\n" unless $loaded;} -use Devel::Size qw(size total_size); -$loaded = 1; -print "ok 1\n"; + use lib '../lib'; + use lib '../blib/arch'; + use_ok('Devel::Size'); + } -######################### End of black magic. +can_ok ('Devel::Size', qw/ + size + total_size + /); -# Insert your test code below (better if it prints "ok 13" -# (correspondingly "not ok 13") depending on the success of chunk 13 -# of the test code): +Devel::Size->import( qw(size total_size) ); + +die ("Uhoh, test uses outdated version of Devel::Size") + unless is ($Devel::Size::VERSION, '0.65', 'VERSION MATCHES'); + +############################################################################# +# some basic checks: use vars qw($foo @foo %foo); $foo = "12"; @@ -24,58 +34,61 @@ $foo = "12"; %foo = (a => 1, b => 2); my $x = "A string"; -my $y = "A longer string"; -if (size($x) < size($y)) { - print "ok 2\n"; -} else { - print "not ok 2\n"; -} - -if (total_size($x) < total_size($y)) { - print "ok 3\n"; -} else { - print "not ok 3\n"; -} +my $y = "A much much longer string"; # need to be at least 7 bytes longer for 64 bit +ok (size($x) < size($y), 'size() of strings'); +ok (total_size($x) < total_size($y), 'total_size() of strings'); my @x = (1..4); -my @y = (1..10); +my @y = (1..200); + +my $size_1 = total_size(\@x); +my $size_2 = total_size(\@y); + +ok ( $size_1 < $size_2, 'size() of array refs'); +ok (total_size(\@x) < total_size(\@y), 'total_size() of array refs'); + +# the arrays alone should be the same size? +$size_1 = size(\@x); +$size_2 = size(\@y); + +is ( $size_1, $size_2, 'size() of array refs'); + +############################################################################# +# IV vs IV+PV (bug #17586) -if (size(\@x) < size(\@y)) { - print "ok 4\n"; -} else { - print "not ok 4\n"; -} +$x = 12; +$y = 12; $y .= ''; -if (total_size(\@x) < total_size(\@y)) { - print "ok 5\n"; -} else { - print "not ok 5\n"; -} +$size_1 = size($x); +$size_2 = size($y); +ok ($size_1 < $size_2, ' ."" makes string longer'); + +############################################################################# # check that the tracking_hash is working my($a,$b) = (1,2); my @ary1 = (\$a, \$a); my @ary2 = (\$a, \$b); -if (total_size(\@ary1) < total_size(\@ary2)) { - print "ok 6\n"; -} else { - print "not ok 6\n"; -} +isnt ( total_size(\@ary2) - total_size(\@ary1), 0, + 'total_size(\@ary1) < total_size(\@ary2)'); +############################################################################# # check that circular references don't mess things up my($c1,$c2); $c2 = \$c1; $c1 = \$c2; -if( total_size($c1) == total_size($c2) ) { - print "ok 7\n"; -} else { - print "not ok 7\n"; -} - -if (total_size(*foo)) { - print "ok 8\n"; -} else { - print "not ok 8\n"; -} +is (total_size($c1), total_size($c2), 'circular references'); + +############################################################################# +# GLOBS + +isnt (total_size(*foo), 0, 'total_size(*foo) > 0'); + +############################################################################# +# CODE ref + +my $code = sub { '1' }; + +isnt (total_size($code), 0, 'total_size($code) > 0'); diff --git a/t/pod.t b/t/pod.t new file mode 100644 index 0000000..d539d30 --- /dev/null +++ b/t/pod.t @@ -0,0 +1,26 @@ +#!/usr/bin/perl -w + +use Test::More; +use strict; + +my $tests; + +BEGIN + { + $tests = 1; + plan tests => $tests; + chdir 't' if -d 't'; + use lib '../lib'; + }; + +SKIP: + { + skip( 'Test::Pod not installed on this system', $tests ) + unless do + { + eval "use Test::Pod;"; + $@ ? 0 : 1; + }; + pod_file_ok( '../lib/Devel/Size.pm' ); + } + diff --git a/t/pod_cov.t b/t/pod_cov.t new file mode 100644 index 0000000..bc37244 --- /dev/null +++ b/t/pod_cov.t @@ -0,0 +1,30 @@ +#!/usr/bin/perl -w + +use Test::More; +use strict; + +my $tests; + +BEGIN + { + $tests = 1; + plan tests => $tests; + chdir 't' if -d 't'; + use lib '../lib'; + }; + +SKIP: + { + skip("Test::Pod::Coverage 1.00 required for testing POD coverage", $tests) + unless do { + eval "use Test::Pod::Coverage 1.00"; + $@ ? 0 : 1; + }; + for my $m (qw/ + Devel::Size + /) + { + pod_coverage_ok( $m, "$m is covered" ); + } + } +