r74754 - in /branches/upstream/libzeromq-perl/current: ./ inc/Devel/ inc/Module/ inc/Module/Install/ lib/ lib/ZeroMQ/ t/ tools/ xt/
ghedo-guest at users.alioth.debian.org
ghedo-guest at users.alioth.debian.org
Thu May 19 17:38:43 UTC 2011
Author: ghedo-guest
Date: Thu May 19 17:38:15 2011
New Revision: 74754
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74754
Log:
[svn-upgrade] new version libzeromq-perl (0.14)
Modified:
branches/upstream/libzeromq-perl/current/Changes
branches/upstream/libzeromq-perl/current/META.yml
branches/upstream/libzeromq-perl/current/Makefile.PL
branches/upstream/libzeromq-perl/current/README
branches/upstream/libzeromq-perl/current/inc/Devel/CheckLib.pm
branches/upstream/libzeromq-perl/current/inc/Module/Install.pm
branches/upstream/libzeromq-perl/current/inc/Module/Install/Base.pm
branches/upstream/libzeromq-perl/current/inc/Module/Install/Can.pm
branches/upstream/libzeromq-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libzeromq-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libzeromq-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libzeromq-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libzeromq-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libzeromq-perl/current/lib/ZeroMQ.pm
branches/upstream/libzeromq-perl/current/lib/ZeroMQ/Constants.pm
branches/upstream/libzeromq-perl/current/lib/ZeroMQ/Raw.pm
branches/upstream/libzeromq-perl/current/t/005_poll.t
branches/upstream/libzeromq-perl/current/t/006_anyevent.t
branches/upstream/libzeromq-perl/current/t/rt64944.t
branches/upstream/libzeromq-perl/current/tools/detect_zmq.pl
branches/upstream/libzeromq-perl/current/xt/rt64836.t
branches/upstream/libzeromq-perl/current/xt/rt64836_lowlevel.t
Modified: branches/upstream/libzeromq-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/Changes?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/Changes (original)
+++ branches/upstream/libzeromq-perl/current/Changes Thu May 19 17:38:15 2011
@@ -1,4 +1,12 @@
Changelog for Perl module ZeroMQ.
+
+0.14 Thu May 12 2011 17:05 JST
+ - Argh, forgot to change all the occurances of pkg-config to $pkg_config
+
+0.13 Thu May 12 2011 17:00 JST
+ - Fix problems introduced by using Devel::CheckLib + ZMQ_HOME et al.
+ Problem reported by Johan Ström (rt #68108)
+ - Respect PKG_CONFIG_PATH when probing for zeromq
0.12 Fri Apr 15 2011 15:35 JST
- Add missing tools/detect_zmq.pl which implemented the detection
Modified: branches/upstream/libzeromq-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/META.yml?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/META.yml (original)
+++ branches/upstream/libzeromq-perl/current/META.yml Thu May 19 17:38:15 2011
@@ -17,7 +17,7 @@
Devel::PPPort: 3.19
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 1.00'
+generated_by: 'Module::Install version 1.01'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -38,4 +38,4 @@
resources:
license: http://dev.perl.org/licenses/
repository: http://github.com/lestrrat/ZeroMQ-Perl
-version: 0.12
+version: 0.14
Modified: branches/upstream/libzeromq-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/Makefile.PL?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/Makefile.PL (original)
+++ branches/upstream/libzeromq-perl/current/Makefile.PL Thu May 19 17:38:15 2011
@@ -24,14 +24,21 @@
}
}
-checklibs lib => 'zmq', header => 'zmq.h';
-
do 'tools/detect_zmq.pl';
print "Detected the following ZMQ settings:\n";
foreach my $env (qw(ZMQ_HOME ZMQ_H ZMQ_INCLUDES ZMQ_LIBS ZMQ_TRACE)) {
printf " + %s = %s\n", $env, exists $ENV{$env} ? $ENV{$env} : "(null)";
}
+# XXX As of Devel::CheckLib 0.93, it seems like LIBS = "-L/path/to/foo"
+# gets ignored (unlike what the docs say). So we manually strip and
+# re-arrange the paths here
+assertlibs
+ lib => 'zmq',
+ header => 'zmq.h',
+ incpath => [ split /\s+/, $ENV{ZMQ_INCLUDES} ],
+ libpath => [ grep { -d $_ } map { s/^-L//; $_ } split /\s+/, $ENV{ZMQ_LIBS} ]
+;
repository 'http://github.com/lestrrat/ZeroMQ-Perl';
requires 'Task::Weaken';
Modified: branches/upstream/libzeromq-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/README?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/README (original)
+++ branches/upstream/libzeromq-perl/current/README Thu May 19 17:38:15 2011
@@ -50,7 +50,7 @@
my $msg = zmq_recv( $sock, $flags );
INSTALLATION
- If you have want to use libzmq registered with pkg-config:
+ If you have libzmq registered with pkg-config:
perl Makefile.PL
make
Modified: branches/upstream/libzeromq-perl/current/inc/Devel/CheckLib.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/inc/Devel/CheckLib.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/inc/Devel/CheckLib.pm (original)
+++ branches/upstream/libzeromq-perl/current/inc/Devel/CheckLib.pm Thu May 19 17:38:15 2011
@@ -306,6 +306,7 @@
(map { "-L$_" } @libpaths)
);
}
+warn "sys_cmd -> @sys_cmd";
warn "# @sys_cmd\n" if $args{debug};
my $rv = $args{debug} ? system(@sys_cmd) : _quiet_system(@sys_cmd);
push @missing, $lib if $rv != 0 || ! -x $exefile;
Modified: branches/upstream/libzeromq-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/inc/Module/Install.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libzeromq-perl/current/inc/Module/Install.pm Thu May 19 17:38:15 2011
@@ -31,7 +31,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 = '1.00';
+ $VERSION = '1.01';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -467,4 +467,4 @@
1;
-# Copyright 2008 - 2010 Adam Kennedy.
+# Copyright 2008 - 2011 Adam Kennedy.
Modified: branches/upstream/libzeromq-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/inc/Module/Install/Base.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libzeromq-perl/current/inc/Module/Install/Base.pm Thu May 19 17:38:15 2011
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
}
# Suspend handler for "redefined" warnings
Modified: branches/upstream/libzeromq-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/inc/Module/Install/Can.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libzeromq-perl/current/inc/Module/Install/Can.pm Thu May 19 17:38:15 2011
@@ -9,7 +9,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libzeromq-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/inc/Module/Install/Fetch.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libzeromq-perl/current/inc/Module/Install/Fetch.pm Thu May 19 17:38:15 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libzeromq-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/inc/Module/Install/Makefile.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libzeromq-perl/current/inc/Module/Install/Makefile.pm Thu May 19 17:38:15 2011
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libzeromq-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/inc/Module/Install/Metadata.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libzeromq-perl/current/inc/Module/Install/Metadata.pm Thu May 19 17:38:15 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -515,6 +515,7 @@
'GNU Free Documentation license' => 'unrestricted', 1,
'GNU Affero General Public License' => 'open_source', 1,
'(?:Free)?BSD license' => 'bsd', 1,
+ 'Artistic license 2\.0' => 'artistic_2', 1,
'Artistic license' => 'artistic', 1,
'Apache (?:Software )?license' => 'apache', 1,
'GPL' => 'gpl', 1,
@@ -550,9 +551,9 @@
sub _extract_bugtracker {
my @links = $_[0] =~ m#L<(
- \Qhttp://rt.cpan.org/\E[^>]+|
- \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
- \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
+ https?\Q://rt.cpan.org/\E[^>]+|
+ https?\Q://github.com/\E[\w_]+/[\w_]+/issues|
+ https?\Q://code.google.com/p/\E[\w_\-]+/issues/list
)>#gx;
my %links;
@links{@links}=();
Modified: branches/upstream/libzeromq-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/inc/Module/Install/Win32.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libzeromq-perl/current/inc/Module/Install/Win32.pm Thu May 19 17:38:15 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libzeromq-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/inc/Module/Install/WriteAll.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libzeromq-perl/current/inc/Module/Install/WriteAll.pm Thu May 19 17:38:15 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.01';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libzeromq-perl/current/lib/ZeroMQ.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/lib/ZeroMQ.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/lib/ZeroMQ.pm (original)
+++ branches/upstream/libzeromq-perl/current/lib/ZeroMQ.pm Thu May 19 17:38:15 2011
@@ -1,7 +1,7 @@
package ZeroMQ;
use strict;
BEGIN {
- our $VERSION = '0.12';
+ our $VERSION = '0.14';
our @ISA = qw(Exporter);
}
use ZeroMQ::Raw ();
@@ -95,7 +95,7 @@
=head1 INSTALLATION
-If you have want to use libzmq registered with pkg-config:
+If you have libzmq registered with pkg-config:
perl Makefile.PL
make
Modified: branches/upstream/libzeromq-perl/current/lib/ZeroMQ/Constants.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/lib/ZeroMQ/Constants.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/lib/ZeroMQ/Constants.pm (original)
+++ branches/upstream/libzeromq-perl/current/lib/ZeroMQ/Constants.pm Thu May 19 17:38:15 2011
@@ -12,6 +12,7 @@
ZMQ_LINGER
ZMQ_EVENTS
ZMQ_RECONNECT_IVL
+ ZMQ_SWAP
ZMQ_TYPE
ZMQ_VERSION
ZMQ_VERSION_MAJOR
Modified: branches/upstream/libzeromq-perl/current/lib/ZeroMQ/Raw.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/lib/ZeroMQ/Raw.pm?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/lib/ZeroMQ/Raw.pm (original)
+++ branches/upstream/libzeromq-perl/current/lib/ZeroMQ/Raw.pm Thu May 19 17:38:15 2011
@@ -7,7 +7,7 @@
# XXX it's a hassle, but keep it in sync with ZeroMQ.pm
# by loading this here, we can make ZeroMQ::Raw independent
# of ZeroMQ while keeping the dist name as ZeroMQ
- XSLoader::load('ZeroMQ', '0.12');
+ XSLoader::load('ZeroMQ', '0.14');
}
our @EXPORT = qw(
Modified: branches/upstream/libzeromq-perl/current/t/005_poll.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/t/005_poll.t?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/t/005_poll.t (original)
+++ branches/upstream/libzeromq-perl/current/t/005_poll.t Thu May 19 17:38:15 2011
@@ -8,17 +8,20 @@
}
subtest 'basic poll with fd' => sub {
- lives_ok {
- my $called = 0;
- zmq_poll([
- {
- fd => fileno(STDOUT),
- events => ZMQ_POLLOUT,
- callback => sub { $called++ }
- }
- ], 1);
- ok $called, "callback called";
- } "PollItem doesn't die";
+ SKIP: {
+ skip "Can't poll using fds on Windows", 2 if ($^O eq 'MSWin32');
+ lives_ok {
+ my $called = 0;
+ zmq_poll([
+ {
+ fd => fileno(STDOUT),
+ events => ZMQ_POLLOUT,
+ callback => sub { $called++ }
+ }
+ ], 1);
+ ok $called, "callback called";
+ } "PollItem doesn't die";
+ }
};
subtest 'poll with zmq sockets' => sub {
Modified: branches/upstream/libzeromq-perl/current/t/006_anyevent.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/t/006_anyevent.t?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/t/006_anyevent.t (original)
+++ branches/upstream/libzeromq-perl/current/t/006_anyevent.t Thu May 19 17:38:15 2011
@@ -25,19 +25,35 @@
my $sock = zmq_socket( $ctxt, ZMQ_REP );
zmq_bind( $sock, "tcp://127.0.0.1:$port" );
- my $fh = zmq_getsockopt( $sock, ZMQ_FD );
+ my $msg;
+ if ( $^O eq 'MSWin32' ) {
+ my $timeout = time() + 5;
+ do {
+ zmq_poll([
+ {
+ socket => $sock,
+ events => ZMQ_POLLIN,
+ callback => sub {
+ $msg = zmq_recv( $sock, ZMQ_RCVMORE );
+ }
+ },
+ ], 5);
+ } while (! $msg && time < $timeout );
+ } else {
+ my $cv = AE::cv;
+ my $fh = zmq_getsockopt( $sock, ZMQ_FD );
+ my $w; $w = AE::io $fh, 0, sub {
+ if (my $msg = zmq_recv( $sock, ZMQ_RCVMORE )) {
+ undef $w;
+ $cv->send( $msg );
+ }
+ };
+ note "Waiting...";
+ $msg = $cv->recv;
+ }
- my $cv = AE::cv;
- my $w; $w = AE::io $fh, 0, sub {
- if (my $msg = zmq_recv( $sock, ZMQ_RCVMORE )) {
- undef $w;
- $cv->send( $msg );
- }
- };
-
- note "Waiting...";
- my $msg = $cv->recv;
zmq_send( $sock, zmq_msg_data( $msg ) );
+ exit 0;
}
);
Modified: branches/upstream/libzeromq-perl/current/t/rt64944.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/t/rt64944.t?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/t/rt64944.t (original)
+++ branches/upstream/libzeromq-perl/current/t/rt64944.t Thu May 19 17:38:15 2011
@@ -114,7 +114,7 @@
};
# Code excercising AnyEvent + ZMQ_FD to do non-blocking recv
-if (eval { require AnyEvent } && ! $@) {
+if ($^O ne 'MSWin32' && eval { require AnyEvent } && ! $@) {
AnyEvent->import; # want AE namespace
subtest 'non-blocking recv with AnyEvent (success)' => sub {
test_tcp(
Modified: branches/upstream/libzeromq-perl/current/tools/detect_zmq.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/tools/detect_zmq.pl?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/tools/detect_zmq.pl (original)
+++ branches/upstream/libzeromq-perl/current/tools/detect_zmq.pl Thu May 19 17:38:15 2011
@@ -65,9 +65,10 @@
# Note: At this point probe_envvars should have taken care merging
# deprecated INCLUDES/LIBS into %ENV
sub probe_pkgconfig {
+ my $pkg_config = $ENV{ PKG_CONFIG_PATH } || 'pkg-config';
foreach my $pkg ( qw(libzmq zeromq2) ) {
- print "Probing $pkg via pkg-config ...\n";
- my $version = qx/pkg-config --modversion $pkg/;
+ print "Probing $pkg via $pkg_config ...\n";
+ my $version = qx/$pkg_config --modversion $pkg/;
chomp $version;
if (! $version) {
print " - No $pkg found...\n";
@@ -76,16 +77,16 @@
print " + found $pkg $version\n";
if (! $ENV{ZMQ_INCLUDES}) {
- if (my $cflags = qx/pkg-config --cflags-only-I $pkg/) {
+ if (my $cflags = qx/$pkg_config --cflags-only-I $pkg/) {
chomp $cflags;
- print " + Detected ZMQ_INCLUDES from pkg-config...\n";
+ print " + Detected ZMQ_INCLUDES from $pkg_config...\n";
my @paths = map { s/^-I//; $_ } split /\s+/, $cflags;
$ENV{ZMQ_INCLUDES} = join ' ', @paths;
if (! $ENV{ZMQ_H}) {
foreach my $path (@paths) {
my $zmq_h = File::Spec->catfile($path, 'zmq.h');
if (-f $zmq_h) {
- print " + Detected ZMQ_H from pkg-config...\n";
+ print " + Detected ZMQ_H from $pkg_config...\n";
$ENV{ZMQ_H} = $zmq_h;
last;
}
@@ -95,9 +96,9 @@
}
if (! $ENV{ZMQ_LIBS}) {
- if (my $libs = qx/pkg-config --libs $pkg/) {
+ if (my $libs = qx/$pkg_config --libs $pkg/) {
chomp $libs;
- print " + Detected ZMQ_LIBS from pkg-config...\n";
+ print " + Detected ZMQ_LIBS from $pkg_config...\n";
$ENV{ZMQ_LIBS} = $libs;
}
}
Modified: branches/upstream/libzeromq-perl/current/xt/rt64836.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/xt/rt64836.t?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/xt/rt64836.t (original)
+++ branches/upstream/libzeromq-perl/current/xt/rt64836.t Thu May 19 17:38:15 2011
@@ -48,6 +48,7 @@
}
$sock->send("end"); # end of data stream...
note "Sent all messages";
+ exit 0;
}
);
Modified: branches/upstream/libzeromq-perl/current/xt/rt64836_lowlevel.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libzeromq-perl/current/xt/rt64836_lowlevel.t?rev=74754&op=diff
==============================================================================
--- branches/upstream/libzeromq-perl/current/xt/rt64836_lowlevel.t (original)
+++ branches/upstream/libzeromq-perl/current/xt/rt64836_lowlevel.t Thu May 19 17:38:15 2011
@@ -48,6 +48,7 @@
zmq_send( $sock, "end" );
note "Sent all messages";
note "Server exiting...";
+ exit 0;
}
);
More information about the Pkg-perl-cvs-commits
mailing list