summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-04-24 21:11:14 +0000
committerKarl Berry <karl@freefriends.org>2024-04-24 21:11:14 +0000
commitdff4889330f23dea19495dbe8c21dcfc17172690 (patch)
treeeb9175f9f395e86d7857e73c1b96299717488708
parent979dfb2864d6ee9162c8351d4b8d5ecdaccbb679 (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@71071 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm31
-rw-r--r--Build/source/texk/texlive/windows_wrapper/runscript.tlu13
2 files changed, 29 insertions, 15 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index 24ab8c2f3c7..e43a3aac3c9 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: 70794 $';
+my $svnrev = '$Revision: 71007 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -4865,6 +4865,13 @@ sub tlnet_disabled_packages {
return @ret;
}
+=item C<< report_tlpdb_differences($rret) >>
+
+Report, using info function, as given in hash reference argument RET,
+with keys removed_packages, added_packages, different_packages.
+
+=cut
+
sub report_tlpdb_differences {
my $rret = shift;
my %ret = %$rret;
@@ -4883,19 +4890,29 @@ sub report_tlpdb_differences {
}
if (defined($ret{'different_packages'})) {
info ("different packages from A to B:\n");
+ my $printed_fmttriggers_msg = 0;
for my $p (sort keys %{$ret{'different_packages'}}) {
- info (" $p\n");
+ info (" $p:\n");
for my $k (sort keys %{$ret{'different_packages'}->{$p}}) {
if ($k eq "revision") {
- info(" revision differ: $ret{'different_packages'}->{$p}->{$k}\n");
+ info(" revision differ: $ret{'different_packages'}->{$p}->{$k}\n");
} elsif ($k eq "removed" || $k eq "added") {
- info(" $k files:\n");
+ info (" $k files:\n");
for my $f (sort @{$ret{'different_packages'}->{$p}->{$k}}) {
- info(" $f\n");
+ info (" $f\n");
}
+ } elsif ($k eq "fmttriggers") {
+ # fmttriggers; don't bother making a complete report.
+ # The fmttriggers will differ when the global variables in
+ # 00texlive.autopatterns.tlpsrc change but we forgot to
+ # tlforceincr all the packages that depend on the variables.
+ # Which happens depressingly often.
+ info(" $k differ)\n");
+ info("(if 00texlive.autopatterns change, tlforceincr dependents.)\n")
+ if ! $printed_fmttriggers_msg; # just show once
+ $printed_fmttriggers_msg = 1;
} else {
- # e.g., fmttriggers; don't bother making a nice report.
- info(" unknown differ $k\n");
+ info(" $k differ\n");
}
}
}
diff --git a/Build/source/texk/texlive/windows_wrapper/runscript.tlu b/Build/source/texk/texlive/windows_wrapper/runscript.tlu
index c0276ced5e9..97bd77d5436 100644
--- a/Build/source/texk/texlive/windows_wrapper/runscript.tlu
+++ b/Build/source/texk/texlive/windows_wrapper/runscript.tlu
@@ -1,7 +1,7 @@
-local svnrevision = string.match("$Revision: 70363 $", "%d+") or "0"
-local svndate = string.match("$Date: 2024-03-03 01:45:04 +0100 (Sun, 03 Mar 2024) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 71041 $", "%d+") or "0"
+local svndate = string.match("$Date: 2024-04-23 12:33:27 +0200 (Tue, 23 Apr 2024) $", "[-%d]+") or "2009-12-04"
local bannerstr = "runscript wrapper utility (rev. " ..
svnrevision .. ", " .. svndate .. ")\n" ..
"usage: runscript script-name [arguments]\n" ..
@@ -287,14 +287,11 @@ local function show_error(msg)
if guimode then
local err_cmd
os.setenv('RUNSCRIPT_ERROR_MESSAGE', msg)
- local errmess_path = TEXDIR .. '/texmf-dist/scripts/texlive/tl-errmess.vbs'
- local err_cmd = {"wscript", errmess_path:gsub('/','\\')}
+ local errmess_path = TEXDIR .. '/texmf-dist/scripts/texlive/tl-errmess.ps1'
+ local err_cmd = {"powershell", "-NoLogo", "-WindowStyle", "hidden",
+ '-ExecutionPolicy', 'Bypass', errmess_path:gsub('/','\\')}
if lfs.isfile(errmess_path) then
os.spawn(err_cmd)
- elseif lfs.isfile(TEXDIR..'/tlpkg/tltcl/tclkit.exe') and
- lfs.isfile(TEXDIR..'/tlpkg/tltcl/gui_err.tcl') then
- os.spawn{TEXDIR..'/tlpkg/tltcl/tclkit.exe',
- TEXDIR..'/tlpkg/tltcl/gui_err.tcl'}
end
else
io.stderr:write(msg, '\n')