r26240 - in /branches/upstream/libpoe-perl/current: ./ lib/ lib/POE/ lib/POE/Filter/ lib/POE/Wheel/ mylib/ t/30_loops/
rmayorga-guest at users.alioth.debian.org
rmayorga-guest at users.alioth.debian.org
Sun Oct 26 04:21:21 UTC 2008
Author: rmayorga-guest
Date: Sun Oct 26 04:21:01 2008
New Revision: 26240
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26240
Log:
[svn-upgrade] Integrating new upstream version, libpoe-perl (1.0030)
Removed:
branches/upstream/libpoe-perl/current/t/30_loops/
Modified:
branches/upstream/libpoe-perl/current/CHANGES
branches/upstream/libpoe-perl/current/MANIFEST
branches/upstream/libpoe-perl/current/META.yml
branches/upstream/libpoe-perl/current/lib/POE.pm
branches/upstream/libpoe-perl/current/lib/POE/Filter/HTTPD.pm
branches/upstream/libpoe-perl/current/lib/POE/Filter/Reference.pm
branches/upstream/libpoe-perl/current/lib/POE/NFA.pm
branches/upstream/libpoe-perl/current/lib/POE/Wheel/ReadLine.pm
branches/upstream/libpoe-perl/current/mylib/Makefile-5004.pm
branches/upstream/libpoe-perl/current/mylib/Makefile-5005.pm
branches/upstream/libpoe-perl/current/mylib/PoeBuildInfo.pm
branches/upstream/libpoe-perl/current/mylib/gen-meta.perl
branches/upstream/libpoe-perl/current/mylib/gen-tests.perl
Modified: branches/upstream/libpoe-perl/current/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/CHANGES?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/CHANGES (original)
+++ branches/upstream/libpoe-perl/current/CHANGES Sun Oct 26 04:21:01 2008
@@ -1,3 +1,95 @@
+==================================
+2008-07-06T00:20:23.186069Z v1_003
+==================================
+
+ 2008-07-06 00:19:32 (r2392) by rcaputo; poe/lib/POE.pm M
+
+ Let's try this again.
+
+ 2008-07-05 22:50:47 (r2391) by rcaputo
+ poe/mylib/Makefile-5004.pm M; poe/mylib/Makefile-5005.pm M
+
+ Touch mylib/gen-tests.perl during Makefile.PL execution. This
+ triggers gen-tests.perl during "make test".
+
+ 2008-07-05 21:53:37 (r2390) by rcaputo
+ poe/mylib/Makefile-5004.pm M; poe/mylib/Makefile-5005.pm M
+
+ Move test generation to PL_FILES. Requires a separate "make" for the
+ tests to be generated.
+
+ 2008-07-05 20:15:25 (r2389) by rcaputo; poe/mylib/gen-meta.perl M
+
+ Add build_requires and rename config_requires to configure_requires.
+
+==================================
+2008-07-05T18:21:13.947381Z v1_002
+==================================
+
+ 2008-07-05 18:01:55 (r2387) by rcaputo
+ poe/mylib/Makefile-5004.pm M; poe/mylib/gen-meta.perl M;
+ poe/lib/POE/Wheel/ReadLine.pm M; poe/mylib/Makefile-5005.pm M;
+ poe/lib/POE/Filter/HTTPD.pm M; poe/mylib/preprocessor.perl M;
+ poe/lib/POE.pm M; poe/docs/Makefile M; poe/mylib/PoeBuildInfo.pm M;
+ poe/mylib/gen-tests.perl M; poe/lib/POE/Filter/Reference.pm M;
+ poe/lib/POE/NFA.pm M
+
+ Add POE::Test::Loops to config_requires, so modern systems can
+ install it before Makefile.PL runs. Allow gen-tests.pl to fail
+ gracefully if POE::Test::Loops isn't installed. Remove a bunch of
+ tabs from unrelated files.
+
+==================================
+2008-07-05T02:39:32.500880Z v1_001
+==================================
+
+ 2008-07-05 02:38:47 (r2385) by rcaputo; poe/lib/POE.pm M
+
+ Time for a new release.
+
+ 2008-07-05 02:35:08 (r2384) by rcaputo; poe/mylib/PoeBuildInfo.pm M
+
+ Use the bleeding-edge POE::Test::Loops.
+
+ 2008-07-04 21:47:28 (r2379) by rcaputo; poe/t/30_loops D
+
+ Remove empty directories.
+
+ 2008-07-04 21:31:06 (r2378) by rcaputo; poe/MANIFEST M
+
+ Remove the removed files from the MANIFEST.
+
+ 2008-07-04 21:21:12 (r2377) by lotr; poe/mylib/PoeBuildInfo.pm M
+
+ update version
+
+ 2008-07-04 21:20:36 (r2376) by lotr
+ poe/t/30_loops/00_base/k_signals_rerun.pm D;
+ poe/t/30_loops/00_base/wheel_run.pm D;
+ poe/t/30_loops/00_base/wheel_curses.pm D;
+ poe/t/30_loops/00_base/k_alarms.pm D;
+ poe/t/30_loops/00_base/k_aliases.pm D;
+ poe/t/30_loops/00_base/ses_session.pm D;
+ poe/t/30_loops/00_base/wheel_sf_unix.pm D;
+ poe/t/30_loops/00_base/k_sig_child.pm D;
+ poe/t/30_loops/00_base/sbk_signal_init.pm D;
+ poe/t/30_loops/00_base/wheel_sf_ipv6.pm D; poe/mylib/gen-tests.perl M;
+ poe/t/30_loops/00_base/wheel_sf_tcp.pm D;
+ poe/t/30_loops/00_base/k_detach.pm D;
+ poe/t/30_loops/00_base/wheel_sf_udp.pm D;
+ poe/t/30_loops/00_base/all_errors.pm D;
+ poe/t/30_loops/00_base/comp_tcp.pm D;
+ poe/t/30_loops/00_base/comp_tcp_concurrent.pm D;
+ poe/t/30_loops/00_base/wheel_readline.pm D;
+ poe/t/30_loops/00_base/k_signals.pm D;
+ poe/t/30_loops/00_base/wheel_readwrite.pm D;
+ poe/t/30_loops/00_base/k_selects.pm D;
+ poe/t/30_loops/00_base/wheel_tail.pm D;
+ poe/t/30_loops/00_base/ses_nfa.pm D; poe/mylib/PoeBuildInfo.pm M;
+ poe/t/30_loops/00_base/wheel_accept.pm D
+
+ use POE::Test::Loops
+
===================================
2008-06-26T05:25:54.564733Z v1_0003
===================================
Modified: branches/upstream/libpoe-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/MANIFEST?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/MANIFEST (original)
+++ branches/upstream/libpoe-perl/current/MANIFEST Sun Oct 26 04:21:01 2008
@@ -130,29 +130,6 @@
t/20_resources/00_base/sids.pm
t/20_resources/00_base/signals.pm
t/20_resources/00_base/statistics.pm
-t/30_loops/00_base/all_errors.pm
-t/30_loops/00_base/comp_tcp.pm
-t/30_loops/00_base/comp_tcp_concurrent.pm
-t/30_loops/00_base/k_alarms.pm
-t/30_loops/00_base/k_aliases.pm
-t/30_loops/00_base/k_detach.pm
-t/30_loops/00_base/k_selects.pm
-t/30_loops/00_base/k_sig_child.pm
-t/30_loops/00_base/k_signals.pm
-t/30_loops/00_base/k_signals_rerun.pm
-t/30_loops/00_base/sbk_signal_init.pm
-t/30_loops/00_base/ses_nfa.pm
-t/30_loops/00_base/ses_session.pm
-t/30_loops/00_base/wheel_accept.pm
-t/30_loops/00_base/wheel_curses.pm
-t/30_loops/00_base/wheel_readline.pm
-t/30_loops/00_base/wheel_readwrite.pm
-t/30_loops/00_base/wheel_run.pm
-t/30_loops/00_base/wheel_sf_ipv6.pm
-t/30_loops/00_base/wheel_sf_tcp.pm
-t/30_loops/00_base/wheel_sf_udp.pm
-t/30_loops/00_base/wheel_sf_unix.pm
-t/30_loops/00_base/wheel_tail.pm
t/90_regression/agaran-filter-httpd.t
t/90_regression/averell-callback-ret.t
t/90_regression/bingos-followtail.t
Modified: branches/upstream/libpoe-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/META.yml?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/META.yml (original)
+++ branches/upstream/libpoe-perl/current/META.yml Sun Oct 26 04:21:01 2008
@@ -1,6 +1,6 @@
---
name: POE
-version: 1.0003
+version: 1.003
author:
- 'Rocco Caputo <rcaputo at cpan.org>'
abstract: A portable networking and multitasking framework.
@@ -13,16 +13,19 @@
Exporter: 0
File::Spec: 0.87
IO::Handle: 1.27
+ POE::Test::Loops: 1.002
POSIX: 1.02
Socket: 1.7
Storable: 2.16
Test::Harness: 2.26
+build_requires:
+ POE::Test::Loops: 1.002
recommends:
Time::HiRes: 1.59
provides:
POE:
file: lib/POE.pm
- version: 1.0003
+ version: 1.003
POE::Component:
file: lib/POE/Component.pm
version: 1.2311
@@ -49,7 +52,7 @@
version: 1.2337
POE::Filter::HTTPD:
file: lib/POE/Filter/HTTPD.pm
- version: 1.2339
+ version: 1.2387
POE::Filter::Line:
file: lib/POE/Filter/Line.pm
version: 1.2340
@@ -61,7 +64,7 @@
version: 1.2337
POE::Filter::Reference:
file: lib/POE/Filter/Reference.pm
- version: 1.2357
+ version: 1.2387
POE::Filter::Stackable:
file: lib/POE/Filter/Stackable.pm
version: 1.2337
@@ -100,7 +103,7 @@
version: 1.2329
POE::NFA:
file: lib/POE/NFA.pm
- version: 1.2334
+ version: 1.2387
POE::Pipe:
file: lib/POE/Pipe.pm
version: 1.2332
@@ -163,7 +166,7 @@
version: 1.2347
POE::Wheel::ReadLine:
file: lib/POE/Wheel/ReadLine.pm
- version: 1.2357
+ version: 1.2387
POE::Wheel::ReadLine::Keymap:
file: lib/POE/Wheel/ReadLine.pm
POE::Wheel::ReadWrite:
@@ -179,7 +182,7 @@
directory:
- mylib
- t
-generated_by: Module::Build version 0.2805
+generated_by: Module::Build version 0.2808
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.2.html
version: 1.2
Modified: branches/upstream/libpoe-perl/current/lib/POE.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/lib/POE.pm?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/lib/POE.pm (original)
+++ branches/upstream/libpoe-perl/current/lib/POE.pm Sun Oct 26 04:21:01 2008
@@ -1,4 +1,4 @@
-# $Id: POE.pm 2360 2008-06-26 05:25:26Z rcaputo $
+# $Id: POE.pm 2392 2008-07-06 00:19:32Z rcaputo $
# Copyrights and documentation are after __END__.
package POE;
@@ -7,8 +7,8 @@
use Carp qw( croak );
use vars qw($VERSION $REVISION);
-$VERSION = '1.0003'; # NOTE - Should be #.#### (four decimal places)
-$REVISION = do {my($r)=(q$Revision: 2360 $=~/(\d+)/);sprintf"1.%04d",$r};
+$VERSION = '1.003'; # NOTE - Should be #.### (three decimal places)
+$REVISION = do {my($r)=(q$Revision: 2392 $=~/(\d+)/);sprintf"1.%04d",$r};
sub import {
my $self = shift;
Modified: branches/upstream/libpoe-perl/current/lib/POE/Filter/HTTPD.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/lib/POE/Filter/HTTPD.pm?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/lib/POE/Filter/HTTPD.pm (original)
+++ branches/upstream/libpoe-perl/current/lib/POE/Filter/HTTPD.pm Sun Oct 26 04:21:01 2008
@@ -1,4 +1,4 @@
-# $Id: HTTPD.pm 2339 2008-05-29 04:02:50Z rcaputo $
+# $Id: HTTPD.pm 2387 2008-07-05 18:01:55Z rcaputo $
# Filter::HTTPD Copyright 1998 Artur Bergman <artur at vogon.se>.
@@ -17,7 +17,7 @@
use POE::Filter;
use vars qw($VERSION @ISA);
-$VERSION = do {my($r)=(q$Revision: 2339 $=~/(\d+)/);sprintf"1.%04d",$r};
+$VERSION = do {my($r)=(q$Revision: 2387 $=~/(\d+)/);sprintf"1.%04d",$r};
@ISA = qw(POE::Filter);
sub BUFFER () { 0 }
@@ -386,55 +386,55 @@
=head1 SYNOPSIS
- #!perl
-
- use warnings;
- use strict;
-
- use POE qw(Component::Server::TCP Filter::HTTPD);
- use HTTP::Response;
-
- POE::Component::Server::TCP->new(
- Port => 8088,
- ClientFilter => 'POE::Filter::HTTPD', ### <-- HERE WE ARE!
-
- ClientInput => sub {
- my $request = $_[ARG0];
-
- # It's a response for the client if there was a problem.
- if ($request->isa("HTTP::Response")) {
- $_[HEAP]{client}->put($request);
- $_[KERNEL]->yield("shutdown");
- return;
- }
-
- my $request_fields = '';
- $request->headers()->scan(
- sub {
- my ($header, $value) = @_;
- $request_fields .= (
+ #!perl
+
+ use warnings;
+ use strict;
+
+ use POE qw(Component::Server::TCP Filter::HTTPD);
+ use HTTP::Response;
+
+ POE::Component::Server::TCP->new(
+ Port => 8088,
+ ClientFilter => 'POE::Filter::HTTPD', ### <-- HERE WE ARE!
+
+ ClientInput => sub {
+ my $request = $_[ARG0];
+
+ # It's a response for the client if there was a problem.
+ if ($request->isa("HTTP::Response")) {
+ $_[HEAP]{client}->put($request);
+ $_[KERNEL]->yield("shutdown");
+ return;
+ }
+
+ my $request_fields = '';
+ $request->headers()->scan(
+ sub {
+ my ($header, $value) = @_;
+ $request_fields .= (
"<tr><td>$header</td><td>$value</td></tr>"
);
- }
- );
-
- my $response = HTTP::Response->new(200);
- $response->push_header( 'Content-type', 'text/html' );
- $response->content(
- "<html><head><title>Your Request</title></head>" .
- "<body>Details about your request:" .
- "<table border='1'>$request_fields</table>" .
- "</body></html>"
- );
-
- $_[HEAP]{client}->put($response);
- $_[KERNEL]->yield("shutdown");
- }
- );
-
- print "Aim your browser at port 8088 of this host.\n";
- POE::Kernel->run();
- exit;
+ }
+ );
+
+ my $response = HTTP::Response->new(200);
+ $response->push_header( 'Content-type', 'text/html' );
+ $response->content(
+ "<html><head><title>Your Request</title></head>" .
+ "<body>Details about your request:" .
+ "<table border='1'>$request_fields</table>" .
+ "</body></html>"
+ );
+
+ $_[HEAP]{client}->put($response);
+ $_[KERNEL]->yield("shutdown");
+ }
+ );
+
+ print "Aim your browser at port 8088 of this host.\n";
+ POE::Kernel->run();
+ exit;
=head1 DESCRIPTION
Modified: branches/upstream/libpoe-perl/current/lib/POE/Filter/Reference.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/lib/POE/Filter/Reference.pm?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/lib/POE/Filter/Reference.pm (original)
+++ branches/upstream/libpoe-perl/current/lib/POE/Filter/Reference.pm Sun Oct 26 04:21:01 2008
@@ -1,4 +1,4 @@
-# $Id: Reference.pm 2357 2008-06-20 17:41:54Z rcaputo $
+# $Id: Reference.pm 2387 2008-07-05 18:01:55Z rcaputo $
# Filter::Reference partial copyright 1998 Artur Bergman
# <artur at vogon-solutions.com>. Partial copyright 1999 Philip Gwyn.
@@ -9,7 +9,7 @@
use POE::Filter;
use vars qw($VERSION @ISA);
-$VERSION = do {my($r)=(q$Revision: 2357 $=~/(\d+)/);sprintf"1.%04d",$r};
+$VERSION = do {my($r)=(q$Revision: 2387 $=~/(\d+)/);sprintf"1.%04d",$r};
@ISA = qw(POE::Filter);
use Carp qw(carp croak);
@@ -257,8 +257,8 @@
},
got_perl_data => sub {
print "Got data:\n", YAML::Dump($_[ARG0]);
- print "Bye!\n";
- delete $_[HEAP]{io};
+ print "Bye!\n";
+ delete $_[HEAP]{io};
}
}
);
Modified: branches/upstream/libpoe-perl/current/lib/POE/NFA.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/lib/POE/NFA.pm?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/lib/POE/NFA.pm (original)
+++ branches/upstream/libpoe-perl/current/lib/POE/NFA.pm Sun Oct 26 04:21:01 2008
@@ -1,11 +1,11 @@
-# $Id: NFA.pm 2334 2008-05-26 06:48:40Z rcaputo $
+# $Id: NFA.pm 2387 2008-07-05 18:01:55Z rcaputo $
package POE::NFA;
use strict;
use vars qw($VERSION);
-$VERSION = do {my($r)=(q$Revision: 2334 $=~/(\d+)/);sprintf"1.%04d",$r};
+$VERSION = do {my($r)=(q$Revision: 2387 $=~/(\d+)/);sprintf"1.%04d",$r};
use Carp qw(carp croak);
@@ -785,9 +785,9 @@
$_[RUNSTATE]{io}->put('Bye!');
$_[MACHINE]->stop();
}
- else {
+ else {
$_[MACHINE]->goto_state(state_cmd => "on_entry");
- }
+ }
}
=head1 DESCRIPTION
Modified: branches/upstream/libpoe-perl/current/lib/POE/Wheel/ReadLine.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/lib/POE/Wheel/ReadLine.pm?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/lib/POE/Wheel/ReadLine.pm (original)
+++ branches/upstream/libpoe-perl/current/lib/POE/Wheel/ReadLine.pm Sun Oct 26 04:21:01 2008
@@ -1,4 +1,4 @@
-# $Id: ReadLine.pm 2357 2008-06-20 17:41:54Z rcaputo $
+# $Id: ReadLine.pm 2387 2008-07-05 18:01:55Z rcaputo $
package POE::Wheel::ReadLine;
@@ -6,7 +6,7 @@
BEGIN { eval { require bytes } and bytes->import; }
use vars qw($VERSION);
-$VERSION = do {my($r)=(q$Revision: 2357 $=~/(\d+)/);sprintf"1.%04d",$r};
+$VERSION = do {my($r)=(q$Revision: 2387 $=~/(\d+)/);sprintf"1.%04d",$r};
use Carp qw( croak carp );
use Symbol qw(gensym);
@@ -3065,51 +3065,51 @@
=head1 SYNOPSIS
- #!perl
-
- use warnings;
- use strict;
-
- use POE qw(Wheel::ReadLine);
-
- POE::Session->create(
- inline_states=> {
- _start => \&setup_console,
- got_user_input => \&handle_user_input,
- }
- );
-
- POE::Kernel->run();
- exit;
-
- sub handle_user_input {
- my ($input, $exception) = @_[ARG0, ARG1];
- my $console = $_[HEAP]{console};
-
- unless (defined $input) {
- $console->put("$exception caught. B'bye!");
+ #!perl
+
+ use warnings;
+ use strict;
+
+ use POE qw(Wheel::ReadLine);
+
+ POE::Session->create(
+ inline_states=> {
+ _start => \&setup_console,
+ got_user_input => \&handle_user_input,
+ }
+ );
+
+ POE::Kernel->run();
+ exit;
+
+ sub handle_user_input {
+ my ($input, $exception) = @_[ARG0, ARG1];
+ my $console = $_[HEAP]{console};
+
+ unless (defined $input) {
+ $console->put("$exception caught. B'bye!");
$_[KERNEL]->signal($_[KERNEL], "UIDESTROY");
- $console->write_history("./test_history");
- return;
- }
-
- $console->put(" You entered: $input");
- $console->addhistory($input);
- $console->get("Go: ");
- }
-
- sub setup_console {
- $_[HEAP]{console} = POE::Wheel::ReadLine->new(
- InputEvent => 'got_user_input'
- );
- $_[HEAP]{console}->read_history("./test_history");
- $_[HEAP]{console}->clear();
- $_[HEAP]{console}->put(
- "Enter some text.",
- "Ctrl+C or Ctrl+D exits."
- );
- $_[HEAP]{console}->get("Go: ");
- }
+ $console->write_history("./test_history");
+ return;
+ }
+
+ $console->put(" You entered: $input");
+ $console->addhistory($input);
+ $console->get("Go: ");
+ }
+
+ sub setup_console {
+ $_[HEAP]{console} = POE::Wheel::ReadLine->new(
+ InputEvent => 'got_user_input'
+ );
+ $_[HEAP]{console}->read_history("./test_history");
+ $_[HEAP]{console}->clear();
+ $_[HEAP]{console}->put(
+ "Enter some text.",
+ "Ctrl+C or Ctrl+D exits."
+ );
+ $_[HEAP]{console}->get("Go: ");
+ }
=head1 DESCRIPTION
Modified: branches/upstream/libpoe-perl/current/mylib/Makefile-5004.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/mylib/Makefile-5004.pm?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/mylib/Makefile-5004.pm (original)
+++ branches/upstream/libpoe-perl/current/mylib/Makefile-5004.pm Sun Oct 26 04:21:01 2008
@@ -1,5 +1,6 @@
#!/usr/bin/perl
-# $Id: Makefile-5004.pm 2187 2007-04-19 21:35:33Z rcaputo $
+# $Id: Makefile-5004.pm 2391 2008-07-05 22:50:47Z rcaputo $
+# rocco // vim: ts=2 sw=2 expandtab
use strict;
@@ -19,9 +20,9 @@
open(TOUCH, ">>CHANGES") and close TOUCH;
open(TOUCH, ">>META.yml") and close TOUCH;
-### Generate dynamic test files.
+### Touch gen-tests.perl so it always triggers.
-system($^X, "mylib/gen-tests.perl") and die "couldn't generate tests: $!";
+utime(time(), time(), "mylib/gen-tests.perl");
### Generate Makefile.PL.
@@ -59,7 +60,11 @@
TESTS => TEST_FILES,
},
- PL_FILES => { },
+ # Not executed on "make test".
+ PL_FILES => {
+ 'mylib/gen-tests.perl' => [ 'lib/POE.pm' ],
+ },
+
PREREQ_PM => { CORE_REQUIREMENTS },
);
Modified: branches/upstream/libpoe-perl/current/mylib/Makefile-5005.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/mylib/Makefile-5005.pm?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/mylib/Makefile-5005.pm (original)
+++ branches/upstream/libpoe-perl/current/mylib/Makefile-5005.pm Sun Oct 26 04:21:01 2008
@@ -1,5 +1,6 @@
#!/usr/bin/perl
-# $Id: Makefile-5005.pm 2357 2008-06-20 17:41:54Z rcaputo $
+# $Id: Makefile-5005.pm 2391 2008-07-05 22:50:47Z rcaputo $
+# rocco // vim: ts=2 sw=2 expandtab
use strict;
@@ -21,6 +22,10 @@
open(TOUCH, ">>CHANGES") and close TOUCH;
open(TOUCH, ">>META.yml") and close TOUCH;
+
+### Touch gen-tests.perl so it always triggers.
+
+utime(time(), time(), "mylib/gen-tests.perl");
### Some advisory dependency testing.
@@ -76,10 +81,6 @@
"URI" => 1.30,
);
-### Generate dynamic test files.
-
-system($^X, "mylib/gen-tests.perl") and die "couldn't generate tests: $!";
-
### Generate Makefile.PL.
sub MY::postamble {
@@ -130,8 +131,12 @@
TESTS => TEST_FILES,
},
+ # Not executed on "make test".
+ PL_FILES => {
+ 'mylib/gen-tests.perl' => [ 'lib/POE.pm' ],
+ },
+
# More for META.yml than anything.
- PL_FILES => { },
NO_META => 1,
PREREQ_PM => { CORE_REQUIREMENTS },
);
Modified: branches/upstream/libpoe-perl/current/mylib/PoeBuildInfo.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/mylib/PoeBuildInfo.pm?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/mylib/PoeBuildInfo.pm (original)
+++ branches/upstream/libpoe-perl/current/mylib/PoeBuildInfo.pm Sun Oct 26 04:21:01 2008
@@ -1,4 +1,5 @@
-# $Id: PoeBuildInfo.pm 2268 2008-01-12 12:36:44Z bingosnet $
+# $Id: PoeBuildInfo.pm 2387 2008-07-05 18:01:55Z rcaputo $
+# rocco // vim: ts=2 sw=2 expandtab
# Build information for POE. Moved into a library so it can be
# required by Makefile.PL and gen-meta.perl.
@@ -18,7 +19,15 @@
DIST_ABSTRACT
DIST_AUTHOR
RECOMMENDED_TIME_HIRES
+ CONFIG_REQUIREMENTS
);
+
+
+sub CONFIG_REQUIREMENTS () {
+ (
+ "POE::Test::Loops" => 1.002,
+ )
+}
sub CORE_REQUIREMENTS () {
(
@@ -39,6 +48,7 @@
)
: ()
),
+ CONFIG_REQUIREMENTS,
)
}
@@ -65,16 +75,9 @@
t/20_resources/10_perl/*
t/20_resources/20_xs
t/20_resources/20_xs/*
- t/30_loops/10_select
- t/30_loops/10_select/*
- t/30_loops/20_poll
- t/30_loops/20_poll/*
- t/30_loops/30_event
- t/30_loops/30_event/*
- t/30_loops/40_gtk
- t/30_loops/40_gtk/*
- t/30_loops/50_tk
- t/30_loops/50_tk/*
+ t/30_loops/*/*
+ t/30_loops/*
+ t/30_loops
);
"@clean_files";
}
Modified: branches/upstream/libpoe-perl/current/mylib/gen-meta.perl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/mylib/gen-meta.perl?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/mylib/gen-meta.perl (original)
+++ branches/upstream/libpoe-perl/current/mylib/gen-meta.perl Sun Oct 26 04:21:01 2008
@@ -1,5 +1,6 @@
#!/usr/bin/perl -w
-# $Id: gen-meta.perl 2147 2006-11-02 20:06:03Z bsmith $
+# $Id: gen-meta.perl 2389 2008-07-05 20:15:25Z rcaputo $
+# rocco // vim: ts=2 sw=2 expandtab
# Generate META.yml.
@@ -12,6 +13,7 @@
DIST_ABSTRACT
DIST_AUTHOR
RECOMMENDED_TIME_HIRES
+ CONFIG_REQUIREMENTS
);
my $build = Module::Build->new(
@@ -24,6 +26,8 @@
RECOMMENDED_TIME_HIRES,
},
requires => { CORE_REQUIREMENTS },
+ build_requires => { CONFIG_REQUIREMENTS },
+ configure_requires => { CONFIG_REQUIREMENTS },
no_index => {
directory => [ "mylib", "t" ]
},
Modified: branches/upstream/libpoe-perl/current/mylib/gen-tests.perl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-perl/current/mylib/gen-tests.perl?rev=26240&op=diff
==============================================================================
--- branches/upstream/libpoe-perl/current/mylib/gen-tests.perl (original)
+++ branches/upstream/libpoe-perl/current/mylib/gen-tests.perl Sun Oct 26 04:21:01 2008
@@ -1,8 +1,18 @@
#!/usr/bin/perl -w
+# $Id: gen-tests.perl 2387 2008-07-05 18:01:55Z rcaputo $
+# rocco // vim: ts=2 sw=2 expandtab
use strict;
use File::Spec;
use File::Path;
+
+BEGIN {
+ eval "require POE::Test::Loops";
+ if ($@) {
+ warn "Could not load POE::Test::Loops. Skipping loop tests";
+ exit;
+ }
+}
my $test_base = "t";
@@ -45,121 +55,9 @@
{
my $base_dir = File::Spec->catfile($test_base, "30_loops");
- my $base_lib = File::Spec->catfile($base_dir, "00_base");
- my %derived_conf = (
- "10_select" => {
- module => "",
- display => "",
- },
- "20_poll" => {
- module => "IO::Poll",
- display => "",
- no_sys => [ "MSWin32" ],
- },
- "30_event" => {
- module => "Event",
- display => "",
- },
- "40_gtk" => {
- module => "Gtk",
- display => 1,
- },
- "50_tk" => {
- module => "Tk",
- display => 1,
- },
- );
-
- # Expand flags into code.
-
- foreach my $variables (values %derived_conf) {
- my $module = $variables->{module};
-
- # If platforms are to be excluded, check for them.
-
- if (
- $variables->{no_sys} and
- grep /^\Q$^O\E/, @{$variables->{no_sys}}
- ) {
- $variables->{no_sys} = (
- "\n" .
- "BEGIN {\n" .
- " \$| = 1;\n" .
- " print qq(1..0 # Skip This test cannot be run on $^O\\n);\n" .
- " CORE::exit(0);\n" .
- "}\n"
- );
- }
- else {
- $variables->{no_sys} = "";
- }
-
- # Turn a specified display flag into the code that tests for a
- # DISPLAY environment variable. DISPLAY is not necessary for
- # ActiveState Perl, at least not for Tk.
-
- if ($variables->{display}) {
- if ($^O eq "MSWin32") {
- $variables->{display} = "";
- }
- else {
- $variables->{display} = (
- "\n" .
- "BEGIN {\n" .
- " unless (\$ENV{DISPLAY}) {\n" .
- " \$| = 1;\n" .
- " print qq(1..0 # " .
- "Skip $module needs a DISPLAY (set one today, okay?)\\n);\n" .
- " CORE::exit(0);\n" .
- " }\n" .
- "}\n"
- );
- }
- }
-
- # If a module must be loaded, load it. Skip the tests if it can't
- # be loaded.
-
- if ($variables->{module}) {
- $variables->{module} = (
- "\n" .
- "BEGIN {\n" .
- " eval 'use $module';\n" .
- " if (\$@) {\n" .
- " \$| = 1;\n" .
- " print qq(1..0 # Skip $module could not be loaded\\n);\n" .
- " CORE::exit(0);\n" .
- " }\n" .
- "}\n"
- );
- }
- }
-
- my $source = (
- "#!/usr/bin/perl -w\n" .
- "# \$Id\$\n" .
- "\n" .
- "use strict;\n" .
- "--no_sys--" .
- "use lib qw(--base_lib--);\n" .
- "use Test::More;\n" .
- "use POSIX qw(_exit);\n" .
- "--display--" .
- "--module--" .
- "\n" .
- "require '--base_file--';\n" .
- "\n" .
- "_exit 0 if \$^O eq 'MSWin32';\n" .
- "CORE::exit 0;\n"
- );
-
- derive_files(
- base_dir => $base_dir,
- base_lib => File::Spec->catfile($base_dir, "00_base"),
- derived_conf => \%derived_conf,
- src_template => $source,
- );
+ my @loops = qw(Select IO::Poll Event Gtk Tk);
+ POE::Test::Loops::generate($base_dir, \@loops);
}
exit 0;
More information about the Pkg-perl-cvs-commits
mailing list