From 4f9cc3ca3991fea9396b4219951d9317e820cab8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 26 Feb 2023 22:10:41 +0000 Subject: initial attempts at supporting lmtx, which is not available on all platforms git-svn-id: svn://tug.org/texlive/trunk@66204 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 2 +- Master/texmf-dist/scripts/texlive/tlmgr.pl | 3 +-- Master/tlpkg/TeXLive/TLConfig.pm | 2 +- Master/tlpkg/TeXLive/TLPSRC.pm | 4 ++-- Master/tlpkg/tlpsrc/context.tlpsrc | 16 ++++++++++------ Master/tlpkg/tlpsrc/graphics.tlpsrc | 1 - Master/tlpkg/tlpsrc/stubs.tlpsrc | 1 - 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Master/install-tl b/Master/install-tl index 9921aa57ba1..e097435d780 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -1351,7 +1351,7 @@ operations might be disturbed.\n\n"; # luatex/context setup. if (exists($install{"context"}) && $install{"context"} == 1 - && -x "$plat_bindir/texlua$progext" + && -x "$plat_bindir/luametatex$progext" && !exists $ENV{"TEXLIVE_INSTALL_NO_CONTEXT_CACHE"}) { info("setting up ConTeXt cache: "); $errcount += run_postinst_cmd("mtxrun --generate"); diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index fc9997188fd..82b2012ac86 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -883,7 +883,6 @@ sub handle_execute_actions { my $status_file = TeXLive::TLUtils::tl_tmpfile(); my $fmtutil_args = "$common_fmtutil_args --status-file=$status_file"; - # if create_formats is false (NOT the default) we add --refresh so that # only existing formats are recreated if (!$localtlpdb->option("create_formats")) { @@ -894,7 +893,7 @@ sub handle_execute_actions { if ($::files_changed) { $errors += do_cmd_and_check("mktexlsr"); if (defined($localtlpdb->get_package('context')) - && (-x "$bindir/texlua" || -x "$bindir/texlua.exe")) { + && (-x "$bindir/luametatex" || -x "$bindir/luametatex.exe")) { $errors += do_cmd_and_check("mtxrun --generate"); $errors += do_cmd_and_check("context --luatex --generate"); } diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index 0bf24333a3c..4301c416821 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -257,7 +257,7 @@ our %TLPDBSettings = ( our $WindowsMainMenuName = "TeX Live $ReleaseYear"; # Comma-separated list of engines which do not exist on all platforms. -our $PartialEngineSupport = "luajithbtex,luajittex,mfluajit"; +our $PartialEngineSupport = "luametatex,luajithbtex,luajittex,mfluajit"; # Flags for error handling across the scripts and modules # all fine diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index dab1ade3e6a..bb48891709e 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -499,7 +499,7 @@ sub make_tlpobj { } # now @todoarchs contains only those archs for which we want # to match the pattern - foreach my $arch (@todoarchs) { + foreach my $arch (sort @todoarchs) { # get only those files matching the pattern my @archfiles = $tltree->get_matching_files('bin',$finalp, $pkgname, $arch); if (!@archfiles) { @@ -536,7 +536,7 @@ sub make_tlpobj { } # now @todoarchs contains only those archs for which we want # to match the pattern - foreach my $arch (@todoarchs) { + foreach my $arch (sort @todoarchs) { # get only those files matching the pattern my @archfiles = $tltree->get_matching_files('bin', $finalp, $pkgname, $arch); if (!@archfiles) { diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc index be0366c0108..043d14c949d 100644 --- a/Master/tlpkg/tlpsrc/context.tlpsrc +++ b/Master/tlpkg/tlpsrc/context.tlpsrc @@ -30,7 +30,6 @@ runpattern +d texmf-dist/tex/generic/context # See longdesc in mptopdf.tlpsrc runpattern +!d texmf-dist/tex/context/base/mkii runpattern +!f texmf-dist/scripts/context/perl/mptopdf.pl -runpattern +!f texmf-dist/scripts/context/stubs/mswin/mptopdf.exe runpattern +!f texmf-dist/tex/generic/context/mptopdf/mptopdf.tex docpattern +!f texmf-dist/doc/context/scripts/mkii/mptopdf.man #depend mptopdf - not anymore @@ -49,8 +48,13 @@ docpattern +f texmf-dist/doc/man/man1/context.* docpattern +f texmf-dist/doc/man/man1/mtx-* docpattern +f texmf-dist/doc/man/man1/mtxrun.* # -binpattern f bin/${ARCH}/context -binpattern f bin/${ARCH}/context.lua -binpattern f bin/${ARCH}/luametatex -binpattern f bin/${ARCH}/mtxrun -binpattern f bin/${ARCH}/mtxrun.lua +# Not all platforms provide this. +tlpsetvar no_lmtx_platforms \ + amd64-netbsd,i386-netbsd,i386-solaris,universal-darwin,\ +x86_64-cygwin,x86_64-darwinlegacy,x86_64-solaris +# +binpattern f/!${no_lmtx_platforms} bin/${ARCH}/context +binpattern f/!${no_lmtx_platforms} bin/${ARCH}/context.lua +binpattern f/!${no_lmtx_platforms} bin/${ARCH}/luametatex +binpattern f/!${no_lmtx_platforms} bin/${ARCH}/mtxrun +binpattern f/!${no_lmtx_platforms} bin/${ARCH}/mtxrun.lua diff --git a/Master/tlpkg/tlpsrc/graphics.tlpsrc b/Master/tlpkg/tlpsrc/graphics.tlpsrc index 98e8bc22f82..08dbc0adee7 100644 --- a/Master/tlpkg/tlpsrc/graphics.tlpsrc +++ b/Master/tlpkg/tlpsrc/graphics.tlpsrc @@ -1,6 +1,5 @@ catalogue latex-graphics # -runpattern +!d texmf-dist/scripts/context/ruby/graphics runpattern +!d texmf-dist/tex/latex-dev/graphics docpattern +!d texmf-dist/doc/latex-dev/graphics srcpattern +!d texmf-dist/source/latex-dev/graphics diff --git a/Master/tlpkg/tlpsrc/stubs.tlpsrc b/Master/tlpkg/tlpsrc/stubs.tlpsrc index 6576070254b..e69de29bb2d 100644 --- a/Master/tlpkg/tlpsrc/stubs.tlpsrc +++ b/Master/tlpkg/tlpsrc/stubs.tlpsrc @@ -1 +0,0 @@ -runpattern +!d texmf-dist/scripts/context/stubs -- cgit v1.2.3