summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-05 22:22:31 +0000
committerKarl Berry <karl@freefriends.org>2020-03-05 22:22:31 +0000
commit080656471afa85d88226044ebd59a9d22529f8d0 (patch)
tree236db64054f2a4a27ab957a23c9db6634cea6201
parentab261ba95f775746985b4542c78c4492e405ffe5 (diff)
luahbtex now on all platforms
git-svn-id: svn://tug.org/texlive/trunk@54116 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl3
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm2
-rw-r--r--Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/luahbtex.tlpsrc12
4 files changed, 3 insertions, 19 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index c8a32fea1d7..e9dd0c43766 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -5716,7 +5716,6 @@ sub check_executes {
if (",$TeXLive::TLConfig::PartialEngineSupport," =~ /,$engine,/) {
# luajit[hb]tex is special since it is not available on all architectures
# 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/luajittex.tlpsrc is available, then load it
@@ -5728,8 +5727,6 @@ sub check_executes {
my $pkg;
if ($engine =~ /luajit(hb)?tex/) {
$pkg = "luajittex";
- } elsif ($engine eq "luahbtex") {
- $pkg = "luahbtex";
} elsif ($engine eq "mfluajit") {
$pkg = "mflua";
} else {
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index 3c01dd3bead..98867b23093 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -236,7 +236,7 @@ our %TLPDBSettings = (
our $WindowsMainMenuName = "TeX Live $ReleaseYear";
# Comma-separated list of engines which do not exist on all platforms.
-our $PartialEngineSupport = "luahbtex,luajithbtex,luajittex,mfluajit";
+our $PartialEngineSupport = "luajithbtex,luajittex,mfluajit";
# Flags for error handling across the scripts and modules
# all fine
diff --git a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
index 38221891f8a..dc1a9d675c8 100644
--- a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
@@ -44,7 +44,4 @@ execute AddFormat name=lualatex-dev engine=luahbtex \
options="lualatex.ini" \
fmttriggers=${fmtcomm},${luafmtdeps}
-# keep in sync with luahbtex.tlpsrc.
-tlpsetvar no_luahb_platforms i386-netbsd
-#
-binpattern f/!${no_luahb_platforms} bin/${ARCH}/lualatex-dev
+binpattern f bin/${ARCH}/lualatex-dev
diff --git a/Master/tlpkg/tlpsrc/luahbtex.tlpsrc b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
index 32f11681662..5fa845b259e 100644
--- a/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
@@ -1,18 +1,8 @@
category TLCore
shortdesc LuaTeX with HarfBuzz library for glyph shaping
-# Until TL'20, we only have this for auto-built platforms and Windows,
-# via /home/texlive/luahbtmp on tug.
-#
-# Keep in sync with latex-bin-dev.tlpsrc.
-tlpsetvar no_luahb_platforms i386-netbsd
-#
-binpattern f/!${no_luahb_platforms} bin/${ARCH}/luahbtex
+binpattern f bin/${ARCH}/luahbtex
-# For the TL'20 release, we should have luahbtex for all platforms.
-# For now, on platforms where there is no luahbtex, it will be ignored
-# due to the special --no-error-if-no-engine option in fmtutil,
-# invoked by specifications in TLConfig.pm and tlmgr.pl.
execute AddFormat name=luahbtex engine=luahbtex \
patterns=language.def,language.dat.lua \
options="luatex.ini" \