Skip to content

Commit

Permalink
cpan/Encode - Update to version 3.20
Browse files Browse the repository at this point in the history
$Revision: 3.20 $ $Date: 2023/11/10 01:10:50 $
! t/Aliases.t t/CJKT.t t/Encode.t t/Encoder.t t/Unicode.t t/at-cn.t
  t/at-tw.t t/enc_data.t t/enc_eucjp.t t/enc_module.t t/enc_utf8.t
  t/encoding.t t/fallback.t t/grow.t t/gsm0338.t t/guess.t t/jperl.t
  t/magic.t t/mime-header.t t/mime-name.t t/perlio.t t/rt113164.t
  t/rt65541.t t/rt76824.t t/rt85489.t t/rt86327.t t/truncated_utf8.t
  t/utf8strict.t t/rt.pl
  Fix indirect syntax accordingly to (but not by pulling):
  dankogai/p5-encode#176
! bin/enc2xs
  Pulled: enc2xs: Fix indirect syntax
  dankogai/p5-encode#174
! bin/encguess
  Pulled: encguess: remove duplicate "the"
  dankogai/p5-encode#173
! bin/enc2xs
  Pulled: Fix spelling in comment
  dankogai/p5-encode#171
! t/gsm0338.t
  Pulled: fix gsm0338 test compatibility with perl < 5.8.8
  dankogai/p5-encode#170
  • Loading branch information
dankogai authored and jkeenan committed Nov 10, 2023
1 parent c28ce7c commit 18cfa0e
Show file tree
Hide file tree
Showing 34 changed files with 63 additions and 58 deletions.
22 changes: 11 additions & 11 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -823,8 +823,8 @@ cpan/Encode/t/big5-eten.utf test data
cpan/Encode/t/big5-hkscs.enc test data
cpan/Encode/t/big5-hkscs.utf test data
cpan/Encode/t/CJKT.t test script
cpan/Encode/t/cow.t
cpan/Encode/t/decode.t
cpan/Encode/t/cow.t Test file related to Encode
cpan/Encode/t/decode.t Test file related to Encode
cpan/Encode/t/enc_data.t test script for utf8 DATA
cpan/Encode/t/enc_eucjp.t test script
cpan/Encode/t/enc_module.enc test data for t/enc_module.t
Expand All @@ -841,7 +841,7 @@ cpan/Encode/t/gb2312.utf test data
cpan/Encode/t/grow.t test script
cpan/Encode/t/gsm0338.t test script
cpan/Encode/t/guess.t test script
cpan/Encode/t/isa.t
cpan/Encode/t/isa.t Test file related to Encode
cpan/Encode/t/jis7-fallback.t test script
cpan/Encode/t/jisx0201.enc test data
cpan/Encode/t/jisx0201.utf test data
Expand All @@ -865,18 +865,18 @@ cpan/Encode/t/rt65541.t test script
cpan/Encode/t/rt76824.t test script
cpan/Encode/t/rt85489.t test script
cpan/Encode/t/rt86327.t test script
cpan/Encode/t/taint.t
cpan/Encode/t/truncated_utf8.t
cpan/Encode/t/undef.t
cpan/Encode/t/taint.t Test file related to Encode
cpan/Encode/t/truncated_utf8.t Test file related to Encode
cpan/Encode/t/undef.t Test file related to Encode
cpan/Encode/t/unibench.pl benchmark script
cpan/Encode/t/Unicode.t test script
cpan/Encode/t/Unicode_trailing_nul.t
cpan/Encode/t/use-Encode-Alias.t
cpan/Encode/t/utf32warnings.t
cpan/Encode/t/Unicode_trailing_nul.t Test file related to Encode
cpan/Encode/t/use-Encode-Alias.t Test file related to Encode
cpan/Encode/t/utf32warnings.t Test file related to Encode
cpan/Encode/t/utf8ref.t test script
cpan/Encode/t/utf8strict.t test script
cpan/Encode/t/utf8warnings.t
cpan/Encode/t/xml.t
cpan/Encode/t/utf8warnings.t Test file related to Encode
cpan/Encode/t/xml.t Test file related to Encode
cpan/Encode/TW/Makefile.PL Encode extension
cpan/Encode/TW/TW.pm Encode extension
cpan/Encode/ucm/8859-1.ucm Unicode Character Map
Expand Down
3 changes: 2 additions & 1 deletion Porting/Maintainers.pl
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,8 @@ package Maintainers;
},

'Encode' => {
'DISTRIBUTION' => 'DANKOGAI/Encode-3.19.tar.gz',
'DISTRIBUTION' => 'DANKOGAI/Encode-3.20.tar.gz',
'SYNCINFO' => 'jkeenan on Fri Nov 10 15:12:07 2023',
'FILES' => q[cpan/Encode],
'EXCLUDED' => [
qw( t/whatwg-aliases.json
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/Encode.pm
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#
# $Id: Encode.pm,v 3.19 2022/08/04 04:42:30 dankogai Exp $
# $Id: Encode.pm,v 3.20 2023/11/10 01:09:56 dankogai Exp $
#
package Encode;
use strict;
use warnings;
use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
our $VERSION;
BEGIN {
$VERSION = sprintf "%d.%02d", q$Revision: 3.19 $ =~ /(\d+)/g;
$VERSION = sprintf "%d.%02d", q$Revision: 3.20 $ =~ /(\d+)/g;
require XSLoader;
XSLoader::load( __PACKAGE__, $VERSION );
}
Expand Down
6 changes: 3 additions & 3 deletions cpan/Encode/bin/enc2xs
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ BEGIN {
# @INC poking no longer needed w/ new MakeMaker and Makefile.PL's
# with $ENV{PERL_CORE} set
# In case we need it in future...
require Config; import Config;
require Config; Config->import();
pop @INC if $INC[-1] eq '.';
}
use strict;
use warnings;
use Getopt::Std;
use Config;
my @orig_ARGV = @ARGV;
our $VERSION = do { my @r = (q$Revision: 2.24 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
our $VERSION = do { my @r = (q$Revision: 2.25 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };

# These may get re-ordered.
# RAW is a do_now as inserted by &enter
Expand Down Expand Up @@ -213,7 +213,7 @@ if (exists $opt{f}) {
}

my $cname = $opt{o} ? $opt{o} : shift(@ARGV);
unless ($cname) { #debuging a win32 nmake error-only. works via cmdline
unless ($cname) { # Debugging a Win32 nmake error-only; works via cmdline.
print "\nARGV:";
print "$_ " for @ARGV;
print "\nopt:";
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/bin/encguess
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ encguess - guess character encodings of files
=head1 VERSION
$Id: encguess,v 0.3 2020/12/02 01:28:17 dankogai Exp $
$Id: encguess,v 0.4 2023/11/10 01:10:50 dankogai Exp dankogai $
=head1 SYNOPSIS
Expand Down Expand Up @@ -138,7 +138,7 @@ L<Encode::Guess>, L<Encode::Detect>
Copyright 2015 Michael LaGrasta and Dan Kogai.
This program is free software; you can redistribute it and/or modify it
under the terms of the the Artistic License (2.0). You may obtain a
under the terms of the Artistic License (2.0). You may obtain a
copy of the full license at:
L<http://www.perlfoundation.org/artistic_license_2_0>
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/Aliases.t
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BEGIN {
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/CJKT.t
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BEGIN {
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/Encode.t
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BEGIN {
print "1..0 # Skip: EBCDIC\n";
exit 0;
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/t/Encoder.t
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#
# $Id: Encoder.t,v 2.1 2013/09/14 07:51:59 dankogai Exp $
# $Id: Encoder.t,v 2.2 2023/11/10 01:10:50 dankogai Exp dankogai $
#

BEGIN {
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/t/Unicode.t
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# $Id: Unicode.t,v 2.4 2021/07/23 02:26:54 dankogai Exp $
# $Id: Unicode.t,v 2.5 2023/11/10 01:10:50 dankogai Exp dankogai $
#
# This script is written entirely in ASCII, even though quoted literals
# do include non-BMP unicode characters -- Are you happy, jhi?
#

BEGIN {
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/at-cn.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BEGIN {
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/at-tw.t
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BEGIN {
if (! -d 'blib' and -d 't'){ chdir 't' };
unshift @INC, '../lib';
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/t/enc_data.t
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $Id: enc_data.t,v 2.6 2022/04/07 03:06:40 dankogai Exp $
# $Id: enc_data.t,v 2.7 2023/11/10 01:10:50 dankogai Exp dankogai $

BEGIN {
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/t/enc_eucjp.t
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# $Id: enc_eucjp.t,v 2.6 2019/01/31 04:26:40 dankogai Exp $
# $Id: enc_eucjp.t,v 2.7 2023/11/10 01:10:50 dankogai Exp dankogai $
# This is the twin of enc_utf8.t .

BEGIN {
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/t/enc_module.t
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $Id: enc_module.t,v 2.6 2022/04/07 03:06:40 dankogai Exp $
# $Id: enc_module.t,v 2.7 2023/11/10 01:10:50 dankogai Exp dankogai $
# This file is in euc-jp
BEGIN {
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/t/enc_utf8.t
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# $Id: enc_utf8.t,v 2.6 2019/12/25 09:23:21 dankogai Exp $
# $Id: enc_utf8.t,v 2.7 2023/11/10 01:10:50 dankogai Exp dankogai $
# This is the twin of enc_eucjp.t .

BEGIN {
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/encoding.t
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BEGIN {
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/fallback.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BEGIN {
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/grow.t
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BEGIN {
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
6 changes: 5 additions & 1 deletion cpan/Encode/t/gsm0338.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BEGIN {
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand All @@ -16,6 +16,10 @@ use utf8;
use Test::More tests => 777;
use Encode;
use Encode::GSM0338;
use PerlIO::encoding;

# perl < 5.8.8 didn't enable STOP_AT_PARTIAL by default
$PerlIO::encoding::fallback |= Encode::STOP_AT_PARTIAL;

my $chk = Encode::LEAVE_SRC();

Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/guess.t
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BEGIN {
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/t/jperl.t
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# $Id: jperl.t,v 2.6 2022/04/07 03:06:40 dankogai Exp $
# $Id: jperl.t,v 2.7 2023/11/10 01:10:50 dankogai Exp dankogai $
#
# This script is written in euc-jp

BEGIN {
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/magic.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BEGIN {
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/t/mime-header.t
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#
# $Id: mime-header.t,v 2.16 2022/06/25 01:58:57 dankogai Exp $
# $Id: mime-header.t,v 2.17 2023/11/10 01:10:50 dankogai Exp dankogai $
# This script is written in utf8
#
BEGIN {
if ($ENV{'PERL_CORE'}){
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/t/mime-name.t
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#
# $Id: mime-name.t,v 1.3 2017/10/06 22:21:53 dankogai Exp $
# $Id: mime-name.t,v 1.4 2023/11/10 01:10:50 dankogai Exp dankogai $
# This script is written in utf8
#
BEGIN {
if ($ENV{'PERL_CORE'}){
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/perlio.t
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BEGIN {
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
4 changes: 2 additions & 2 deletions cpan/Encode/t/rt.pl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/local/bin/perl
#
# $Id: rt.pl,v 2.1 2006/05/03 18:24:10 dankogai Exp $
# $Id: rt.pl,v 2.2 2023/11/10 01:10:50 dankogai Exp dankogai $
#

BEGIN {
Expand All @@ -10,7 +10,7 @@ BEGIN
unshift @INC, '../lib';
$ucmdir = "../ext/Encode/ucm";
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/rt113164.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BEGIN {
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/rt65541.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BEGIN {
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/rt76824.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BEGIN {
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Encode/t/rt85489.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BEGIN {
chdir 't';
unshift @INC, '../lib';
}
require Config; import Config;
require Config; Config->import();
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
exit 0;
Expand Down
Loading

0 comments on commit 18cfa0e

Please sign in to comment.