texlive[67480] Build/source/texk/web2c/cwebdir: Unicode::Collate may

[commits+karl at tug.org]

Revision: 67480
          http://tug.org/svn/texlive?view=revision&revision=67480
Author:   karl
Date:     2023-06-26 17:58:21 +0200 (Mon, 26 Jun 2023)
Log Message:
-----------
Unicode::Collate may not be available

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/cwebdir/ChangeLog
    trunk/Build/source/texk/web2c/cwebdir/ctwill-proofsort
    trunk/Build/source/texk/web2c/cwebdir/ctwill.test

Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2023-06-26 04:25:59 UTC (rev 67479)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2023-06-26 15:58:21 UTC (rev 67480)
@@ -1,3 +1,10 @@
+2023-06-26  Karl Berry  <karl at 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.

Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-proofsort
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-proofsort	2023-06-26 04:25:59 UTC (rev 67479)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-proofsort	2023-06-26 15:58:21 UTC (rev 67480)
@@ -8,8 +8,14 @@
 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;
 my $usage = "Usage: $progname input_file\n";

Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill.test
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill.test	2023-06-26 04:25:59 UTC (rev 67479)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill.test	2023-06-26 15:58:21 UTC (rev 67480)
@@ -15,7 +15,9 @@
 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