summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-11-23 21:23:29 +0000
committerKarl Berry <karl@freefriends.org>2022-11-23 21:23:29 +0000
commit49b488c9862b0646f6b4a9bb235d85289a21c319 (patch)
tree40353080b5ab312c7a230ed9a68031e50fdfcc8d /Build
parentb31e443b3036b9c5a4050793fad66a6d14d47de1 (diff)
doc, sync
git-svn-id: svn://tug.org/texlive/trunk@65092 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/README3
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm11
-rwxr-xr-xBuild/source/texk/texlive/w32_wrapper/runscript.tlu18
3 files changed, 19 insertions, 13 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index 5da788773a0..e4b1359b6df 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -127,8 +127,7 @@ web2c - maintained here, by us - core web2c, plain tex, etc.
hitex - https://hint.userweb.mwn.de/hint/hitex.html
mflua[jit] - https://serveur-svn.lri.fr/svn/modhel/mflua
also: http://www.luatex.org/download.html
- mplibdir - http://tug.org/metapost/
- also: http://www.luatex.org/download.html
+ mplibdir - https://tug.org/metapost/
luatex - http://luatex.org/
pdftex - http://pdftex.org/
[u]pmpost - nothing current, see README for old info
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index e828363bed4..12130936c64 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: 63645 $';
+my $svnrev = '$Revision: 64503 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -145,10 +145,11 @@ BEGIN {
@::ddebug_hook = @::ddebug_hook;
@::dddebug_hook = @::dddebug_hook;
@::info_hook = @::info_hook;
+ @::install_packages_hook = @::install_packages_hook;
+ @::installation_failed_packages = @::installation_failed_packages;
@::warn_hook = @::warn_hook;
$::checksum_method = $::checksum_method;
$::gui_mode = $::gui_mode;
- @::install_packages_hook = @::install_packages_hook;
$::machinereadable = $::machinereadable;
$::no_execute_actions = $::no_execute_actions;
$::regenerate_all_formats = $::regenerate_all_formats;
@@ -3711,8 +3712,8 @@ package.
=cut
sub debug {
- my $str = "D:" . join("", @_);
return if ($::opt_verbosity < 1);
+ my $str = "D:" . join("", @_);
logit(\*STDERR, 1, $str);
for my $i (@::debug_hook) {
&{$i}($str);
@@ -3732,8 +3733,8 @@ each package, in addition to the first level.
=cut
sub ddebug {
- my $str = "DD:" . join("", @_);
return if ($::opt_verbosity < 2);
+ my $str = "DD:" . join("", @_);
logit(\*STDERR, 2, $str);
for my $i (@::ddebug_hook) {
&{$i}($str);
@@ -3756,8 +3757,8 @@ debugging those parts of the code, it just gets in the way.
=cut
sub dddebug {
- my $str = "DDD:" . join("", @_);
return if ($::opt_verbosity < 3);
+ my $str = "DDD:" . join("", @_);
logit(\*STDERR, 3, $str);
for my $i (@::dddebug_hook) {
&{$i}($str);
diff --git a/Build/source/texk/texlive/w32_wrapper/runscript.tlu b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
index 55781840ac6..53c332f06de 100755
--- a/Build/source/texk/texlive/w32_wrapper/runscript.tlu
+++ b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
@@ -1,7 +1,7 @@
-local svnrevision = string.match("$Revision: 59060 $", "%d+") or "0"
-local svndate = string.match("$Date: 2021-05-03 05:50:12 +0200 (Mon, 03 May 2021) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 64296 $", "%d+") or "0"
+local svndate = string.match("$Date: 2022-09-05 21:26:00 +0200 (Mon, 05 Sep 2022) $", "[-%d]+") or "2009-12-04"
local bannerstr = "runscript wrapper utility (rev. " ..
svnrevision .. ", " .. svndate .. ")\n" ..
"usage: runscript script-name [arguments]\n" ..
@@ -712,12 +712,18 @@ else
..TEXDIR..'/tlpkg/tlgs/Resource;'
..TEXDIR..'/tlpkg/tlgs/kanji;'
..os.getenv('WINDIR')..'/Fonts;'..TEXMFDIST..'/fonts')
- os.setenv('GS_DLL', TEXDIR..'/tlpkg/tlgs/bin/gsdll32.dll')
- GSEXE = TEXDIR..'/tlpkg/tlgs/bin/gswin32c.exe'
- GSNAME = 'gswin32c.exe'
- GSDIR = TEXDIR..'/tlpkg/tlgs/bin'
+ if is_64bit_windows_os() then
+ os.setenv('GS_DLL', TEXDIR..'/tlpkg/tlgs/bin/gsdll64.dll')
+ GSEXE = TEXDIR..'/tlpkg/tlgs/bin/gswin64c.exe'
+ GSNAME = 'gswin64c.exe'
+ else
+ os.setenv('GS_DLL', TEXDIR..'/tlpkg/tlgs/bin/gsdll32.dll')
+ GSEXE = TEXDIR..'/tlpkg/tlgs/bin/gswin32c.exe'
+ GSNAME = 'gswin32c.exe'
+ end
end
-- now setup the path so that the gs program will be found
+GSDIR = TEXDIR..'/tlpkg/tlgs/bin'
PATH = prepend_path(PATH, GSDIR, BINDIR)
os.setenv('PATH', PATH);