module-build-checkins Mailing List for Module::Build (Page 18)
Status: Beta
Brought to you by:
kwilliams
Menu
▾
▴
module-build-checkins — Notification of CVS commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(82) |
Dec
(58) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(49) |
Feb
(57) |
Mar
(49) |
Apr
(49) |
May
(2) |
Jun
(147) |
Jul
(60) |
Aug
(55) |
Sep
(51) |
Oct
(68) |
Nov
(61) |
Dec
(44) |
| 2006 |
Jan
(27) |
Feb
(38) |
Mar
(89) |
Apr
(31) |
May
(17) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ken W. <kwi...@us...> - 2005-09-06 02:57:23
|
Update of /cvsroot/module-build/Module-Build/lib/Module In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5541 Modified Files: Build.pm Log Message: Fix documentation of the C<install_base> paths Index: Build.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build.pm,v retrieving revision 1.185 retrieving revision 1.186 diff -u -d -r1.185 -r1.186 --- Build.pm 4 Aug 2005 03:13:05 -0000 1.185 +++ Build.pm 6 Sep 2005 02:57:11 -0000 1.186 @@ -662,9 +662,9 @@ instance, if you set C<install_base> to "/home/ken" on a Linux system, you'll install as follows: - lib => /home/ken/lib - arch => /home/ken/lib/i386-linux - script => /home/ken/scripts + lib => /home/ken/lib/perl5 + arch => /home/ken/lib/perl5/i386-linux + script => /home/ken/bin bin => /home/ken/bin bindoc => /home/ken/man/man1 libdoc => /home/ken/man/man3 |
|
From: Ken W. <kwi...@us...> - 2005-08-29 22:19:34
|
Update of /cvsroot/module-build/Module-Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27343 Modified Files: Changes Log Message: Pass through a no_index parameter to the META.yml Index: Changes =================================================================== RCS file: /cvsroot/module-build/Module-Build/Changes,v retrieving revision 1.370 retrieving revision 1.371 diff -u -d -r1.370 -r1.371 --- Changes 29 Aug 2005 11:38:15 -0000 1.370 +++ Changes 29 Aug 2005 22:19:24 -0000 1.371 @@ -2,6 +2,10 @@ 0.27_03 + - If the user passes a no_index parameter to our constructor, we now + pass that through when building the META.yml file. [Richard + Soderberg, RT #9603] + - Some versions of MakeMaker, CPANPLUS, and/or PAUSE thought that a certain line of our code was declaring a $VERSION when we didn't intend to. The line has been obscurified so they won't think that |
|
From: Ken W. <kwi...@us...> - 2005-08-29 22:19:32
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27343/lib/Module/Build Modified Files: Base.pm Log Message: Pass through a no_index parameter to the META.yml Index: Base.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v retrieving revision 1.476 retrieving revision 1.477 diff -u -d -r1.476 -r1.477 --- Base.pm 28 Aug 2005 01:31:13 -0000 1.476 +++ Base.pm 29 Aug 2005 22:19:24 -0000 1.477 @@ -2731,6 +2731,7 @@ $node->{dynamic_config} = $p->{dynamic_config} if exists $p->{dynamic_config}; $node->{provides} = $self->find_dist_packages; + $node->{no_index} = $p->{no_index} if exists $p->{no_index}; $node->{generated_by} = "Module::Build version $Module::Build::VERSION"; |
|
From: Ken W. <kwi...@us...> - 2005-08-29 11:38:26
|
Update of /cvsroot/module-build/Module-Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5198 Modified Files: Changes Log Message: Obscurify a VERSION-related line to hide it from VERSION-finding regexes Index: Changes =================================================================== RCS file: /cvsroot/module-build/Module-Build/Changes,v retrieving revision 1.369 retrieving revision 1.370 diff -u -d -r1.369 -r1.370 --- Changes 11 Aug 2005 01:58:10 -0000 1.369 +++ Changes 29 Aug 2005 11:38:15 -0000 1.370 @@ -2,6 +2,11 @@ 0.27_03 + - Some versions of MakeMaker, CPANPLUS, and/or PAUSE thought that a + certain line of our code was declaring a $VERSION when we didn't + intend to. The line has been obscurified so they won't think that + anymore. [Jos Boumans, RT #14226] + - We now use ExtUtils::CBuilder to do all compiling of C code (for example, when compiling XS modules). (This change actually occurred in 0.27_01, but it was mistakenly omitted from the Changes |
|
From: Ken W. <kwi...@us...> - 2005-08-29 11:38:26
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5198/lib/Module/Build Modified Files: ModuleInfo.pm Log Message: Obscurify a VERSION-related line to hide it from VERSION-finding regexes Index: ModuleInfo.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/ModuleInfo.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ModuleInfo.pm 22 Aug 2005 12:24:36 -0000 1.6 +++ ModuleInfo.pm 29 Aug 2005 11:38:16 -0000 1.7 @@ -209,12 +209,15 @@ # version.pm will change the ->VERSION method, so we mitigate the # potential effects here. Unfortunately local(*UNIVERSAL::VERSION) - # will crash perl < 5.8.1. + # will crash perl < 5.8.1. We also use *{Foo::VERSION} instead of + # *Foo::VERSION so that old versions of CPAN.pm, etc. with a + # too-permissive regex don't think we're actually declaring a + # version. my $old_version = \&UNIVERSAL::VERSION; eval {require version}; my $result = eval $eval; - *UNIVERSAL::VERSION = $old_version; + *{UNIVERSAL::VERSION} = $old_version; warn "Error evaling version line '$eval' in $self->{filename}: $@\n" if $@; # Unbless it if it's a version.pm object |
|
From: Ken W. <kwi...@us...> - 2005-08-28 15:04:52
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1257/lib/Module/Build Modified Files: Tag: release-0_26_branch Base.pm Log Message: Use a different directory for compiler-probing Index: Base.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v retrieving revision 1.340.2.32 retrieving revision 1.340.2.33 diff -u -d -r1.340.2.32 -r1.340.2.33 --- Base.pm 9 Jun 2005 23:27:17 -0000 1.340.2.32 +++ Base.pm 28 Aug 2005 15:04:44 -0000 1.340.2.33 @@ -2488,7 +2488,7 @@ print "Checking if compiler tools configured... " if $p->{verbose}; - my $c_file = $self->config_file('compilet.c'); + my $c_file = File::Spec->catfile(File::Spec->tmpdir, 'compilet.c'); { my $fh = IO::File->new("> $c_file") or die "Can't create $c_file: $!"; print $fh "int boot_compilet() { return 1; }\n"; |
|
From: Ken W. <kwi...@us...> - 2005-08-28 15:04:52
|
Update of /cvsroot/module-build/Module-Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1257 Modified Files: Tag: release-0_26_branch Changes Log Message: Use a different directory for compiler-probing Index: Changes =================================================================== RCS file: /cvsroot/module-build/Module-Build/Changes,v retrieving revision 1.299.2.49 retrieving revision 1.299.2.50 diff -u -d -r1.299.2.49 -r1.299.2.50 --- Changes 14 Jun 2005 03:23:56 -0000 1.299.2.49 +++ Changes 28 Aug 2005 15:04:44 -0000 1.299.2.50 @@ -1,5 +1,11 @@ Revision history for Perl extension Module::Build. +0.2612 + + - We now use File::Spec->tmpdir rather than the local _build/ + directory when checking for a C compiler, because sometimes the + latter doesn't exist (yet). [Jerry D. Hedden] + 0.2611 Mon Jun 13 22:22:53 CDT 2005 - Fix the output of an informational message that we output when |
|
From: Ken W. <kwi...@us...> - 2005-08-28 01:31:25
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4959 Modified Files: Base.pm Log Message: Die with a better error message (was "Can't call method "version" on an undefined value") when the 'dist_version_from' file can't be found. Index: Base.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v retrieving revision 1.475 retrieving revision 1.476 diff -u -d -r1.475 -r1.476 --- Base.pm 11 Aug 2005 11:58:30 -0000 1.475 +++ Base.pm 28 Aug 2005 01:31:13 -0000 1.476 @@ -733,7 +733,8 @@ if ( $p->{dist_version_from} ) { my $version_from = File::Spec->catfile( split( qr{/}, $p->{dist_version_from} ) ); - my $pm_info = Module::Build::ModuleInfo->new_from_file( $version_from ); + my $pm_info = Module::Build::ModuleInfo->new_from_file( $version_from ) + or die "Can't find file $version_from to determine version"; $p->{dist_version} = $pm_info->version(); } |
|
From: Ken W. <kwi...@us...> - 2005-08-24 02:54:05
|
Update of /cvsroot/module-build/Module-Build/website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6973 Modified Files: META-spec.html Log Message: Regenerate the HTML Index: META-spec.html =================================================================== RCS file: /cvsroot/module-build/Module-Build/website/META-spec.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- META-spec.html 22 Aug 2005 02:18:17 -0000 1.9 +++ META-spec.html 24 Aug 2005 02:53:56 -0000 1.10 @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>CPAN::META::Specification - Specification for F<META.yml></title> +<title>META-spec - Specification for F<META.yml> documents</title> <link rev="made" href="mailto:ro...@ha..." /> </head> @@ -59,7 +59,7 @@ <p> </p> <h1><a name="name">NAME</a></h1> -<p>CPAN::META::Specification - Specification for <em>META.yml</em></p> +<p>META-spec - Specification for <em>META.yml</em> documents</p> <p> </p> <hr /> @@ -97,14 +97,14 @@ urls: license: <a href="http://dev.perl.org/licenses/">http://dev.perl.org/licenses/</a> meta-spec: - version: 1.1 - url: <a href="http://search.cpan.org/dist/CPAN-META-Specification-1.1/">http://search.cpan.org/dist/CPAN-META-Specification-1.1/</a> + version: 1.2 + url: <a href="http://module-build.sourceforge.net/META-spec-v1.2.html">http://module-build.sourceforge.net/META-spec-v1.2.html</a> generated_by: Module::Build version 0.20</pre> <p> </p> <hr /> <h1><a name="description">DESCRIPTION</a></h1> -<p>This document describes version 1.1 of the <em>META.yml</em> specification.</p> +<p>This document describes version 1.2 of the <em>META.yml</em> specification.</p> <p>The <em>META.yml</em> file describes important properties of contributed Perl distributions such as the ones found on CPAN. It is typically created by tools like Module::Build, Module::Install, and @@ -114,8 +114,11 @@ installation tools (like CPAN.pm or CPANPLUS), or just for people who want to know some stuff about a distribution before downloading it and starting to install it.</p> -<p><em>Note: The latest version of this specification can always be found -at <a href="http://search.cpan.org/dist/CPAN-META-Specification/">http://search.cpan.org/dist/CPAN-META-Specification/</a>.</em></p> +<p><em>Note: The latest stable version of this specification can always be +found at <a href="http://module-build.sourceforge.net/META-spec-current.html">http://module-build.sourceforge.net/META-spec-current.html</a>, +and the latest development version (which may include things that +won't make it into the stable version can always be found at +<a href="http://module-build.sourceforge.net/META-spec-blead.html">http://module-build.sourceforge.net/META-spec-blead.html</a>.</em></p> <p> </p> <hr /> @@ -202,8 +205,8 @@ <p>Example:</p> <pre> meta-spec: - version: 1.1 - url: <a href="http://search.cpan.org/dist/CPAN-META-Specification-1.1/">http://search.cpan.org/dist/CPAN-META-Specification-1.1/</a></pre> + version: 1.2 + url: <a href="http://module-build.sourceforge.net/META-spec-v1.2.html">http://module-build.sourceforge.net/META-spec-v1.2.html</a></pre> <p>(Spec 1.1) [required] {URL} This field indicates the location of the version of the META.yml specification used.</p> <p> @@ -598,6 +601,13 @@ <li></li> Clarified <code>dynamic_config</code> a bit. <p></p></ul> +<dt><strong><a name="item_august_23_2c_2005">August 23, 2005</a></strong><br /> +</dt> +<ul> +<li></li> +Removed the name <code>CPAN::META::Specification</code>, since that implies a +module that doesn't actually exist. +<p></p></ul> </dl> </body> |
|
From: Ken W. <kwi...@us...> - 2005-08-24 02:53:50
|
Update of /cvsroot/module-build/Module-Build/website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6871 Modified Files: META-spec.pod Log Message: Fix links to the CPAN-META-Specification stuff Index: META-spec.pod =================================================================== RCS file: /cvsroot/module-build/Module-Build/website/META-spec.pod,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- META-spec.pod 24 Aug 2005 02:37:17 -0000 1.7 +++ META-spec.pod 24 Aug 2005 02:53:33 -0000 1.8 @@ -36,13 +36,13 @@ urls: license: http://dev.perl.org/licenses/ meta-spec: - version: 1.1 - url: http://search.cpan.org/dist/CPAN-META-Specification-1.1/ + version: 1.2 + url: http://module-build.sourceforge.net/META-spec-v1.2.html generated_by: Module::Build version 0.20 =head1 DESCRIPTION -This document describes version 1.1 of the F<META.yml> specification. +This document describes version 1.2 of the F<META.yml> specification. The F<META.yml> file describes important properties of contributed Perl distributions such as the ones found on CPAN. It is typically @@ -55,8 +55,11 @@ want to know some stuff about a distribution before downloading it and starting to install it. -I<Note: The latest version of this specification can always be found -at L<http://search.cpan.org/dist/CPAN-META-Specification/>.> +I<Note: The latest stable version of this specification can always be +found at L<http://module-build.sourceforge.net/META-spec-current.html>, +and the latest development version (which may include things that +won't make it into the stable version can always be found at +L<http://module-build.sourceforge.net/META-spec-blead.html>.> =head1 FORMAT @@ -153,8 +156,8 @@ Example: meta-spec: - version: 1.1 - url: http://search.cpan.org/dist/CPAN-META-Specification-1.1/ + version: 1.2 + url: http://module-build.sourceforge.net/META-spec-v1.2.html (Spec 1.1) [required] {URL} This field indicates the location of the version of the META.yml specification used. |
|
From: Ken W. <kwi...@us...> - 2005-08-24 02:37:31
|
Update of /cvsroot/module-build/Module-Build/website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3930 Modified Files: META-spec.pod Log Message: Removed the name C<CPAN::META::Specification>, since that implies a module that doesn't actually exist. Index: META-spec.pod =================================================================== RCS file: /cvsroot/module-build/Module-Build/website/META-spec.pod,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- META-spec.pod 22 Aug 2005 02:18:18 -0000 1.6 +++ META-spec.pod 24 Aug 2005 02:37:17 -0000 1.7 @@ -1,6 +1,6 @@ =head1 NAME -CPAN::META::Specification - Specification for F<META.yml> +META-spec - Specification for F<META.yml> documents =head1 SYNOPSIS @@ -624,4 +624,15 @@ =back +=item August 23, 2005 + +=over 2 + +=item * + +Removed the name C<CPAN::META::Specification>, since that implies a +module that doesn't actually exist. + +=back + =back |
|
From: Randy W. S. <si...@us...> - 2005-08-22 12:24:48
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32109/lib/Module/Build Modified Files: ModuleInfo.pm Log Message: When scanning $VERSIONs, ignore anything that looks like a relational operation. We only want expressions that involve an assignment to the $VERSION. [Dave Rolsky] Index: ModuleInfo.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/ModuleInfo.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ModuleInfo.pm 1 Jul 2005 11:20:01 -0000 1.5 +++ ModuleInfo.pm 22 Aug 2005 12:24:36 -0000 1.6 @@ -11,7 +11,7 @@ my $PKG_REGEXP = qr/^[\s\{;]*package\s+([\w:]+)/; -my $VERS_REGEXP = qr/([\$*])(([\w\:\']*)\bVERSION)\b.*\=/; +my $VERS_REGEXP = qr/([\$*])(([\w\:\']*)\bVERSION)\b\s*=[^=]/; sub new_from_file { |
|
From: Randy W. S. <si...@us...> - 2005-08-22 12:24:48
|
Update of /cvsroot/module-build/Module-Build/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32109/t Modified Files: moduleinfo.t Log Message: When scanning $VERSIONs, ignore anything that looks like a relational operation. We only want expressions that involve an assignment to the $VERSION. [Dave Rolsky] Index: moduleinfo.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/moduleinfo.t,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- moduleinfo.t 29 Jun 2005 07:50:40 -0000 1.8 +++ moduleinfo.t 22 Aug 2005 12:24:36 -0000 1.9 @@ -3,7 +3,7 @@ use lib 't/lib'; use strict; -use Test::More tests => 33; +use Test::More tests => 48; use File::Spec (); @@ -96,18 +96,53 @@ package Simple; $VERSION = '1.23'; --- + <<'---', # mentions another module's $VERSION +package Simple; +$VERSION = '1.23'; +if ( $Other::VERSION ) { + # whatever +} +--- + <<'---', # mentions another module's $VERSION in a different package +package Simple; +$VERSION = '1.23'; +package Simple2; +if ( $Simple::VERSION ) { + # whatever +} +--- + <<'---', # $VERSION checked only in assignments, not relational ops +package Simple; +$VERSION = '1.23'; +if ( $VERSION == 3.45 ) { + # whatever +} +--- + <<'---', # $VERSION checked only in assignments, not relational ops +package Simple; +$VERSION = '1.23'; +package Simple2; +if ( $Simple::VERSION == 3.45 ) { + # whatever +} +--- ); my( $i, $n ) = ( 1, scalar( @modules ) ); foreach my $module ( @modules ) { SKIP: { - skip "No our() support until perl 5.6", 1 if $] < 5.006 && $module =~ /\bour\b/; + skip( "No our() support until perl 5.6", 2 ) + if $] < 5.006 && $module =~ /\bour\b/; $dist->change_file( 'lib/Simple.pm', $module ); $dist->regen; + + my $warnings = ''; + local $SIG{__WARN__} = sub { $warnings .= $_ for @_ }; my $pm_info = Module::Build::ModuleInfo->new_from_file( $file ); is( $pm_info->version, '1.23', "correct module version ($i of $n)" ); + is( $warnings, '', 'no warnings from parsing' ); $i++; } } |
|
From: Ken W. <kwi...@us...> - 2005-08-22 02:18:27
|
Update of /cvsroot/module-build/Module-Build/website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27743 Modified Files: META-spec.html META-spec.pod Log Message: Fix a format error in meta-spec field Index: META-spec.html =================================================================== RCS file: /cvsroot/module-build/Module-Build/website/META-spec.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- META-spec.html 28 Jul 2005 02:55:25 -0000 1.8 +++ META-spec.html 22 Aug 2005 02:18:17 -0000 1.9 @@ -98,7 +98,7 @@ license: <a href="http://dev.perl.org/licenses/">http://dev.perl.org/licenses/</a> meta-spec: version: 1.1 - url: <<a href="http://search.cpan.org/dist/CPAN-META-Specification-1.1/>">http://search.cpan.org/dist/CPAN-META-Specification-1.1/></a>; + url: <a href="http://search.cpan.org/dist/CPAN-META-Specification-1.1/">http://search.cpan.org/dist/CPAN-META-Specification-1.1/</a> generated_by: Module::Build version 0.20</pre> <p> </p> @@ -201,8 +201,9 @@ <h2><a name="metaspec">meta-spec</a></h2> <p>Example:</p> <pre> - meta-spec: |- - <a href="http://search.cpan.org/dist/CPAN-META-Specification-1.1/">http://search.cpan.org/dist/CPAN-META-Specification-1.1/</a></pre> + meta-spec: + version: 1.1 + url: <a href="http://search.cpan.org/dist/CPAN-META-Specification-1.1/">http://search.cpan.org/dist/CPAN-META-Specification-1.1/</a></pre> <p>(Spec 1.1) [required] {URL} This field indicates the location of the version of the META.yml specification used.</p> <p> Index: META-spec.pod =================================================================== RCS file: /cvsroot/module-build/Module-Build/website/META-spec.pod,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- META-spec.pod 28 Jul 2005 02:55:25 -0000 1.5 +++ META-spec.pod 22 Aug 2005 02:18:18 -0000 1.6 @@ -37,7 +37,7 @@ license: http://dev.perl.org/licenses/ meta-spec: version: 1.1 - url: <http://search.cpan.org/dist/CPAN-META-Specification-1.1/> + url: http://search.cpan.org/dist/CPAN-META-Specification-1.1/ generated_by: Module::Build version 0.20 =head1 DESCRIPTION @@ -152,8 +152,9 @@ Example: - meta-spec: |- - http://search.cpan.org/dist/CPAN-META-Specification-1.1/ + meta-spec: + version: 1.1 + url: http://search.cpan.org/dist/CPAN-META-Specification-1.1/ (Spec 1.1) [required] {URL} This field indicates the location of the version of the META.yml specification used. |
|
From: Ken W. <kwi...@us...> - 2005-08-11 11:58:40
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6226/lib/Module/Build Modified Files: Base.pm Log Message: Fix a return-too-early bug Index: Base.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v retrieving revision 1.474 retrieving revision 1.475 diff -u -d -r1.474 -r1.475 --- Base.pm 11 Aug 2005 09:36:45 -0000 1.474 +++ Base.pm 11 Aug 2005 11:58:30 -0000 1.475 @@ -2142,7 +2142,7 @@ my $outfile = File::Spec->catfile($fulldir, "${name}.html"); my $infile = File::Spec->abs2rel($pod); - return if $self->up_to_date($infile, $outfile); + next if $self->up_to_date($infile, $outfile); unless ( -d $fulldir ){ File::Path::mkpath($fulldir, 0, 0755) |
|
From: Randy W. S. <si...@us...> - 2005-08-11 09:36:55
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14997/lib/Module/Build Modified Files: Base.pm Log Message: Allow custom command line options to have dashes. Perform transformations on some builtin command line options so that dashes can be used in place of underscores. Allow boolean options to be used without arguments as a flag to set the option. Also, allow inverted option names to unset the option. Eg. --verbose, --noverbose, --no-verbose Index: Base.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v retrieving revision 1.473 retrieving revision 1.474 diff -u -d -r1.473 -r1.474 --- Base.pm 11 Aug 2005 01:58:29 -0000 1.473 +++ Base.pm 11 Aug 2005 09:36:45 -0000 1.474 @@ -1270,9 +1270,41 @@ return $self->{args}{$key}; } +sub _translate_option { + my $self = shift; + my $opt = shift; + + (my $tr_opt = $opt) =~ tr/-/_/; + + return $tr_opt if grep $_ eq $tr_opt, qw( + install_path + html_css + meta_add + meta_merge + gen_manpages + gen_html + install_manpages + install_html + test_files + install_base + create_makefile_pl + create_readme + extra_compiler_flags + extra_linker_flags + ignore_prereq_conflicts + ignore_prereq_requires + ignore_prereqs + skip_rcfile + ); # normalize only selected option names + + return $opt; +} + sub _read_arg { my ($self, $args, $key, $val) = @_; + $key = $self->_translate_option($key); + if ( exists $args->{$key} ) { $args->{$key} = [ $args->{$key} ] unless ref $args->{$key}; push @{$args->{$key}}, $val; @@ -1281,21 +1313,64 @@ } } +sub _optional_arg { + my $self = shift; + my $opt = shift; + my $argv = shift; + + $opt = $self->_translate_option($opt); + + my @bool_opts = qw( + gen_manpages + gen_html + install_manpages + install_html + verbose + create_readme + pollute + quiet + ignore_prereq_conflicts + ignore_prereq_requires + ignore_prereqs + skip_rcfile + ); + + # inverted boolean options; eg --noverbose or --no-verbose + # converted to proper name & returned with false value (verbose, 0) + if ( grep $opt =~ /^no-?$_$/, @bool_opts ) { + $opt =~ s/^no-?//; + return ($opt, 0); + } + + # non-boolean option; return option unchanged along with its argument + return ($opt, shift(@$argv)) unless grep $_ eq $opt, @bool_opts; + + # we're punting a bit here, if an option appears followed by a digit + # we take the digit as the argument for the option. If there is + # nothing that looks like a digit, we pretent the option is a flag + # that is being set and has no argument. + my $arg = 1; + $arg = shift(@$argv) if @$argv && $argv->[0] =~ /^\d+$/; + + return ($opt, $arg); +} + sub read_args { my $self = shift; my ($action, @argv); (my $args, @_) = $self->cull_options(@_); my %args = %$args; + my $opt_re = qr/[\w\-]+/; + while (@_) { local $_ = shift; - if ( /^(\w+)=(.*)/ ) { - $self->_read_arg(\%args, $1, $2); - } elsif ( /^--(\w+)$/ ) { - $self->_read_arg(\%args, $1, shift()); - } elsif ( /^--(\w+)=(.*)$/ ) { + if ( /^(?:--)?($opt_re)=(.*)$/ ) { $self->_read_arg(\%args, $1, $2); - } elsif ( /^(\w+)$/ and !defined($action)) { + } elsif ( /^--($opt_re)$/ ) { + my($opt, $arg) = $self->_optional_arg($1, \@_); + $self->_read_arg(\%args, $opt, $arg); + } elsif ( /^($opt_re)$/ and !defined($action)) { $action = $1; } else { push @argv, $_; |
|
From: Ken W. <kwi...@us...> - 2005-08-11 02:36:57
|
Update of /cvsroot/module-build/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18685/lib/CPANPLUS/Dist Modified Files: Build.pm Log Message: Honor build_requires as well as just requires Index: Build.pm =================================================================== RCS file: /cvsroot/module-build/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Build.pm 8 Aug 2005 03:00:57 -0000 1.4 +++ Build.pm 11 Aug 2005 02:36:45 -0000 1.5 @@ -336,8 +336,11 @@ my $mb = $dist->status->_mb_object; my $self = $dist->parent; - ### Lame++, at least return an empty hashref... - my $prereqs = $mb->requires || {}; + my $prereqs = {}; + foreach my $type ('requires', 'build_requires') { + my $p = $mb->$type() || {}; + $prereqs->{$_} = $p->{$_} foreach keys %$p; + } $self->status->prereqs( $prereqs ); return $prereqs; |
|
From: Ken W. <kwi...@us...> - 2005-08-11 01:59:53
|
Update of /cvsroot/module-build/CPANPLUS-Dist-Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13943 Added Files: .cvsignore Log Message: --- NEW FILE: .cvsignore --- blib Makefile pm_to_blib |
|
From: Ken W. <kwi...@us...> - 2005-08-11 01:58:37
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13781/lib/Module/Build Modified Files: Base.pm Log Message: Fix a bug with licenses that have no known URL Index: Base.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v retrieving revision 1.472 retrieving revision 1.473 diff -u -d -r1.472 -r1.473 --- Base.pm 4 Aug 2005 06:47:34 -0000 1.472 +++ Base.pm 11 Aug 2005 01:58:29 -0000 1.473 @@ -2590,8 +2590,8 @@ $self->log_warn("No license specified, setting license = 'unknown'\n"); $p->{license} = 'unknown'; } - unless ($self->valid_licenses->{ $p->{license} }) { - die "Unknown license type '$p->{license}"; + unless (exists $self->valid_licenses->{ $p->{license} }) { + die "Unknown license type '$p->{license}'"; } # If we're in the distdir, the metafile may exist and be non-writable. |
|
From: Ken W. <kwi...@us...> - 2005-08-11 01:58:23
|
Update of /cvsroot/module-build/Module-Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13741 Modified Files: Changes Log Message: Index: Changes =================================================================== RCS file: /cvsroot/module-build/Module-Build/Changes,v retrieving revision 1.368 retrieving revision 1.369 diff -u -d -r1.368 -r1.369 --- Changes 29 Jul 2005 03:26:39 -0000 1.368 +++ Changes 11 Aug 2005 01:58:10 -0000 1.369 @@ -16,6 +16,9 @@ - Added the Apache, MIT, and Mozilla licenses to the list of licenses that this module knows about. [Bob Ippolito] + - Added a URL for each license type that we know about, which will + appear as resources=>license: in the generated META.yml file. + - Fixed a pretty significant typo in the documentation for auto_features. [Spotted by Jonas B. Nielsen] |
|
From: Ken W. <kwi...@us...> - 2005-08-08 03:04:15
|
Update of /cvsroot/module-build/CPANPLUS-Dist-Build/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13419/t Modified Files: 02_CPANPLUS-Dist-Build.t Log Message: Get rid of a bunch of warnings. A couple types we just mask, because one is a fault of CPANPLUS itself, and another is a 'redefined' warning about some subroutines we're purposefully overriding. We also get rid of some 'undef' warnings that were caused by setting 'sudo' to undef - now we use the empty string. Would be better if instead we could set a "use sudo" option to false or something. Index: 02_CPANPLUS-Dist-Build.t =================================================================== RCS file: /cvsroot/module-build/CPANPLUS-Dist-Build/t/02_CPANPLUS-Dist-Build.t,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- 02_CPANPLUS-Dist-Build.t 8 Aug 2005 00:44:18 -0000 1.5 +++ 02_CPANPLUS-Dist-Build.t 8 Aug 2005 03:04:05 -0000 1.6 @@ -23,6 +23,8 @@ use Config; use IPC::Cmd 'can_run'; +$SIG{__WARN__} = sub {warn @_ unless @_ && $_[0] =~ /redefined|isn't numeric/}; + # Load these two modules in advance, even though they would be # auto-loaded, because we want to override some of their subs. use ExtUtils::Packlist; @@ -67,7 +69,7 @@ $Conf->set_conf( cpantest => 0 ); ### we dont need sudo -- we're installing in our own sandbox now - $Conf->set_program( sudo => undef ); + $Conf->set_program( sudo => '' ); } use_ok( $Class ); @@ -159,7 +161,6 @@ my $p = ExtUtils::Packlist->new($packlist); ok keys(%$p) > 0, "Packlist contains entries"; - local $^W = 0; # Avoid 'redefined' warnings local *CPANPLUS::Module::installed_version = sub {1}; local *CPANPLUS::Module::packlist = sub { [$p] }; local *ExtUtils::Installed::files = sub { keys %$p }; |
|
From: Ken W. <kwi...@us...> - 2005-08-08 03:01:08
|
Update of /cvsroot/module-build/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13234/lib/CPANPLUS/Dist Modified Files: Build.pm Log Message: Don't re-declare this variable Index: Build.pm =================================================================== RCS file: /cvsroot/module-build/CPANPLUS-Dist-Build/lib/CPANPLUS/Dist/Build.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Build.pm 4 Aug 2005 03:11:22 -0000 1.3 +++ Build.pm 8 Aug 2005 03:00:57 -0000 1.4 @@ -293,7 +293,7 @@ # XXX get the latest version from the CPAN index and check it no strict 'refs'; local ${$mod . '::VERSION'} = get_indexed_version($mod); # XXX this function doesn't exist - my $status = Module::Build->check_installed_status($mod, $prereqs->{$mod}); + $status = Module::Build->check_installed_status($mod, $prereqs->{$mod}); if ($status->{ok}) { $prereqs_out{$mod} = $status->{have}; next; |
|
From: Ken W. <kwi...@us...> - 2005-08-08 00:44:43
|
Update of /cvsroot/module-build/CPANPLUS-Dist-Build/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25332/t Modified Files: 02_CPANPLUS-Dist-Build.t Log Message: Add some commentage Index: 02_CPANPLUS-Dist-Build.t =================================================================== RCS file: /cvsroot/module-build/CPANPLUS-Dist-Build/t/02_CPANPLUS-Dist-Build.t,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- 02_CPANPLUS-Dist-Build.t 8 Aug 2005 00:41:01 -0000 1.4 +++ 02_CPANPLUS-Dist-Build.t 8 Aug 2005 00:44:18 -0000 1.5 @@ -150,12 +150,15 @@ # in order to test uninstallation 'lib'->import( File::Spec->catdir($Lib, 'lib', 'perl5') ); + # EU::Installed and CP+::M are only capable of searching + # for modules in the core directories. We need to fake + # them out with our own subs here. my $packlist = find_module($mod->name . '::.packlist'); ok $packlist, "Found packlist"; my $p = ExtUtils::Packlist->new($packlist); ok keys(%$p) > 0, "Packlist contains entries"; - + local $^W = 0; # Avoid 'redefined' warnings local *CPANPLUS::Module::installed_version = sub {1}; local *CPANPLUS::Module::packlist = sub { [$p] }; |
|
From: Ken W. <kwi...@us...> - 2005-08-08 00:41:12
|
Update of /cvsroot/module-build/CPANPLUS-Dist-Build/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25021/t Modified Files: 02_CPANPLUS-Dist-Build.t Log Message: Get the uninstallation tests working with a zillion workarounds Index: 02_CPANPLUS-Dist-Build.t =================================================================== RCS file: /cvsroot/module-build/CPANPLUS-Dist-Build/t/02_CPANPLUS-Dist-Build.t,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- 02_CPANPLUS-Dist-Build.t 5 Aug 2005 03:34:48 -0000 1.3 +++ 02_CPANPLUS-Dist-Build.t 8 Aug 2005 00:41:01 -0000 1.4 @@ -10,16 +10,6 @@ } use strict; - -# In order to get the uninstall stuff to work, we have to push this -# dir onto @INC before loading CPANPLUS. -my $Lib; -BEGIN { - $Lib = File::Spec->rel2abs(File::Spec->catdir( qw[dummy-perl] )); - my $liblib = File::Spec->catdir($Lib, 'lib', 'perl5'); - push @INC, $liblib; -} - use CPANPLUS::Configure; use CPANPLUS::Backend; use CPANPLUS::Internals::Constants; @@ -33,11 +23,17 @@ use Config; use IPC::Cmd 'can_run'; +# Load these two modules in advance, even though they would be +# auto-loaded, because we want to override some of their subs. +use ExtUtils::Packlist; +use ExtUtils::Installed; + my $Class = 'CPANPLUS::Dist::Build'; my $Utils = 'CPANPLUS::Internals::Utils'; my $Have_CC = can_run($Config{'cc'} )? 1 : 0; +my $Lib = File::Spec->rel2abs(File::Spec->catdir( qw[dummy-perl] )); my $Src = File::Spec->rel2abs(File::Spec->catdir( qw[src] )); @@ -149,6 +145,21 @@ my $minversion = 0.2609; skip(qq[Uninstalling requires at least Module::Build $minversion], 1) unless eval { Module::Build->VERSION($minversion); 1 }; + + # The installation directory actually needs to be in @INC + # in order to test uninstallation + 'lib'->import( File::Spec->catdir($Lib, 'lib', 'perl5') ); + + my $packlist = find_module($mod->name . '::.packlist'); + ok $packlist, "Found packlist"; + + my $p = ExtUtils::Packlist->new($packlist); + ok keys(%$p) > 0, "Packlist contains entries"; + + local $^W = 0; # Avoid 'redefined' warnings + local *CPANPLUS::Module::installed_version = sub {1}; + local *CPANPLUS::Module::packlist = sub { [$p] }; + local *ExtUtils::Installed::files = sub { keys %$p }; ok( $mod->uninstall,"Uninstalling module" ); } @@ -158,6 +169,26 @@ $Utils->_rmdir( dir => $Conf->get_conf('base') ); } +sub find_module { + my $module = shift; + + # Don't add the .pm yet, in case it's a packlist or something like ExtUtils::xsubpp. + my $file = File::Spec->catfile( split m/::/, $module ); + my $candidate; + foreach (@INC) { + if (-e ($candidate = File::Spec->catdir($_, $file)) + or + -e ($candidate = File::Spec->catdir($_, "$file.pm")) + or + -e ($candidate = File::Spec->catdir($_, 'auto', $file)) + or + -e ($candidate = File::Spec->catdir($_, 'auto', "$file.pm"))) { + return $candidate; + } + } + return; +} + # Local variables: # c-indentation-style: bsd # c-basic-offset: 4 |
|
From: Ken W. <kwi...@us...> - 2005-08-05 03:35:06
|
Update of /cvsroot/module-build/CPANPLUS-Dist-Build/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28508/t Modified Files: 02_CPANPLUS-Dist-Build.t Log Message: Add a CPANPLUS workaround that gets uninstall() almost working Index: 02_CPANPLUS-Dist-Build.t =================================================================== RCS file: /cvsroot/module-build/CPANPLUS-Dist-Build/t/02_CPANPLUS-Dist-Build.t,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- 02_CPANPLUS-Dist-Build.t 4 Aug 2005 01:45:16 -0000 1.2 +++ 02_CPANPLUS-Dist-Build.t 5 Aug 2005 03:34:48 -0000 1.3 @@ -10,6 +10,16 @@ } use strict; + +# In order to get the uninstall stuff to work, we have to push this +# dir onto @INC before loading CPANPLUS. +my $Lib; +BEGIN { + $Lib = File::Spec->rel2abs(File::Spec->catdir( qw[dummy-perl] )); + my $liblib = File::Spec->catdir($Lib, 'lib', 'perl5'); + push @INC, $liblib; +} + use CPANPLUS::Configure; use CPANPLUS::Backend; use CPANPLUS::Internals::Constants; @@ -28,7 +38,6 @@ my $Have_CC = can_run($Config{'cc'} )? 1 : 0; -my $Lib = File::Spec->rel2abs(File::Spec->catdir( qw[dummy-perl] )); my $Src = File::Spec->rel2abs(File::Spec->catdir( qw[src] )); |
