r72989 - in /branches/upstream/libtrue-perl/current: Changes META.yml Makefile.PL README lib/true.pm lib/true/VERSION.pm

[jotamjr-guest at users.alioth.debian.org]

Author: jotamjr-guest
Date: Thu Apr 21 18:12:44 2011
New Revision: 72989

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72989
Log:
[svn-upgrade] new version libtrue-perl (0.18)

Modified:
    branches/upstream/libtrue-perl/current/Changes
    branches/upstream/libtrue-perl/current/META.yml
    branches/upstream/libtrue-perl/current/Makefile.PL
    branches/upstream/libtrue-perl/current/README
    branches/upstream/libtrue-perl/current/lib/true.pm
    branches/upstream/libtrue-perl/current/lib/true/VERSION.pm

Modified: branches/upstream/libtrue-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtrue-perl/current/Changes?rev=72989&op=diff
==============================================================================
--- branches/upstream/libtrue-perl/current/Changes (original)
+++ branches/upstream/libtrue-perl/current/Changes Thu Apr 21 18:12:44 2011
@@ -1,4 +1,11 @@
 Revision history for Perl extension true.
+
+0.18 Mon Apr 18 19:23:37 2011
+    - fix EUMM workaround (Christian Walde)
+
+0.17 Mon Apr 18 17:47:49 2011
+    - RT #65586: work around EUMM issue on ActivePerl (Christian Walde and Schwern)
+    - Makefile.PL fix
 
 0.16 Mon Feb 14 15:39:36 2011
     - true::VERSION: make the version static

Modified: branches/upstream/libtrue-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtrue-perl/current/META.yml?rev=72989&op=diff
==============================================================================
--- branches/upstream/libtrue-perl/current/META.yml (original)
+++ branches/upstream/libtrue-perl/current/META.yml Thu Apr 21 18:12:44 2011
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               true
-version:            0.16
+version:            0.18
 abstract:           automatically return a true value when a file is required
 author:
     - chocolateboy <chocolate at cpan.org>

Modified: branches/upstream/libtrue-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtrue-perl/current/Makefile.PL?rev=72989&op=diff
==============================================================================
--- branches/upstream/libtrue-perl/current/Makefile.PL (original)
+++ branches/upstream/libtrue-perl/current/Makefile.PL Thu Apr 21 18:12:44 2011
@@ -3,10 +3,11 @@
 use strict;
 use warnings;
 
+use Config;
+use ExtUtils::Depends;
 use ExtUtils::MakeMaker;
-use ExtUtils::Depends;
-use Config;
-  
+use File::Copy 'copy';
+
 our $OPTIMIZE;
 
 if ($Config{gccversion}) {
@@ -25,6 +26,38 @@
 
 our %XS_DEPENDENCIES = ExtUtils::Depends->new('true', keys(%XS_PREREQUISITES))->get_makefile_vars();
 
+sub ensure_activeperl_dep_files_exist($) {
+    return if $^O ne 'MSWin32';
+    return if $Config{make} !~ /dmake/;
+    return if $Config{cc} !~ /gcc/;
+    return if $Config{cf_email} !~ /ActiveState/;
+
+    my $libs = shift;
+    my @libs = split ' ', $libs;
+    my @dirs  = grep { /^-L.+/ } @libs;
+    my @files = grep { /^-l.+/ } @libs;
+
+    s/^-L// for @dirs;
+    s/^-l// for @files;
+
+    for my $dir (@dirs) {
+        for my $file (@files) {
+            my $base = "$dir/$file";
+            my $want = "$base.a";
+
+            next if -f $want; # everything OK: next
+
+            my $maybe = "$base.lib";
+
+            next unless -f $maybe; # if neither file exists, either this one is elsewhere or we have a problem: next
+
+            copy($maybe, $want); # .a is missing, but .lib exists, so just copy it over
+        }
+    }
+}
+
+ensure_activeperl_dep_files_exist($XS_DEPENDENCIES{LIBS});
+
 WriteMakefile(
     NAME          => 'true',
     VERSION_FROM  => 'lib/true.pm',
@@ -38,7 +71,7 @@
     DEFINE        => '',
     INC           => '-I.',
     OPTIMIZE      => $OPTIMIZE,
-    ($ExtUtils::MakeMaker::VERSION ge 6.46 ?
+    (eval($ExtUtils::MakeMaker::VERSION) >= 6.46 ?
         (META_MERGE => {
             configure_requires => {
                 'ExtUtils::Depends' => '0.304',
@@ -50,6 +83,6 @@
         })
         : ()
     ),
-    ($ExtUtils::MakeMaker::VERSION ge 6.31 ? (LICENSE => 'perl') : ()),
+    (eval($ExtUtils::MakeMaker::VERSION) >= 6.31 ? (LICENSE => 'perl') : ()),
     %XS_DEPENDENCIES,
 );

Modified: branches/upstream/libtrue-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtrue-perl/current/README?rev=72989&op=diff
==============================================================================
--- branches/upstream/libtrue-perl/current/README (original)
+++ branches/upstream/libtrue-perl/current/README Thu Apr 21 18:12:44 2011
@@ -1,4 +1,4 @@
-true version 0.16
+true version 0.18
 ==============================
 
 automatically return a true value when a file is required

Modified: branches/upstream/libtrue-perl/current/lib/true.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtrue-perl/current/lib/true.pm?rev=72989&op=diff
==============================================================================
--- branches/upstream/libtrue-perl/current/lib/true.pm (original)
+++ branches/upstream/libtrue-perl/current/lib/true.pm Thu Apr 21 18:12:44 2011
@@ -8,7 +8,7 @@
 use Devel::StackTrace;
 use XSLoader;
 
-our $VERSION = '0.16';
+our $VERSION = '0.18';
 our %TRUE;
 
 XSLoader::load(__PACKAGE__, $VERSION);

Modified: branches/upstream/libtrue-perl/current/lib/true/VERSION.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtrue-perl/current/lib/true/VERSION.pm?rev=72989&op=diff
==============================================================================
--- branches/upstream/libtrue-perl/current/lib/true/VERSION.pm (original)
+++ branches/upstream/libtrue-perl/current/lib/true/VERSION.pm Thu Apr 21 18:12:44 2011
@@ -2,7 +2,7 @@
 
 require true;
 
-our $VERSION = '0.16';
+our $VERSION = '0.18';
 
 =head1 NAME