diff options
author | Karl Berry <karl@freefriends.org> | 2023-06-26 15:58:21 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-06-26 15:58:21 +0000 |
commit | 89c4ed2c6f9667540a4d69e3d5e05dc8e9444bd7 (patch) | |
tree | 29338f6324a6b207d39b8d220fec5ed17a4d89cd /Build/source/texk/web2c/cwebdir | |
parent | ae0bfc1cde7d21599011fcf58399d4d2e0918370 (diff) |
Unicode::Collate may not be available
git-svn-id: svn://tug.org/texlive/trunk@67480 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/cwebdir')
-rw-r--r-- | Build/source/texk/web2c/cwebdir/ChangeLog | 7 | ||||
-rwxr-xr-x | Build/source/texk/web2c/cwebdir/ctwill-proofsort | 8 | ||||
-rwxr-xr-x | Build/source/texk/web2c/cwebdir/ctwill.test | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index df274c6b261..1abc626f3dd 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,10 @@ +2023-06-26 Karl Berry <karl@freefriends.org> + + * ctwill-proofsort: Unicode::Collate is required but may not be + available. + * ctwill.test: exit 0 if Unicode::Collate is not available, + so we don't fail in environments without it. + 2023-06-23 Andreas Scherer <https://ascherer.github.io> * ctwill.test: Check CTWILL output. diff --git a/Build/source/texk/web2c/cwebdir/ctwill-proofsort b/Build/source/texk/web2c/cwebdir/ctwill-proofsort index d99ebdf91da..17a14dbd0e8 100755 --- a/Build/source/texk/web2c/cwebdir/ctwill-proofsort +++ b/Build/source/texk/web2c/cwebdir/ctwill-proofsort @@ -8,7 +8,13 @@ use warnings; use File::Basename; use Getopt::Long qw(:config no_ignore_case bundling); use Pod::Usage; -use Unicode::Collate; + +BEGIN { + # Unicode::Collate has been around a long time, + # but it's not part of core Perl. + my $rc = eval { require Unicode::Collate; }; + die "$0: the Unicode::Collate module is required\n" unless $rc; +} # We expect a TeX file as the single command-line parameter. my $progname = basename $0; diff --git a/Build/source/texk/web2c/cwebdir/ctwill.test b/Build/source/texk/web2c/cwebdir/ctwill.test index d921568b560..42c0a6a9a72 100755 --- a/Build/source/texk/web2c/cwebdir/ctwill.test +++ b/Build/source/texk/web2c/cwebdir/ctwill.test @@ -15,7 +15,9 @@ diff ham.tex $testdir/ham.tex || exit 1 diff ham.sref $testdir/ham.sref || exit 1 # Test CTWILL-PROOFSORT -# Perl script not available in builddir +# Perl script not available in builddir, and requires Unicode::Collate; +# if that module is not available, just quit testing. +perl -e 'use Unicode::Collate;' 2>/dev/null || exit 0 $testdir/../ctwill-proofsort ham.tex > ham-sorted.tex || exit 1 diff ham-sorted.tex $testdir/ham-sorted.tex || exit 1 |