r57982 - in /trunk/libmodule-install-xsutil-perl: ./ debian/ example/ inc/Module/ inc/Module/Install/ lib/Module/Install/ t/ xt/

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Sun May 16 15:15:36 UTC 2010


Author: ansgar-guest
Date: Sun May 16 15:15:13 2010
New Revision: 57982

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=57982
Log:
* New upstream release.
* debian/rules: Install MyMakefile.PL as Makefile.PL.

Added:
    trunk/libmodule-install-xsutil-perl/example/MyMakefile.PL
      - copied unchanged from r57980, branches/upstream/libmodule-install-xsutil-perl/current/example/MyMakefile.PL
Removed:
    trunk/libmodule-install-xsutil-perl/example/Makefile.PL
Modified:
    trunk/libmodule-install-xsutil-perl/Changes
    trunk/libmodule-install-xsutil-perl/MANIFEST
    trunk/libmodule-install-xsutil-perl/META.yml
    trunk/libmodule-install-xsutil-perl/debian/changelog
    trunk/libmodule-install-xsutil-perl/debian/rules
    trunk/libmodule-install-xsutil-perl/inc/Module/Install.pm
    trunk/libmodule-install-xsutil-perl/inc/Module/Install/Base.pm
    trunk/libmodule-install-xsutil-perl/inc/Module/Install/Makefile.pm
    trunk/libmodule-install-xsutil-perl/inc/Module/Install/Metadata.pm
    trunk/libmodule-install-xsutil-perl/inc/Module/Install/WriteAll.pm
    trunk/libmodule-install-xsutil-perl/lib/Module/Install/XSUtil.pm
    trunk/libmodule-install-xsutil-perl/t/01_example.t
    trunk/libmodule-install-xsutil-perl/xt/01_podspell.t

Modified: trunk/libmodule-install-xsutil-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/Changes?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/Changes (original)
+++ trunk/libmodule-install-xsutil-perl/Changes Sun May 16 15:15:13 2010
@@ -1,4 +1,18 @@
 Revision history for Perl extension Module::Install::XSUtil
+
+0.24 Sun May 16 13:24:58 2010
+    - Compliant with Module::Install 0.97
+
+0.23_02 Fri May 14 11:42:09 2010
+    - Don't exit if include dirs don't exist (lestrrat)
+    - Add cc_assert_lib() as an interface to Devel::CheckLib (lestrrat)
+    - Add want_xs() (lestrrat)
+    - Separate out detection of "-" and stuff to cc_libs(), and let
+      cc_append_to_lib()s just be a simple function (lestrrat)
+
+0.23_01 Mon May 10 12:10:59 2010
+    - Clarify docs (lestrrat)
+    - Add want_xs() command (lestrrat)
 
 0.23 Sun May  9 11:15:41 2010
     - Setup clean_files for gcov output files (*.gcov, *.gcno, *.gcda)

Modified: trunk/libmodule-install-xsutil-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/MANIFEST?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/MANIFEST (original)
+++ trunk/libmodule-install-xsutil-perl/MANIFEST Sun May 16 15:15:13 2010
@@ -3,7 +3,7 @@
 example/include/foo/bar.h
 example/include/foo/baz.h
 example/lib/Foo.pm
-example/Makefile.PL
+example/MyMakefile.PL
 example/README
 example/src/bar.c
 example/src/Foo.xs

Modified: trunk/libmodule-install-xsutil-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/META.yml?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/META.yml (original)
+++ trunk/libmodule-install-xsutil-perl/META.yml Sun May 16 15:15:13 2010
@@ -12,7 +12,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
-generated_by: 'Module::Install version 0.95'
+generated_by: 'Module::Install version 0.97'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -31,4 +31,4 @@
 resources:
   license: http://dev.perl.org/licenses/
   repository: git://github.com/gfx/Perl-Module-Install-XSUtil.git
-version: 0.23
+version: 0.24

Modified: trunk/libmodule-install-xsutil-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/debian/changelog?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/debian/changelog (original)
+++ trunk/libmodule-install-xsutil-perl/debian/changelog Sun May 16 15:15:13 2010
@@ -1,3 +1,10 @@
+libmodule-install-xsutil-perl (0.24-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules: Install MyMakefile.PL as Makefile.PL.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Mon, 17 May 2010 00:11:03 +0900
+
 libmodule-install-xsutil-perl (0.23-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libmodule-install-xsutil-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/debian/rules?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/debian/rules (original)
+++ trunk/libmodule-install-xsutil-perl/debian/rules Sun May 16 15:15:13 2010
@@ -8,6 +8,8 @@
 
 override_dh_installexamples:
 	dh_installexamples
+	mv $(TMP)/usr/share/doc/$(PACKAGE)/examples/MyMakefile.PL \
+	   $(TMP)/usr/share/doc/$(PACKAGE)/examples/Makefile.PL
 	sed -i '1s|^#!perl|#!/usr/bin/perl|' $(TMP)/usr/share/doc/$(PACKAGE)/examples/Makefile.PL
 	sed -i '1s|^#!perl|#!/usr/bin/perl|' $(TMP)/usr/share/doc/$(PACKAGE)/examples/t/foo.t
 

Modified: trunk/libmodule-install-xsutil-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/inc/Module/Install.pm?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/inc/Module/Install.pm (original)
+++ trunk/libmodule-install-xsutil-perl/inc/Module/Install.pm Sun May 16 15:15:13 2010
@@ -32,7 +32,7 @@
 	# 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.95';
+	$VERSION = '0.97';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -127,6 +127,11 @@
 	#-------------------------------------------------------------
 
 	unless ( -f $self->{file} ) {
+		foreach my $key (keys %INC) {
+			delete $INC{$key} if $key =~ /Module\/Install/;
+		}
+
+		local $^W;
 		require "$self->{path}/$self->{dispatch}.pm";
 		File::Path::mkpath("$self->{prefix}/$self->{author}");
 		$self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
@@ -135,12 +140,13 @@
 		goto &{"$self->{name}::import"};
 	}
 
+	local $^W;
 	*{"${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"};
+	delete $INC{'inc/Module/Install.pm'};
+	delete $INC{'Module/Install.pm'};
 
 	# Save to the singleton
 	$MAIN = $self;
@@ -159,7 +165,21 @@
 			# Delegate back to parent dirs
 			goto &$code unless $cwd eq $pwd;
 		}
-		$$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
+		unless ($$sym =~ s/([^:]+)$//) {
+			# XXX: it looks like we can't retrieve the missing function
+			# via $$sym (usually $main::AUTOLOAD) in this case.
+			# I'm still wondering if we should slurp Makefile.PL to
+			# get some context or not ...
+			my ($package, $file, $line) = caller;
+			die <<"EOT";
+Unknown function is found at $file line $line.
+Execution of $file aborted due to runtime errors.
+
+If you're a contributor to a project, you may need to install
+some Module::Install extensions from CPAN (or other repository).
+If you're a user of a module, please contact the author.
+EOT
+		}
 		my $method = $1;
 		if ( uc($method) eq $method ) {
 			# Do nothing
@@ -200,6 +220,7 @@
 
 	my $who = $self->_caller;
 	foreach my $name ( sort keys %seen ) {
+		local $^W;
 		*{"${who}::$name"} = sub {
 			${"${who}::AUTOLOAD"} = "${who}::$name";
 			goto &{"${who}::AUTOLOAD"};
@@ -210,12 +231,13 @@
 sub new {
 	my ($class, %args) = @_;
 
+	FindBin->again;
+
 	# 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';
@@ -268,8 +290,10 @@
 sub load_extensions {
 	my ($self, $path, $top) = @_;
 
+	my $should_reload = 0;
 	unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
 		unshift @INC, $self->{prefix};
+		$should_reload = 1;
 	}
 
 	foreach my $rv ( $self->find_extensions($path) ) {
@@ -277,12 +301,13 @@
 		next if $self->{pathnames}{$pkg};
 
 		local $@;
-		my $new = eval { require $file; $pkg->can('new') };
+		my $new = eval { local $^W; require $file; $pkg->can('new') };
 		unless ( $new ) {
 			warn $@ if $@;
 			next;
 		}
-		$self->{pathnames}{$pkg} = delete $INC{$file};
+		$self->{pathnames}{$pkg} =
+			$should_reload ? delete $INC{$file} : $INC{$file};
 		push @{$self->{extensions}}, &{$new}($pkg, _top => $top );
 	}
 

Modified: trunk/libmodule-install-xsutil-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/inc/Module/Install/Base.pm?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libmodule-install-xsutil-perl/inc/Module/Install/Base.pm Sun May 16 15:15:13 2010
@@ -4,7 +4,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '0.95';
+	$VERSION = '0.97';
 }
 
 # Suspend handler for "redefined" warnings
@@ -51,12 +51,17 @@
 #line 106
 
 sub is_admin {
-	$_[0]->admin->VERSION;
+	! $_[0]->admin->isa('Module::Install::Base::FakeAdmin');
 }
 
 sub DESTROY {}
 
 package Module::Install::Base::FakeAdmin;
+
+use vars qw{$VERSION};
+BEGIN {
+	$VERSION = $Module::Install::Base::VERSION;
+}
 
 my $fake;
 
@@ -75,4 +80,4 @@
 
 1;
 
-#line 154
+#line 159

Modified: trunk/libmodule-install-xsutil-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/inc/Module/Install/Makefile.pm?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libmodule-install-xsutil-perl/inc/Module/Install/Makefile.pm Sun May 16 15:15:13 2010
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.95';
+	$VERSION = '0.97';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -101,24 +101,26 @@
 	my ($self, %new_args) = @_;
 	my $args = ( $self->{makemaker_args} ||= {} );
 	foreach my $key (keys %new_args) {
-		if ($makemaker_argtype{$key} eq 'ARRAY') {
-			$args->{$key} = [] unless defined $args->{$key};
-			unless (ref $args->{$key} eq 'ARRAY') {
-				$args->{$key} = [$args->{$key}]
+		if ($makemaker_argtype{$key}) {
+			if ($makemaker_argtype{$key} eq 'ARRAY') {
+				$args->{$key} = [] unless defined $args->{$key};
+				unless (ref $args->{$key} eq 'ARRAY') {
+					$args->{$key} = [$args->{$key}]
+				}
+				push @{$args->{$key}},
+					ref $new_args{$key} eq 'ARRAY'
+						? @{$new_args{$key}}
+						: $new_args{$key};
 			}
-			push @{$args->{$key}},
-				ref $new_args{$key} eq 'ARRAY'
-					? @{$new_args{$key}}
-					: $new_args{$key};
-		}
-		elsif ($makemaker_argtype{$key} eq 'HASH') {
-			$args->{$key} = {} unless defined $args->{$key};
-			foreach my $skey (keys %{ $new_args{$key} }) {
-				$args->{$key}{$skey} = $new_args{$key}{$skey};
+			elsif ($makemaker_argtype{$key} eq 'HASH') {
+				$args->{$key} = {} unless defined $args->{$key};
+				foreach my $skey (keys %{ $new_args{$key} }) {
+					$args->{$key}{$skey} = $new_args{$key}{$skey};
+				}
 			}
-		}
-		elsif ($makemaker_argtype{$key} eq 'APPENDABLE') {
-			$self->makemaker_append($key => $new_args{$key});
+			elsif ($makemaker_argtype{$key} eq 'APPENDABLE') {
+				$self->makemaker_append($key => $new_args{$key});
+			}
 		}
 		else {
 			if (defined $args->{$key}) {
@@ -178,28 +180,22 @@
 	$self->makemaker_args( INC => shift );
 }
 
-my %test_dir = ();
-
 sub _wanted_t {
-	/\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1;
 }
 
 sub tests_recursive {
 	my $self = shift;
-	if ( $self->tests ) {
-		die "tests_recursive will not work if tests are already defined";
-	}
 	my $dir = shift || 't';
 	unless ( -d $dir ) {
 		die "tests_recursive dir '$dir' does not exist";
 	}
-	%test_dir = ();
+	my %tests = map { $_ => 1 } split / /, ($self->tests || '');
 	require File::Find;
-	File::Find::find( \&_wanted_t, $dir );
-	if ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
-		File::Find::find( \&_wanted_t, 'xt' );
-	}
-	$self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir );
+	File::Find::find(
+        sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 },
+        $dir
+    );
+	$self->tests( join ' ', sort keys %tests );
 }
 
 sub write {
@@ -251,6 +247,9 @@
 		$args->{test} = {
 			TESTS => (join ' ', grep {!$seen{$_}++} @tests),
 		};
+    } elsif ( $Module::Install::ExtraTests::use_extratests ) {
+        # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness.
+        # So, just ignore our xt tests here.
 	} elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
 		$args->{test} = {
 			TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ),
@@ -297,13 +296,22 @@
 	# Remove any reference to perl, BUILD_REQUIRES doesn't support it
 	delete $args->{BUILD_REQUIRES}->{perl};
 
-	# Delete bundled dists from prereq_pm
-	my $subdirs = ($args->{DIR} ||= []);
+	# Delete bundled dists from prereq_pm, add it to Makefile DIR
+	my $subdirs = ($args->{DIR} || []);
 	if ($self->bundles) {
+		my %processed;
 		foreach my $bundle (@{ $self->bundles }) {
-			my ($file, $dir) = @$bundle;
-			push @$subdirs, $dir if -d $dir;
-			delete $build_prereq->{$file}; #Delete from build prereqs only
+			my ($mod_name, $dist_dir) = @$bundle;
+			delete $prereq->{$mod_name};
+			$dist_dir = File::Basename::basename($dist_dir); # dir for building this module
+			if (not exists $processed{$dist_dir}) {
+				if (-d $dist_dir) {
+					# List as sub-directory to be processed by make
+					push @$subdirs, $dist_dir;
+				}
+				# Else do nothing: the module is already present on the system
+				$processed{$dist_dir} = undef;
+			}
 		}
 	}
 
@@ -402,4 +410,4 @@
 
 __END__
 
-#line 531
+#line 539

Modified: trunk/libmodule-install-xsutil-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/inc/Module/Install/Metadata.pm?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libmodule-install-xsutil-perl/inc/Module/Install/Metadata.pm Sun May 16 15:15:13 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.95';
+	$VERSION = '0.97';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -178,43 +178,6 @@
 	$self->{values}->{perl_version} = $version;
 }
 
-#Stolen from M::B
-my %license_urls = (
-    perl         => 'http://dev.perl.org/licenses/',
-    apache       => 'http://apache.org/licenses/LICENSE-2.0',
-    artistic     => 'http://opensource.org/licenses/artistic-license.php',
-    artistic_2   => 'http://opensource.org/licenses/artistic-license-2.0.php',
-    lgpl         => 'http://opensource.org/licenses/lgpl-license.php',
-    lgpl2        => 'http://opensource.org/licenses/lgpl-2.1.php',
-    lgpl3        => 'http://opensource.org/licenses/lgpl-3.0.html',
-    bsd          => 'http://opensource.org/licenses/bsd-license.php',
-    gpl          => 'http://opensource.org/licenses/gpl-license.php',
-    gpl2         => 'http://opensource.org/licenses/gpl-2.0.php',
-    gpl3         => 'http://opensource.org/licenses/gpl-3.0.html',
-    mit          => 'http://opensource.org/licenses/mit-license.php',
-    mozilla      => 'http://opensource.org/licenses/mozilla1.1.php',
-    open_source  => undef,
-    unrestricted => undef,
-    restrictive  => undef,
-    unknown      => undef,
-);
-
-sub license {
-	my $self = shift;
-	return $self->{values}->{license} unless @_;
-	my $license = shift or die(
-		'Did not provide a value to license()'
-	);
-	$self->{values}->{license} = $license;
-
-	# Automatically fill in license URLs
-	if ( $license_urls{$license} ) {
-		$self->resources( license => $license_urls{$license} );
-	}
-
-	return 1;
-}
-
 sub all_from {
 	my ( $self, $file ) = @_;
 
@@ -354,6 +317,9 @@
 	require ExtUtils::MM_Unix;
 	my ( $self, $file ) = @_;
 	$self->version( ExtUtils::MM_Unix->parse_version($file) );
+
+	# for version integrity check
+	$self->makemaker_args( VERSION_FROM => $file );
 }
 
 sub abstract_from {
@@ -364,7 +330,7 @@
 			{ DISTNAME => $self->name },
 			'ExtUtils::MM_Unix'
 		)->parse_abstract($file)
-	 );
+	);
 }
 
 # Add both distribution and module name
@@ -479,42 +445,89 @@
 	}
 }
 
+#Stolen from M::B
+my %license_urls = (
+    perl         => 'http://dev.perl.org/licenses/',
+    apache       => 'http://apache.org/licenses/LICENSE-2.0',
+    apache_1_1   => 'http://apache.org/licenses/LICENSE-1.1',
+    artistic     => 'http://opensource.org/licenses/artistic-license.php',
+    artistic_2   => 'http://opensource.org/licenses/artistic-license-2.0.php',
+    lgpl         => 'http://opensource.org/licenses/lgpl-license.php',
+    lgpl2        => 'http://opensource.org/licenses/lgpl-2.1.php',
+    lgpl3        => 'http://opensource.org/licenses/lgpl-3.0.html',
+    bsd          => 'http://opensource.org/licenses/bsd-license.php',
+    gpl          => 'http://opensource.org/licenses/gpl-license.php',
+    gpl2         => 'http://opensource.org/licenses/gpl-2.0.php',
+    gpl3         => 'http://opensource.org/licenses/gpl-3.0.html',
+    mit          => 'http://opensource.org/licenses/mit-license.php',
+    mozilla      => 'http://opensource.org/licenses/mozilla1.1.php',
+    open_source  => undef,
+    unrestricted => undef,
+    restrictive  => undef,
+    unknown      => undef,
+);
+
+sub license {
+	my $self = shift;
+	return $self->{values}->{license} unless @_;
+	my $license = shift or die(
+		'Did not provide a value to license()'
+	);
+	$license = __extract_license($license) || lc $license;
+	$self->{values}->{license} = $license;
+
+	# Automatically fill in license URLs
+	if ( $license_urls{$license} ) {
+		$self->resources( license => $license_urls{$license} );
+	}
+
+	return 1;
+}
+
 sub _extract_license {
 	my $pod = shift;
 	my $matched;
 	return __extract_license(
 		($matched) = $pod =~ m/
-			(=head \d \s+ (?:licen[cs]e|licensing)\b.*?)
+			(=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?)
 			(=head \d.*|=cut.*|)\z
-		/ixms
+		/xms
 	) || __extract_license(
 		($matched) = $pod =~ m/
-			(=head \d \s+ (?:copyrights?|legal)\b.*?)
+			(=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?)
 			(=head \d.*|=cut.*|)\z
-		/ixms
+		/xms
 	);
 }
 
 sub __extract_license {
 	my $license_text = shift or return;
 	my @phrases      = (
-		'under the same (?:terms|license) as (?:perl|the perl programming language)' => 'perl', 1,
-		'under the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
-		'Artistic and GPL'                   => 'perl',        1,
-		'GNU general public license'         => 'gpl',         1,
-		'GNU public license'                 => 'gpl',         1,
-		'GNU lesser general public license'  => 'lgpl',        1,
-		'GNU lesser public license'          => 'lgpl',        1,
-		'GNU library general public license' => 'lgpl',        1,
-		'GNU library public license'         => 'lgpl',        1,
-		'BSD license'                        => 'bsd',         1,
-		'Artistic license'                   => 'artistic',    1,
-		'GPL'                                => 'gpl',         1,
-		'LGPL'                               => 'lgpl',        1,
-		'BSD'                                => 'bsd',         1,
-		'Artistic'                           => 'artistic',    1,
-		'MIT'                                => 'mit',         1,
-		'proprietary'                        => 'proprietary', 0,
+		'(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1,
+		'(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
+		'Artistic and GPL'                   => 'perl',         1,
+		'GNU general public license'         => 'gpl',          1,
+		'GNU public license'                 => 'gpl',          1,
+		'GNU lesser general public license'  => 'lgpl',         1,
+		'GNU lesser public license'          => 'lgpl',         1,
+		'GNU library general public license' => 'lgpl',         1,
+		'GNU library public license'         => 'lgpl',         1,
+		'GNU Free Documentation license'     => 'unrestricted', 1,
+		'GNU Affero General Public License'  => 'open_source',  1,
+		'(?:Free)?BSD license'               => 'bsd',          1,
+		'Artistic license'                   => 'artistic',     1,
+		'Apache (?:Software )?license'       => 'apache',       1,
+		'GPL'                                => 'gpl',          1,
+		'LGPL'                               => 'lgpl',         1,
+		'BSD'                                => 'bsd',          1,
+		'Artistic'                           => 'artistic',     1,
+		'MIT'                                => 'mit',          1,
+		'Mozilla Public License'             => 'mozilla',      1,
+		'Q Public License'                   => 'open_source',  1,
+		'OpenSSL License'                    => 'unrestricted', 1,
+		'SSLeay License'                     => 'unrestricted', 1,
+		'zlib License'                       => 'open_source',  1,
+		'proprietary'                        => 'proprietary',  0,
 	);
 	while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
 		$pattern =~ s#\s+#\\s+#gs;
@@ -522,6 +535,7 @@
 			return $license;
 		}
 	}
+	return '';
 }
 
 sub license_from {

Modified: trunk/libmodule-install-xsutil-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/inc/Module/Install/WriteAll.pm?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libmodule-install-xsutil-perl/inc/Module/Install/WriteAll.pm Sun May 16 15:15:13 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.95';;
+	$VERSION = '0.97';;
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }

Modified: trunk/libmodule-install-xsutil-perl/lib/Module/Install/XSUtil.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/lib/Module/Install/XSUtil.pm?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/lib/Module/Install/XSUtil.pm (original)
+++ trunk/libmodule-install-xsutil-perl/lib/Module/Install/XSUtil.pm Sun May 16 15:15:13 2010
@@ -2,7 +2,7 @@
 
 use 5.005_03;
 
-$VERSION = '0.23';
+$VERSION = '0.24';
 
 use Module::Install::Base;
 @ISA     = qw(Module::Install::Base);
@@ -85,18 +85,26 @@
     my $cc_available;
 
     sub cc_available {
-        return $cc_available if defined $cc_available;
+        return defined $cc_available ?
+            $cc_available :
+            ($cc_available = shift->can_cc())
+        ;
+    }
+
+    my $want_xs;
+    sub want_xs {
+        my $default = @_ ? shift : 1; # you're using this module, you /must/ want XS by default
+        return $want_xs if defined $want_xs;
 
         foreach my $arg(@ARGV){
             if($arg eq '--pp'){
-                return $cc_available = 0;
+                return $want_xs = 0;
             }
             elsif($arg eq '--xs'){
-                return $cc_available = 1;
+                return $want_xs = 1;
             }
         }
-
-        return $cc_available = shift->can_cc();
+        return $want_xs = $default;
     }
 }
 
@@ -171,7 +179,6 @@
     for my $dir(@dirs){
         unless(-d $dir){
             warn("'$dir' not found: $!\n");
-            exit;
         }
 
         _verbose "inc: -I$dir" if _VERBOSE;
@@ -189,19 +196,10 @@
     return;
 }
 
-
 sub cc_libs {
-    goto &cc_append_to_libs;
-}
-
-sub cc_append_to_libs{
-    my($self, @libs) = @_;
-
-    $self->_xs_initialize();
-
-    my $mm = $self->makemaker_args;
-
-    my $libs = join q{ }, map{
+    my ($self, @libs) = @_;
+
+    @libs = map{
         my($name, $dir) = ref($_) eq 'ARRAY' ? @{$_} : ($_, undef);
         my $lib;
         if(defined $dir) {
@@ -210,18 +208,58 @@
         else {
             $lib = '';
         }
-        $lib .= ($name =~ /^-/ ? qq{$name } : qq{-l$name});
+        $lib .= ($name =~ /^-/ ? qq{$name} : qq{-l$name});
         _verbose "libs: $lib" if _VERBOSE;
         $lib;
     } @libs;
 
-    if($mm->{LIBS}){
+    $self->cc_append_to_libs( @libs );
+}
+
+sub cc_append_to_libs{
+    my($self, @libs) = @_;
+
+    $self->_xs_initialize();
+
+    return unless @libs;
+
+    my $libs = join q{ }, @libs;
+
+    my $mm = $self->makemaker_args;
+
+    if ($mm->{LIBS}){
         $mm->{LIBS} .= q{ } . $libs;
     }
     else{
         $mm->{LIBS} = $libs;
     }
     return $libs;
+}
+
+sub cc_assert_lib {
+    my ($self, @dcl_args) = @_;
+
+    if ( ! $self->{xsu_loaded_checklib} ) {
+        my $loaded_lib = 0;
+        foreach my $checklib qw(inc::Devel::CheckLib Devel::CheckLib) {
+            eval "use $checklib 0.4";
+            if (!$@) {
+                $loaded_lib = 1;
+                last;
+            }
+        }
+
+        if (! $loaded_lib) {
+            warn "Devel::CheckLib not found in inc/ nor \@INC";
+            exit 0;
+        }
+
+        $self->{xsu_loaded_checklib}++;
+        $self->configure_requires( "Devel::CheckLib" => "0.4" );
+        $self->build_requires( "Devel::CheckLib" => "0.4" );
+    }
+
+    Devel::CheckLib::check_lib_or_exit(@dcl_args);
 }
 
 sub cc_append_to_ccflags{
@@ -551,7 +589,7 @@
 
 =head1 VERSION
 
-This document describes Module::Install::XSUtil version 0.23.
+This document describes Module::Install::XSUtil version 0.24.
 
 =head1 SYNOPSIS
 
@@ -595,11 +633,21 @@
 
 =head2 cc_available
 
-Returns true if a C compiler is available. If one passes C<--xs> to
-F<Makefile.PL>, this command returns true, and If one passes C<--pp>,
-it returns false.
-
-This uses C<ExtUtils::CBuilder>.
+Returns true if a C compiler is available. YOU DO NOT NEED TO CALL
+THIS FUNCTION YOURSELF: it will be called for you when this module is 
+initialized, and your Makefile.PL process will exit with 0 status.
+Only explicitly call if you need to do some esoteric handling when
+no compiler is available (for example, when you have a pure perl alternative)
+
+=head2 want_xs ?$default
+
+Returns true if the user asked for the XS version or pure perl version of the
+module.
+
+Will return true if C<--xs> is explicitly specified as the argument to 
+F<Makefile.PL>, and false if C<--pp> is specified. If neither is explicitly
+specified, will return the value specified by C<$default>. If you do not
+specify the value of C<$default>, then it will be true.
 
 =head2 requires_xs $module => ?$version
 
@@ -640,6 +688,12 @@
     cc_libs  'foo'; # ditto.
     cc_libs qw(-L/path/to/libs foo bar); # with library paths
 
+=head2 cc_assert_lib %args
+
+Checks if the given C library is installed via Devel::CheckLib. 
+Takes exactly what Devel::CheckLib takes. Note that you must pass
+the path names explicitly.
+
 =head2 install_headers ?@header_files
 
 Declares providing header files, extracts functions from these header files,
@@ -688,6 +742,12 @@
 
 Please report any bugs or feature requests to the author.
 
+=head1 ACKNOWLEDGEMENT
+
+Thanks to Taro Nishino for the test reports.
+
+Tanks to lestrrat for the suggestions and patches.
+
 =head1 AUTHOR
 
 Goro Fuji (gfx) E<lt>gfuji(at)cpan.orgE<gt>.

Modified: trunk/libmodule-install-xsutil-perl/t/01_example.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/t/01_example.t?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/t/01_example.t (original)
+++ trunk/libmodule-install-xsutil-perl/t/01_example.t Sun May 16 15:15:13 2010
@@ -7,9 +7,16 @@
 use File::Spec;
 use Config;
 use File::Find;
+use File::Copy qw(copy);
 
 my $dist_dir = File::Spec->join($Bin, '..', 'example');
 chdir $dist_dir or die "Cannot chdir to $dist_dir: $!";
+
+# workaround subdir auto-building :(
+copy "MyMakefile.PL" => "Makefile.PL";
+END {
+    unlink 'Makefile.PL';
+}
 
 my $make = $Config{make};
 

Modified: trunk/libmodule-install-xsutil-perl/xt/01_podspell.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-xsutil-perl/xt/01_podspell.t?rev=57982&op=diff
==============================================================================
--- trunk/libmodule-install-xsutil-perl/xt/01_podspell.t (original)
+++ trunk/libmodule-install-xsutil-perl/xt/01_podspell.t Sun May 16 15:15:13 2010
@@ -16,3 +16,6 @@
 Goro Fuji (gfx)
 gfuji(at)cpan.org
 Module::Install::XSUtil
+Nishino
+lestrrat
+ACKNOWLEDGEMENT




More information about the Pkg-perl-cvs-commits mailing list