Skip to content

Commit

Permalink
cpan/Compress-Raw-Bzip2 - Update to version 2.210
Browse files Browse the repository at this point in the history
  2.210 26 February 2024

    * version 2.210
      Mon Feb 26 09:28:29 2024 +0000
      f21aa27dc4c434e8dcbb4001767485c99b00c0e2

    * Fix Changes for 2.209
      Mon Feb 26 09:27:30 2024 +0000
      25d4f210f7fc4ff6153fff971c01a4f1ce81bddd
  • Loading branch information
pmqs authored and jkeenan committed Feb 26, 2024
1 parent 529b0ee commit 0bec5c1
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 18 deletions.
3 changes: 2 additions & 1 deletion Porting/Maintainers.pl
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ package Maintainers;
},

'Compress::Raw::Bzip2' => {
'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.206.tar.gz',
'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.210.tar.gz',
'SYNCINFO' => 'jkeenan on Mon Feb 26 09:07:43 2024',
'SYNCINFO' => 'yorton on Tue Jul 25 20:45:42 2023',
'FILES' => q[cpan/Compress-Raw-Bzip2],
'EXCLUDED' => [
Expand Down
33 changes: 21 additions & 12 deletions cpan/Compress-Raw-Bzip2/Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ use private::MakeUtil;
use ExtUtils::MakeMaker 5.16 ;

my $WALL= '';
$WALL = ' -Wall -Wno-comment ' if $Config{'cc'} =~ /gcc/ ;
$WALL = ' -Wall -Wno-comment '
if $Config{'cc'} =~ /gcc/ ;
my $USE_PPPORT_H = ($ENV{PERL_CORE}) ? '' : '-DUSE_PPPORT_H';


my $BUILD_BZIP2 = defined($ENV{BUILD_BZIP2}) ? $ENV{BUILD_BZIP2} : 1;
my $BUILD_BZIP2 = getBoolean('BUILD_BZIP2');
my $BZIP2_LIB = defined($ENV{BZIP2_LIB}) ? $ENV{BZIP2_LIB} : 'bzip2-src';
my $BZIP2_INCLUDE = defined($ENV{BZIP2_INCLUDE}) ? $ENV{BZIP2_INCLUDE} : '.';

Expand All @@ -26,10 +27,11 @@ WriteMakefile(
VERSION_FROM => 'lib/Compress/Raw/Bzip2.pm',
INC => "-I$BZIP2_INCLUDE" ,
DEFINE => "$WALL -DBZ_NO_STDIO $USE_PPPORT_H" ,
XS => { 'Bzip2.xs' => 'Bzip2.c'},
'clean' => { FILES => '*.c bzip2.h bzlib.h bzlib_private.h constants.h constants.xs' },
#'depend' => { 'Makefile' => 'config.in' },
'dist' => { COMPRESS => 'gzip',
XS => { 'Bzip2.xs' => 'Bzip2.c'},
clean => { FILES => '*.c bzip2.h bzlib.h bzlib_private.h constants.h constants.xs' },
depend => { manifypods => 'READMEmd' },
postamble => { name => 'Bzip2'},
dist => { COMPRESS => 'gzip',
TARFLAGS => '-chvf',
SUFFIX => 'gz',
DIST_DEFAULT => 'MyTrebleCheck tardist',
Expand Down Expand Up @@ -173,11 +175,18 @@ sub bzip2_files
push @c_files, 'Bzip2.c' ;

return (
#'H' => [ @h_files ],
'C' => [ @c_files ] ,
#'OBJECT' => qq[ @o_files ],
'OBJECT' => q[ $(O_FILES) ],


'C' => [ @c_files ] ,
'OBJECT' => q[ $(O_FILES) ],
) ;
}

sub getBoolean
{
my $name = shift ;

# default is TRUE
return 1
if ! defined $ENV{$name};

return ($ENV{$name} =~ /^yes|on|true|1$/i) ? 1 : 0;
}
4 changes: 2 additions & 2 deletions cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use Carp ;
use bytes ;
our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);

$VERSION = '2.206';
$VERSION = '2.210';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;

Expand Down Expand Up @@ -384,7 +384,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
Copyright (c) 2005-2023 Paul Marquess. All rights reserved.
Copyright (c) 2005-2024 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
31 changes: 30 additions & 1 deletion cpan/Compress-Raw-Bzip2/private/MakeUtil.pm
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,14 @@ sub MY::libscan

sub MY::postamble
{
return ''
my $self = shift ;
my %params = @_ ;

return <<EOM
READMEmd:
EOM
if $ENV{PERL_CORE} ;

my @files = getPerlFiles('MANIFEST');
Expand All @@ -66,6 +73,28 @@ MyTrebleCheck:
';

if (-e '.github' && exists $params{name})
{
my $name = $params{name};
$postamble .= <<"EOM";
READMEmd: .github/$name.pod
.github/$name.pod: lib/Compress/Raw/$name.pm
\@echo Creating .github/$name.pod from $name.pm
\$(NOECHO) perl -e 'while(<>){ next if 1 .. /^__END__/; print}' lib/Compress/Raw/$name.pm >.github/$name.pod
EOM
}
else
{
$postamble .= <<"EOM";
READMEmd:
EOM
}

return $postamble;
}

Expand Down
2 changes: 1 addition & 1 deletion cpan/Compress-Raw-Bzip2/t/000prereq.t
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ BEGIN
if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };


my $VERSION = '2.206';
my $VERSION = '2.210';
my @NAMES = qw(
);
Expand Down
13 changes: 13 additions & 0 deletions cpan/Compress-Raw-Bzip2/t/01bzip2.t
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,18 @@ for my $consume ( 0 .. 1)

}

SKIP:
foreach (1 .. 2)
{
next if $] < 5.005 ;

title 'test bzinflate/bzdeflate with a substr';

# temp workaround for
# https://github.com/pmqs/Compress-Raw-Bzip2/issues/13
skip "skipping substr tests for Perl 5.6.*", 15
if $] < 5.008 ;

my $contents = '' ;
foreach (1 .. 5000)
{ $contents .= chr int rand 255 }
Expand Down Expand Up @@ -433,10 +439,16 @@ foreach (1 .. 2)

}

SKIP: {
if ($] >= 5.005)
{
title 'test bzinflate input parameter via substr';

# temp workaround for
# https://github.com/pmqs/Compress-Raw-Bzip2/issues/13
skip "skipping substr tests for Perl 5.6.*", 11
if $] < 5.008 ;

my $hello = "I am a HAL 9000 computer" ;
my $data = $hello ;

Expand Down Expand Up @@ -471,6 +483,7 @@ if ($] >= 5.005)
is $X, $keep;

}
}


{
Expand Down
7 changes: 6 additions & 1 deletion cpan/Compress-Raw-Bzip2/t/19nonpv.t
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,17 @@ EOM

my $len = length $hello ;


SKIP:
{

title "bzdeflate/bzinflate - non-PV buffers";
# ==============================

# temp workaround for
# https://github.com/pmqs/Compress-Raw-Bzip2/issues/13
skip "skipping tests for Perl 5.6.*", 19
if $] < 5.008 ;

my $hello = *hello;
$hello = *hello;
my ($err, $x, $X, $status);
Expand Down

0 comments on commit 0bec5c1

Please sign in to comment.