r70701 - in /branches/upstream/libextutils-depends-perl/current: Changes MANIFEST MANIFEST.SKIP META.yml lib/ExtUtils/Depends.pm t/02_save_load.t t/03_deps.t t/04_extra_libs.t t/lib/ t/lib/TestHelper.pm

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Sun Mar 6 16:12:36 UTC 2011 

Author: jawnsy-guest
Date: Sun Mar  6 16:12:12 2011
New Revision: 70701

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=70701
Log:
[svn-upgrade] new version libextutils-depends-perl (0.304)

Added:
    branches/upstream/libextutils-depends-perl/current/t/lib/
    branches/upstream/libextutils-depends-perl/current/t/lib/TestHelper.pm
Modified:
    branches/upstream/libextutils-depends-perl/current/Changes
    branches/upstream/libextutils-depends-perl/current/MANIFEST
    branches/upstream/libextutils-depends-perl/current/MANIFEST.SKIP
    branches/upstream/libextutils-depends-perl/current/META.yml
    branches/upstream/libextutils-depends-perl/current/lib/ExtUtils/Depends.pm
    branches/upstream/libextutils-depends-perl/current/t/02_save_load.t
    branches/upstream/libextutils-depends-perl/current/t/03_deps.t
    branches/upstream/libextutils-depends-perl/current/t/04_extra_libs.t

Modified: branches/upstream/libextutils-depends-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/Changes?rev=70701&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/Changes (original)
+++ branches/upstream/libextutils-depends-perl/current/Changes Sun Mar  6 16:12:12 2011
@@ -1,4 +1,13 @@
 Revision history for Perl extension ExtUtils::Depends.
+
+0.304 Wed Jan 26 08:48:18 CET 2011
+	- More robust detection of gcc toolchains on Win32
+	  (Closes: RT#62455) (sisyphus).
+	- Don't assume dlltool is called 'dlltool' on Win32+gcc. Ask Config.pm
+	  instead (Closes: RT#62455) (sisyphus).
+
+0.303 Mon Nov 29 19:42:59 CET 2010
+	- Fix a race condition when running the tests in parallel.
 
 0.302 Sat Jul  4 15:28:35 CEST 2009
 	- Create import libraries if necessary to fix linking when gcc is used

Modified: branches/upstream/libextutils-depends-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/MANIFEST?rev=70701&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/MANIFEST (original)
+++ branches/upstream/libextutils-depends-perl/current/MANIFEST Sun Mar  6 16:12:12 2011
@@ -1,9 +1,8 @@
 Changes
 lib/ExtUtils/Depends.pm
 Makefile.PL
-MANIFEST
+MANIFEST			This list of files
 MANIFEST.SKIP
-META.yml
 perl-ExtUtils-Depends.spec.in
 README
 t/01_load.t
@@ -14,3 +13,5 @@
 t/inc/DepTest/DepTest.lib
 t/inc/DepTest/Install/.keep
 t/inc/DepTest/libDepTest.dll.a
+t/lib/TestHelper.pm
+META.yml                                 Module meta-data (added by MakeMaker)

Modified: branches/upstream/libextutils-depends-perl/current/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/MANIFEST.SKIP?rev=70701&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/MANIFEST.SKIP (original)
+++ branches/upstream/libextutils-depends-perl/current/MANIFEST.SKIP Sun Mar  6 16:12:12 2011
@@ -3,3 +3,5 @@
 ^Makefile$
 ^pm_to_blib$
 ^\.git
+\.doap$
+^MANIFEST\.bak$

Modified: branches/upstream/libextutils-depends-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/META.yml?rev=70701&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/META.yml (original)
+++ branches/upstream/libextutils-depends-perl/current/META.yml Sun Mar  6 16:12:12 2011
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               ExtUtils-Depends
-version:            0.302
+version:            0.304
 abstract:           ~
 author:  []
 license:            perl
@@ -22,7 +22,7 @@
         - t
         - inc
     package:  ExtUtils::MM
-generated_by:       ExtUtils::MakeMaker version 6.52
+generated_by:       ExtUtils::MakeMaker version 6.56
 meta-spec:
     url:      http://module-build.sourceforge.net/META-spec-v1.4.html
     version:  1.4

Modified: branches/upstream/libextutils-depends-perl/current/lib/ExtUtils/Depends.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/lib/ExtUtils/Depends.pm?rev=70701&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/lib/ExtUtils/Depends.pm (original)
+++ branches/upstream/libextutils-depends-perl/current/lib/ExtUtils/Depends.pm Sun Mar  6 16:12:12 2011
@@ -11,7 +11,7 @@
 use File::Spec;
 use Data::Dumper;
 
-our $VERSION = '0.302';
+our $VERSION = '0.304';
 
 sub import {
 	my $class = shift;
@@ -348,14 +348,16 @@
 sub static_lib {
 	my $base = shift->SUPER::static_lib(@_);
 
-	return $base unless $^O =~ /MSWin32/ && $Config{cc} =~ /^gcc/i;
-
-	return <<'__EOM__';
+	return $base unless $^O =~ /MSWin32/ && $Config{cc} =~ /\bgcc\b/i;
+
+	my $DLLTOOL = $Config{'dlltool'} || 'dlltool';
+
+	return <<"__EOM__"
 # This isn't actually a static lib, it just has the same name on Win32.
-$(INST_DYNAMIC_LIB): $(INST_DYNAMIC)
-	dlltool --def $(EXPORT_LIST) --output-lib $@ --dllname $(BASEEXT).$(SO) $(INST_DYNAMIC)
-
-dynamic:: $(INST_DYNAMIC_LIB)
+\$(INST_DYNAMIC_LIB): \$(INST_DYNAMIC)
+	$DLLTOOL --def \$(EXPORT_LIST) --output-lib \$\@ --dllname \$(BASEEXT).\$(SO) \$(INST_DYNAMIC)
+
+dynamic:: \$(INST_DYNAMIC_LIB)
 __EOM__
 }
 

Modified: branches/upstream/libextutils-depends-perl/current/t/02_save_load.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/t/02_save_load.t?rev=70701&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/t/02_save_load.t (original)
+++ branches/upstream/libextutils-depends-perl/current/t/02_save_load.t Sun Mar  6 16:12:12 2011
@@ -3,7 +3,14 @@
 use warnings;
 
 use Test::More tests => 24;
+
+use FindBin;
+use lib "$FindBin::Bin/lib";
+use TestHelper;
+
 use ExtUtils::Depends;
+
+my $tmp_inc = temp_inc;
 
 my $dep_info = ExtUtils::Depends->new ('DepTest');
 
@@ -33,7 +40,7 @@
                          dep-private.h);
 $dep_info->install (@installed_files);
 
-$dep_info->save_config ('t/inc/DepTest/Install/Files.pm');
+$dep_info->save_config (catfile $tmp_inc, qw(DepTest Install Files.pm));
 
 # --------------------------------------------------------------------------- #
 
@@ -46,7 +53,7 @@
   like ($vars{PM}{$pm}, qr/\Q$pm_mapping{$pm}\E/);
 }
 
-ok (exists $vars{PM}{'t/inc/DepTest/Install/Files.pm'});
+ok (exists $vars{PM}{catfile $tmp_inc, qw(DepTest Install Files.pm)});
 
 foreach my $file (@installed_files) {
   like ($vars{PM}{$file}, qr/\Q$file\E/);
@@ -64,8 +71,6 @@
 
 # --------------------------------------------------------------------------- #
 
-use lib qw(t/inc);
-
 my $info = ExtUtils::Depends::load ('DepTest');
 
 my $install_part = qr|DepTest.Install|;
@@ -81,5 +86,3 @@
 is ($info->{libs}, $libs);
 
 # --------------------------------------------------------------------------- #
-
-unlink 't/inc/DepTest/Install/Files.pm';

Modified: branches/upstream/libextutils-depends-perl/current/t/03_deps.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/t/03_deps.t?rev=70701&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/t/03_deps.t (original)
+++ branches/upstream/libextutils-depends-perl/current/t/03_deps.t Sun Mar  6 16:12:12 2011
@@ -3,14 +3,19 @@
 use warnings;
 
 use Test::More tests => 2;
+
+use FindBin;
+use lib "$FindBin::Bin/lib";
+use TestHelper;
+
 use ExtUtils::Depends;
 
+my $tmp_inc = temp_inc;
+
 my $dep_info = ExtUtils::Depends->new ('DepTest');
-$dep_info->save_config ('t/inc/DepTest/Install/Files.pm');
+$dep_info->save_config (catfile $tmp_inc, qw(DepTest Install Files.pm));
 
 # --------------------------------------------------------------------------- #
-
-use lib qw(t/inc);
 
 my $info = ExtUtils::Depends->new ('UseTest', 'DepTest');
 
@@ -27,5 +32,3 @@
 ok (exists $deps{DepTest});
 
 # --------------------------------------------------------------------------- #
-
-unlink 't/inc/DepTest/Install/Files.pm';

Modified: branches/upstream/libextutils-depends-perl/current/t/04_extra_libs.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/t/04_extra_libs.t?rev=70701&op=diff
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/t/04_extra_libs.t (original)
+++ branches/upstream/libextutils-depends-perl/current/t/04_extra_libs.t Sun Mar  6 16:12:12 2011
@@ -3,18 +3,23 @@
 use warnings;
 
 use Test::More;
+
+use FindBin;
+use lib "$FindBin::Bin/lib";
+use TestHelper;
+
 use ExtUtils::Depends;
+
+my $tmp_inc = temp_inc;
 
 plan (($^O eq 'MSWin32' || $^O eq 'cygwin') ?
         (tests => 1) :
         (skip_all => 'test only applicable to MSWin32 and cygwin'));
 
 my $dep_info = ExtUtils::Depends->new ('DepTest');
-$dep_info->save_config ('t/inc/DepTest/Install/Files.pm');
+$dep_info->save_config (catfile $tmp_inc, qw(DepTest Install Files.pm));
 
 # --------------------------------------------------------------------------- #
-
-use lib qw(t/inc);
 
 my $use_info = ExtUtils::Depends->new ('UseTest', 'DepTest');
 my %vars = $use_info->get_makefile_vars;
@@ -22,5 +27,3 @@
 like ($vars{LIBS}, qr/DepTest/);
 
 # --------------------------------------------------------------------------- #
-
-unlink 't/inc/DepTest/Install/Files.pm';

Added: branches/upstream/libextutils-depends-perl/current/t/lib/TestHelper.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libextutils-depends-perl/current/t/lib/TestHelper.pm?rev=70701&op=file
==============================================================================
--- branches/upstream/libextutils-depends-perl/current/t/lib/TestHelper.pm (added)
+++ branches/upstream/libextutils-depends-perl/current/t/lib/TestHelper.pm Sun Mar  6 16:12:12 2011
@@ -1,0 +1,21 @@
+use strict;
+use warnings;
+
+package TestHelper;
+
+use File::Temp 'tempdir';
+use File::Path 'mkpath';
+use File::Spec::Functions 'catdir', 'catfile';
+
+use base 'Exporter';
+
+our @EXPORT = ('temp_inc', 'catfile');
+
+sub temp_inc {
+    my $tmpinc = tempdir(CLEANUP => 1);
+    mkpath(catdir($tmpinc, qw(DepTest Install)), 0, 0711);
+    unshift @INC, $tmpinc;
+    return $tmpinc;
+}
+
+1;

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