[Reproducible-commits] [libextutils-depends-perl] 86/187: [svn-upgrade] new version libextutils-depends-perl (0.304)

Maria Valentina Marin Rodrigues akira-guest at moszumanska.debian.org
Wed Jan 21 21:16:51 UTC 2015


This is an automated email from the git hooks/post-receive script.

akira-guest pushed a commit to branch pu/reproducible_builds
in repository libextutils-depends-perl.

commit 5f50518fbc6a9f96223dd8bf6e79aba616ea1882
Author: Jonathan Yu <jawnsy at cpan.org>
Date:   Sun Mar 6 16:12:12 2011 +0000

    [svn-upgrade] new version libextutils-depends-perl (0.304)
---
 Changes                 |  9 +++++++++
 MANIFEST                |  5 +++--
 MANIFEST.SKIP           |  2 ++
 META.yml                |  4 ++--
 lib/ExtUtils/Depends.pm | 14 ++++++++------
 t/02_save_load.t        | 15 +++++++++------
 t/03_deps.t             | 13 ++++++++-----
 t/04_extra_libs.t       | 13 ++++++++-----
 t/lib/TestHelper.pm     | 21 +++++++++++++++++++++
 9 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/Changes b/Changes
index 25ca167..a712456 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,14 @@
 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
 	  on MSWin32 (Strawberry Perl, for example).
diff --git a/MANIFEST b/MANIFEST
index f5ae1f5..9739648 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -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.dll
 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)
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index 1dea7f4..23123f7 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -3,3 +3,5 @@
 ^Makefile$
 ^pm_to_blib$
 ^\.git
+\.doap$
+^MANIFEST\.bak$
diff --git a/META.yml b/META.yml
index e3ef240..c3ba57f 100644
--- a/META.yml
+++ b/META.yml
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               ExtUtils-Depends
-version:            0.302
+version:            0.304
 abstract:           ~
 author:  []
 license:            perl
@@ -22,7 +22,7 @@ no_index:
         - 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
diff --git a/lib/ExtUtils/Depends.pm b/lib/ExtUtils/Depends.pm
index c16440d..00fb2d0 100644
--- a/lib/ExtUtils/Depends.pm
+++ b/lib/ExtUtils/Depends.pm
@@ -11,7 +11,7 @@ use File::Find;
 use File::Spec;
 use Data::Dumper;
 
-our $VERSION = '0.302';
+our $VERSION = '0.304';
 
 sub import {
 	my $class = shift;
@@ -348,14 +348,16 @@ use Config;
 sub static_lib {
 	my $base = shift->SUPER::static_lib(@_);
 
-	return $base unless $^O =~ /MSWin32/ && $Config{cc} =~ /^gcc/i;
+	return $base unless $^O =~ /MSWin32/ && $Config{cc} =~ /\bgcc\b/i;
 
-	return <<'__EOM__';
+	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)
+\$(INST_DYNAMIC_LIB): \$(INST_DYNAMIC)
+	$DLLTOOL --def \$(EXPORT_LIST) --output-lib \$\@ --dllname \$(BASEEXT).\$(SO) \$(INST_DYNAMIC)
 
-dynamic:: $(INST_DYNAMIC_LIB)
+dynamic:: \$(INST_DYNAMIC_LIB)
 __EOM__
 }
 
diff --git a/t/02_save_load.t b/t/02_save_load.t
index b08010f..9d50572 100644
--- a/t/02_save_load.t
+++ b/t/02_save_load.t
@@ -3,8 +3,15 @@ use strict;
 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');
 
 my $inc = '-Iinclude -I/usr/local/include -W -Wall -Werror -ansi';
@@ -33,7 +40,7 @@ my @installed_files = qw(dep.h
                          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 @@ foreach my $pm (keys %pm_mapping) {
   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 @@ foreach my $file (@c_files, @xs_files) {
 
 # --------------------------------------------------------------------------- #
 
-use lib qw(t/inc);
-
 my $info = ExtUtils::Depends::load ('DepTest');
 
 my $install_part = qr|DepTest.Install|;
@@ -81,5 +86,3 @@ is_deeply ($info->{deps}, []);
 is ($info->{libs}, $libs);
 
 # --------------------------------------------------------------------------- #
-
-unlink 't/inc/DepTest/Install/Files.pm';
diff --git a/t/03_deps.t b/t/03_deps.t
index 51e9566..573f816 100644
--- a/t/03_deps.t
+++ b/t/03_deps.t
@@ -3,15 +3,20 @@ use strict;
 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');
 
 my %deps = $info->get_deps;
@@ -27,5 +32,3 @@ $info->load_deps;
 ok (exists $deps{DepTest});
 
 # --------------------------------------------------------------------------- #
-
-unlink 't/inc/DepTest/Install/Files.pm';
diff --git a/t/04_extra_libs.t b/t/04_extra_libs.t
index 90700f4..dbf70f4 100644
--- a/t/04_extra_libs.t
+++ b/t/04_extra_libs.t
@@ -3,24 +3,27 @@ use strict;
 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;
 
 like ($vars{LIBS}, qr/DepTest/);
 
 # --------------------------------------------------------------------------- #
-
-unlink 't/inc/DepTest/Install/Files.pm';
diff --git a/t/lib/TestHelper.pm b/t/lib/TestHelper.pm
new file mode 100644
index 0000000..884dbf0
--- /dev/null
+++ b/t/lib/TestHelper.pm
@@ -0,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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/libextutils-depends-perl.git



More information about the Reproducible-commits mailing list