r61432 - in /branches/upstream/libdata-dump-streamer-perl/current: Build.PL Changes META.yml inc/My/Builder.pm lib/Data/Dump/Streamer.pm
angelabad-guest at users.alioth.debian.org
angelabad-guest at users.alioth.debian.org
Sun Aug 8 11:35:25 UTC 2010
Author: angelabad-guest
Date: Sun Aug 8 11:34:45 2010
New Revision: 61432
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=61432
Log:
[svn-upgrade] new version libdata-dump-streamer-perl (2.22)
Modified:
branches/upstream/libdata-dump-streamer-perl/current/Build.PL
branches/upstream/libdata-dump-streamer-perl/current/Changes
branches/upstream/libdata-dump-streamer-perl/current/META.yml
branches/upstream/libdata-dump-streamer-perl/current/inc/My/Builder.pm
branches/upstream/libdata-dump-streamer-perl/current/lib/Data/Dump/Streamer.pm
Modified: branches/upstream/libdata-dump-streamer-perl/current/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdata-dump-streamer-perl/current/Build.PL?rev=61432&op=diff
==============================================================================
--- branches/upstream/libdata-dump-streamer-perl/current/Build.PL (original)
+++ branches/upstream/libdata-dump-streamer-perl/current/Build.PL Sun Aug 8 11:34:45 2010
@@ -1,4 +1,5 @@
#!perl
+
use 5.006_000;
BEGIN {
push @INC, 'inc';
Modified: branches/upstream/libdata-dump-streamer-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdata-dump-streamer-perl/current/Changes?rev=61432&op=diff
==============================================================================
--- branches/upstream/libdata-dump-streamer-perl/current/Changes (original)
+++ branches/upstream/libdata-dump-streamer-perl/current/Changes Sun Aug 8 11:34:45 2010
@@ -1,9 +1,15 @@
+2.22 (2010-07-11)
+
+Build.PL fixed to accept DDS and NODDS again
+
2.21 (2010-06-19)
-Resynchronize internal VERSION declarations.
-
-Skipped v2.20 because it some of the build code was truncating it to
-v2.2 and breaking
+Resynchronize internal VERSION declarations
+
+2.20
+
+Skipped version 2.20 because version numbers don't play nice when they
+end in zeros.
2.19 (2010-06-19)
Modified: branches/upstream/libdata-dump-streamer-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdata-dump-streamer-perl/current/META.yml?rev=61432&op=diff
==============================================================================
--- branches/upstream/libdata-dump-streamer-perl/current/META.yml (original)
+++ branches/upstream/libdata-dump-streamer-perl/current/META.yml Sun Aug 8 11:34:45 2010
@@ -31,10 +31,10 @@
provides:
Data::Dump::Streamer:
file: lib/Data/Dump/Streamer.pm
- version: 2.21
+ version: 2.22
Data::Dump::Streamer::Deparser:
file: lib/Data/Dump/Streamer.pm
- version: 2.21
+ version: 2.22
recommends:
Algorithm::Diff: 0
Compress::Zlib: 0
@@ -60,4 +60,4 @@
warnings::register: 0
resources:
license: http://dev.perl.org/licenses/
-version: 2.21
+version: 2.22
Modified: branches/upstream/libdata-dump-streamer-perl/current/inc/My/Builder.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdata-dump-streamer-perl/current/inc/My/Builder.pm?rev=61432&op=diff
==============================================================================
--- branches/upstream/libdata-dump-streamer-perl/current/inc/My/Builder.pm (original)
+++ branches/upstream/libdata-dump-streamer-perl/current/inc/My/Builder.pm Sun Aug 8 11:34:45 2010
@@ -6,8 +6,8 @@
use Module::Build;
our @ISA = 'Module::Build';
-sub ACTION_config {
- my ( $self ) = @_;
+sub new {
+ my $class = shift @_;
{
my $B_Utils_required = 0.05;
@@ -28,49 +28,53 @@
};
}
+ # Handle both: `./Build.PL DDS' and `./Build.PL NODDS'
+ #
+ my $create_dds_alias;
+ if ( @ARGV && $ARGV[0] =~ /^(?:NO)?DDS$/i ) {
+ my $arg = uc shift @ARGV;
+ $create_dds_alias = 'DDS' eq $arg;
+ }
print "Installing Data::Dump::Streamer\n";
- my $override =
- $ARGV[0] =~ /^(?:NO)?DDS$/i
- ? shift( @ARGV )
- : undef;
- my $value;
- if ( $override ) {
- $value = $override =~ /^no/i ? 'no' : 'yes';
+ if ( ! defined $create_dds_alias
+ && -e '.answer'
+ && open my $fh, "<", '.answer') {
+ print "I will install (or not) the DDS shortcut as you requested previously.\n";
+ print "If you wish to override the previous answer then state so explicitly\n";
+ print "by saying 'perl Build.PL [NO]DDS'\n";
+ my $cached_value = <$fh>;
+ chomp $cached_value;
+ print "Previous answer was: $cached_value\n";
+
+ $create_dds_alias = 'yes' eq lc $cached_value;
}
- else {
- if ( -e '.answer' && open my $fh, "<", '.answer') {
- print "I will install (or not) the DDS shortcut as you requested previously.\n";
- print "If you wish to override the previous answer then state so explicitly\n";
- print "by saying 'perl Makefile.PL [NO]DDS'\n";
- $value = <$fh>;
- chomp $value;
- print "Previous answer was: $value\n";
+
+ if ( ! defined $create_dds_alias ) {
+ my $default =
+ ( 0 == system( qq($^X -e "chdir '/';exit( eval { require DDS } ? 0: 1 )") )
+ || ( -e "./lib/DDS.pm") )
+ ? 'yes'
+ : 'no';
+ print "\n";
+ print "I can install a shortcut so you can use the package 'DDS'\n";
+ print "as though it was 'Data::Dump::Streamer'. This is handy for oneliners.\n";
+ print "*Note* that if you select 'no' below and you already\n";
+ print "have it installed then it will be removed.\n";
+ print "\n";
+ my $yn = !! $class->y_n("Would you like me to install the shortcut? (yes/no)",
+ $default);
+ if (open my $fh, ">", '.answer') {
+ print $fh $yn ? "yes\n" : "no\n";
+ close $fh;
}
-
- if ( ! $value ) {
- my $default =
- ( eval("require DDS; 1")
- || ( -e "./lib/DDS.pm") )
- ? 'yes'
- : 'no';
- print "\n";
- print "I can install a shortcut so you can use the package 'DDS'\n";
- print "as though it was 'Data::Dump::Streamer'. This is handy for oneliners.\n";
- print "*Note* that if you select 'no' below and you already\n";
- print "have it installed then it will be removed.\n";
- print "\n";
- $value = prompt("Would you like me to install the shortcut? (yes/no)",
- $default);
- if (open my $fh, ">", '.answer') {
- print $fh $value;
- close $fh;
- }
- }
+ $create_dds_alias = $yn;
}
- if ( $value=~/yes/i ) {
+ my $self = $class->SUPER::new( @_ );
+
+ if ( $create_dds_alias ) {
print "I will also install DDS as an alias.\n";
open my $ofh, ">", "./lib/DDS.pm"
or die "Failed to open ./lib/DDS.pm: $!";
@@ -83,7 +87,7 @@
unlink "./lib/DDS.pm";
}
- return;
+ return $self;
}
sub DDS {
Modified: branches/upstream/libdata-dump-streamer-perl/current/lib/Data/Dump/Streamer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdata-dump-streamer-perl/current/lib/Data/Dump/Streamer.pm?rev=61432&op=diff
==============================================================================
--- branches/upstream/libdata-dump-streamer-perl/current/lib/Data/Dump/Streamer.pm (original)
+++ branches/upstream/libdata-dump-streamer-perl/current/lib/Data/Dump/Streamer.pm Sun Aug 8 11:34:45 2010
@@ -34,7 +34,7 @@
BEGIN {
#$Id: Streamer.pm 40 2007-12-22 00:37:55Z demerphq $#
- $VERSION ='2.21';
+ $VERSION ='2.22';
$VERSION = eval $VERSION; # used for beta stuff.
@ISA = qw(Exporter DynaLoader);
@EXPORT=qw(Dump DumpLex DumpVars);
@@ -3669,7 +3669,7 @@
our @ISA=qw(B::Deparse);
my %cache;
-our $VERSION = '2.21';
+our $VERSION = '2.22';
if ( $VERSION ne $Data::Dump::Streamer::VERSION ) {
die "Incompatible Data::Dump::Streamer::Deparser v$VERSION vs Data::Dump::Streamer v$Data::Dump::Streamer::VERSION";
}
More information about the Pkg-perl-cvs-commits
mailing list