texlive[52740] Master/texmf-dist/scripts/texlive/tlmgr.pl:

[commits+karl at tug.org]

Revision: 52740
          http://tug.org/svn/texlive?view=revision&revision=52740
Author:   karl
Date:     2019-11-12 00:12:53 +0100 (Tue, 12 Nov 2019)
Log Message:
-----------
(check_executes): do not complain if luahbtex or
mfluajit are missing, as well as luajittex.

Modified Paths:
--------------
    trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl

Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2019-11-11 21:44:36 UTC (rev 52739)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2019-11-11 23:12:53 UTC (rev 52740)
@@ -5666,6 +5666,7 @@
   my %missingbins;
   my %missingengines;
   my %missinginis;
+  my @archs_to_check = $localtlpdb->available_architectures;
   for (keys %fmtlines) {
     my %r = TeXLive::TLUtils::parse_AddFormat_line("$_");
     if (defined($r{"error"})) {
@@ -5678,10 +5679,11 @@
     # special case for cont-en ...
     next if ($name eq "cont-en");
     # we check that the name exist in bin/$arch
-    my @archs_to_check = $localtlpdb->available_architectures;
-    if ($engine eq "luajittex") {
+    if ($engine =~ /^(lua(jit|hb)tex|mfluajit)$/) {
       # luajittex is special since it is not available on all architectures
-      # due to inherent reasons (machine code)
+      #   due to inherent reasons (machine code);
+      # luahbtex is special until we build it everywhere for TL'20.
+      # 
       # We do not want to have error messages here, so we do the following:
       # * if tlpkg/tlpsrc/luatex.tlpsrc is available, then load it
       #   and filter away those archs that are excluded with f/!...
@@ -5689,6 +5691,7 @@
       #   we just ignore it completely.
       my $tlpsrc_file = $localtlpdb->root . "/tlpkg/tlpsrc/luatex.tlpsrc";
       if (-r $tlpsrc_file) {
+        ddebug("check_executes: found $tlpsrc_file\n");
         require TeXLive::TLPSRC;
         my $tlpsrc = new TeXLive::TLPSRC;
         $tlpsrc->from_file($tlpsrc_file);
@@ -5699,25 +5702,24 @@
             my $pt = $1;
             my $aa = $2;
             my $pr = $3;
-            if ($pr =~ m!/luajittex$!) {
+            if ($pr =~ m!/$engine$!) {
               # bingo, get the negative patterns
               if ($aa =~ m/^!(.*)$/) {
                 @negarchs = split(/,/,$1);
+                ddebug("check_executes:  negative arches: @negarchs\n");
               }
             }
           }
         }
-        my %foo;
+        my @new_archs = ();
         for my $a (@archs_to_check) {
-          $foo{$a} = 1;
+          push (@new_archs, $a) unless grep { $a eq $_ } @negarchs;
         }
-        for my $a (@negarchs) {
-          delete $foo{$a} if defined($foo{$a});
-        }
-        @archs_to_check = keys %foo;
+        @archs_to_check = @new_archs;
       } else {
-        @archs_to_check = ();
+        @archs_to_check = (); # no tlpsrc, check nothing.
       }
+      ddebug("check_executes: final arches to check: @archs_to_check\n");
     }
     for my $a (@archs_to_check) {
       my $f = "$Master/bin/$a/$name";