diff options
author | Karl Berry <karl@freefriends.org> | 2024-03-30 15:39:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-03-30 15:39:30 +0000 |
commit | 2f4e2f4e61e34ab99691754741300f42368a16c5 (patch) | |
tree | 2b4d7a4b5c96f5cdb0853696b192c43e19b6b8c4 | |
parent | 4a0fac46e69e8bbb0f12660f18bf051297eefaf9 (diff) |
doc,sync,debug
git-svn-id: svn://tug.org/texlive/trunk@70814 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 16 | ||||
-rw-r--r-- | Master/texmf-dist/scripts/texlive/NEWS | 4 | ||||
-rw-r--r-- | Master/texmf-dist/web2c/texmfcnf.lua | 2 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-containers | 12 |
4 files changed, 25 insertions, 9 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index c49e701b94a..24ab8c2f3c7 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -7,7 +7,7 @@ use strict; use warnings; package TeXLive::TLUtils; -my $svnrev = '$Revision: 69980 $'; +my $svnrev = '$Revision: 70794 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -2267,7 +2267,7 @@ Run the ConTeXt cache generation commands, using C<$bindir> and C<$progext> to check if commands can be run. Use the function reference C<$run_postinst_cmd> to actually run the commands. The return status is zero if all succeeded, nonzero otherwise. If the main ConTeXt program -(C<luametatex>) cannot be run at all, the return status is status. +(C<luametatex>) cannot be run at all, the return status is zero. Functions C<info> and C<debug> are called with status reports. @@ -2289,16 +2289,24 @@ sub update_context_cache { # can be done about it. my $lmtx = "$bindir/luametatex$progext"; if (TeXLive::TLUtils::system_ok("$lmtx --version")) { - info("setting up ConTeXt cache: "); + info("setting up ConTeXt caches: "); $errcount += &$run_postinst_cmd("mtxrun --generate"); # # If mtxrun failed, don't bother trying more. if ($errcount == 0) { $errcount += &$run_postinst_cmd("context --luatex --generate"); # + # This is for finding fonts by font name (the --generate suffices + # for file name). Although ConTeXt does some automatic cache + # regeneration, Hans advises that this manual reload can help, and + # should be no harm. + # https://wiki.contextgarden.net/Use_the_fonts_you_want + # https://wiki.contextgarden.net/Mtxrun#base and #fonts + $errcount += &$run_postinst_cmd("mtxrun --script fonts --reload"); + # # If context succeeded too, try luajittex. Missing on some platforms. # Although we build luajittex normally, instead of importing the - # binary, testing for file existence should suffice, we may as + # binary, so testing for file existence should suffice, we may as # well test execution since it's just as easy. # if ($errcount == 0) { diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS index 43dfc525f9d..2be01218bfa 100644 --- a/Master/texmf-dist/scripts/texlive/NEWS +++ b/Master/texmf-dist/scripts/texlive/NEWS @@ -2,6 +2,10 @@ Karl Berry, 2010.) <p> +<p><b>tlmgr 70671 (released 30mar24):</b> +<li>wording of platform messages. +<li>revert xz binaries to older versions. +<li>run mtxrun --script fonts --reload when ConTeXt is updated. <li>updmap creates the generically-named output files as copies by default. <p><b>tlmgr 70080 (released 25feb24):</b> diff --git a/Master/texmf-dist/web2c/texmfcnf.lua b/Master/texmf-dist/web2c/texmfcnf.lua index 84e51560fe7..caf6ca08951 100644 --- a/Master/texmf-dist/web2c/texmfcnf.lua +++ b/Master/texmf-dist/web2c/texmfcnf.lua @@ -85,7 +85,7 @@ return { -- mtxrun --find-file LucidaBrightOT.otf -- More info: -- https://wiki.contextgarden.net/Use_the_fonts_you_want - -- https://wiki.contextgarden.net/Mtxrun#base and #fonts + -- https://wiki.contextgarden.net/Mtxrun#base and #fontsa TEXMFLOCAL = "selfautoparent:../texmf-local", TEXMFFONTS = "selfautoparent:texmf-fonts", TEXMFPROJECT = "selfautoparent:texmf-project", diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers index 7f372fa5e67..ab2da939889 100755 --- a/Master/tlpkg/bin/tl-update-containers +++ b/Master/tlpkg/bin/tl-update-containers @@ -189,12 +189,14 @@ sub main { info("$prg: container(s) for $pkg disappeared, recreating them.\n"); push @todopacks, $pkg; push (@pkgs_updated, $pkg); + debug(" pushed disappeared to updated: $pkg\n"); } else { $count_unchanged++; } } elsif ($oldrev < $newrev) { push @todopacks, $pkg; push (@pkgs_updated, $pkg) if $oldrev; + debug(" pushed older to updated: $pkg ($oldrev < $newrev)\n"); } else { # This can happen when packages get renamed or files get # shuffled from one package to another. @@ -242,7 +244,9 @@ sub main { } # get list of packages. - PACKS: for my $pkg (sort @todopacks) { + PACKS: + debug("at PACKS: todo = @todopacks\n"); + for my $pkg (sort @todopacks) { next if $pkg =~ /00texlive/; # we make links from unversioned to versioned containers; this # variable is an override for debugging: @@ -262,7 +266,9 @@ sub main { tlwarn("$prg: Skipping critical $pkg\n"); # we assume that the critical packages always exist, so reduce # the number of updated packages. + debug("before remove_from_list, updated: @pkgs_updated\n"); @pkgs_updated = &remove_from_list (\@pkgs_updated, $pkg); + debug("after remove_from_list, updated: @pkgs_updated\n"); # the following line skips all other regexp checks on critical # packages and skips everything below this (the part which @@ -416,6 +422,7 @@ sub main { # remove non-symlinked .rNNN files. &rcheck_containerdir ($opt_containerdir); + # if ($opt_recreate) { info("$prg: all packages recreated.\n"); } else { @@ -427,9 +434,6 @@ sub main { info(@list ? ": @list" : "."); info("\n"); } - print "$prg: ", 0 + @pkgs_new, " newtest (@pkgs_new)\n"; - print "$prg: ", 0 + @pkgs_removed, " rmtest (@pkgs_removed)\n"; - print "$prg: ", 0 + @pkgs_updated, " updtest (@pkgs_updated)\n"; info("$prg: $count_unchanged unchanged.\n"); } else { info("$prg: no containers to be updated.\n"); |