diff options
| -rwxr-xr-x | Master/bin/amd64-freebsd/luajithbtex | bin | 0 -> 8207616 bytes | |||
| -rwxr-xr-x | Master/bin/i386-freebsd/luajithbtex | bin | 0 -> 7178572 bytes | |||
| -rwxr-xr-x | Master/bin/i386-linux/luajithbtex | bin | 0 -> 8306424 bytes | |||
| -rwxr-xr-x | Master/bin/i386-solaris/luajithbtex | bin | 0 -> 7181616 bytes | |||
| -rwxr-xr-x | Master/bin/x86_64-darwin/luajithbtex | bin | 0 -> 7760288 bytes | |||
| -rwxr-xr-x | Master/bin/x86_64-darwinlegacy/luajithbtex | bin | 0 -> 6938360 bytes | |||
| -rwxr-xr-x | Master/bin/x86_64-linux/luajithbtex | bin | 0 -> 7873896 bytes | |||
| -rwxr-xr-x | Master/bin/x86_64-linuxmusl/luajithbtex | bin | 0 -> 8768176 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/man/man1/luajithbtex.1 | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/man/man1/luajithbtex.man1.pdf | bin | 0 -> 34948 bytes | |||
| -rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 14 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLConfig.pm | 2 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc | 10 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc | 2 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/luahbtex.tlpsrc | 4 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/luajittex.tlpsrc | 15 |
16 files changed, 32 insertions, 16 deletions
diff --git a/Master/bin/amd64-freebsd/luajithbtex b/Master/bin/amd64-freebsd/luajithbtex Binary files differnew file mode 100755 index 00000000000..5b1242c2244 --- /dev/null +++ b/Master/bin/amd64-freebsd/luajithbtex diff --git a/Master/bin/i386-freebsd/luajithbtex b/Master/bin/i386-freebsd/luajithbtex Binary files differnew file mode 100755 index 00000000000..e222c751be8 --- /dev/null +++ b/Master/bin/i386-freebsd/luajithbtex diff --git a/Master/bin/i386-linux/luajithbtex b/Master/bin/i386-linux/luajithbtex Binary files differnew file mode 100755 index 00000000000..ccd9a0a8715 --- /dev/null +++ b/Master/bin/i386-linux/luajithbtex diff --git a/Master/bin/i386-solaris/luajithbtex b/Master/bin/i386-solaris/luajithbtex Binary files differnew file mode 100755 index 00000000000..ed5beecd3e0 --- /dev/null +++ b/Master/bin/i386-solaris/luajithbtex diff --git a/Master/bin/x86_64-darwin/luajithbtex b/Master/bin/x86_64-darwin/luajithbtex Binary files differnew file mode 100755 index 00000000000..f87c79ec2fe --- /dev/null +++ b/Master/bin/x86_64-darwin/luajithbtex diff --git a/Master/bin/x86_64-darwinlegacy/luajithbtex b/Master/bin/x86_64-darwinlegacy/luajithbtex Binary files differnew file mode 100755 index 00000000000..da51a2b767e --- /dev/null +++ b/Master/bin/x86_64-darwinlegacy/luajithbtex diff --git a/Master/bin/x86_64-linux/luajithbtex b/Master/bin/x86_64-linux/luajithbtex Binary files differnew file mode 100755 index 00000000000..53120ee7e67 --- /dev/null +++ b/Master/bin/x86_64-linux/luajithbtex diff --git a/Master/bin/x86_64-linuxmusl/luajithbtex b/Master/bin/x86_64-linuxmusl/luajithbtex Binary files differnew file mode 100755 index 00000000000..fd5073e7539 --- /dev/null +++ b/Master/bin/x86_64-linuxmusl/luajithbtex diff --git a/Master/texmf-dist/doc/man/man1/luajithbtex.1 b/Master/texmf-dist/doc/man/man1/luajithbtex.1 new file mode 100644 index 00000000000..0dbf6fb682e --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/luajithbtex.1 @@ -0,0 +1 @@ +.so man1/luatex.1 diff --git a/Master/texmf-dist/doc/man/man1/luajithbtex.man1.pdf b/Master/texmf-dist/doc/man/man1/luajithbtex.man1.pdf Binary files differnew file mode 100644 index 00000000000..fc44049be7f --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/luajithbtex.man1.pdf diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index afc483458ed..eca26a6f284 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -5714,7 +5714,7 @@ sub check_executes { next if ($name eq "cont-en"); # too confusing # we check that the name exist in bin/$arch if (",$TeXLive::TLConfig::PartialEngineSupport," =~ /,$engine,/) { - # luajittex is special since it is not available on all architectures + # 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. # @@ -5726,7 +5726,7 @@ sub check_executes { # * if tlpkg/tlpsrc/<engine>.tlpsrc is *not* available (i.e., not # the development tree) we just ignore it completely. my $pkg; - if ($engine eq "luajittex") { + if ($engine =~ /luajit(hb)?tex/) { $pkg = "luajittex"; } elsif ($engine eq "luahbtex") { $pkg = "luahbtex"; @@ -7144,11 +7144,13 @@ and the repository are not compatible: # check for being frozen if ($remotetlpdb->config_frozen) { my $frozen_msg = <<FROZEN; -TeX Live $TeXLive::TLConfig::ReleaseYear is frozen forever and will no -longer be updated. This happens in preparation for a new release. +TeX Live $TeXLive::TLConfig::ReleaseYear is frozen and will no longer +be routinely updated. This happens in preparation for a new release. + +If you're willing to help with pretesting the new release, and we hope +you are, (when pretests are available), please read +https://tug.org/texlive/pretest.html. -If you're interested in helping to pretest the new release (when -pretests are available), please read https://tug.org/texlive/pretest.html. Otherwise, just wait, and the new release will be ready in due time. FROZEN # don't die here, we want to allow updates even if tlnet is frozen! diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index b9e339cdd3e..3c01dd3bead 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,luajittex,mfluajit"; +our $PartialEngineSupport = "luahbtex,luajithbtex,luajittex,mfluajit"; # Flags for error handling across the scripts and modules # all fine diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc index 0b8975f87e0..e2cc8436b72 100644 --- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc @@ -19,10 +19,10 @@ longdesc See the TeXLive::TLPSRC documentation for more. # After the TL 2020 release, there should be more commonalities between # latex-bin and latex-bin-dev that we can add here. # -# l3backend is not actually included in the .fmt (by design), but it is -# used by the l3kernel code that is in the .fmt. It seems safer in -# practice to just be sure we rebuild the fmt and have it (l3backend) as -# an implicit dependency by listing it here. +# l3backend is not actually read when the .fmt is made (by design), but +# it is used by the l3kernel code that is in the .fmt. It seems safer in +# practice to just be sure we rebuild the fmt as needed, and have it +# (l3backend) as an implicit dependency, by listing it here. # # tex-ini-files is not used by the e(u)ptex-based formats or eplain, but # it seems too painful to exclude it here and thus have to include it @@ -43,7 +43,7 @@ tlpsetvar global_luatex_deps cm,etex,hyphen-base,knuth-lib,plain,\ tex-ini-files,unicode-data # # Platforms that don't support jit. -tlpsetvar global_no_luajit_platforms x86_64-darwinlegay,x86_64-solaris +tlpsetvar global_no_luajit_platforms x86_64-solaris # # We define the Windows platform names here, so we can use ${wndws} in # the patterns, in preparation for supporting w64 in addition to w32, diff --git a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc index f6d96f53322..745b707e5a1 100644 --- a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc @@ -46,6 +46,6 @@ execute AddFormat name=lualatex-dev engine=luahbtex \ # keep in sync with luahbtex.tlpsrc. tlpsetvar no_luahb_platforms \ - amd64-netbsd,armhf-linux,i386-cygwin,i386-netbsd,x86_64-cygwin + armhf-linux,i386-cygwin,i386-netbsd,x86_64-cygwin # binpattern f/!${no_luahb_platforms} bin/${ARCH}/lualatex-dev diff --git a/Master/tlpkg/tlpsrc/luahbtex.tlpsrc b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc index 07dfd2734c3..04b31edef18 100644 --- a/Master/tlpkg/tlpsrc/luahbtex.tlpsrc +++ b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc @@ -4,9 +4,9 @@ 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 +# Keep in sync with latex-bin-dev.tlpsrc. tlpsetvar no_luahb_platforms \ - amd64-netbsd,armhf-linux,i386-cygwin,i386-netbsd,x86_64-cygwin + armhf-linux,i386-cygwin,i386-netbsd,x86_64-cygwin # binpattern f/!${no_luahb_platforms} bin/${ARCH}/luahbtex diff --git a/Master/tlpkg/tlpsrc/luajittex.tlpsrc b/Master/tlpkg/tlpsrc/luajittex.tlpsrc index 87558d84039..98a293eaf6a 100644 --- a/Master/tlpkg/tlpsrc/luajittex.tlpsrc +++ b/Master/tlpkg/tlpsrc/luajittex.tlpsrc @@ -1,19 +1,32 @@ category TLCore -shortdesc LuaTeX with just-in-time (jit) compiler +shortdesc LuaTeX with just-in-time (jit) compiler, with and without HarfBuzz # must keep in sync with mflua.tlpsrc. tlpsetvar no_luajit_platforms x86_64-solaris # +# this should become redundant with no_luajit_platforms after all the +# 2020 builds are in. +tlpsetvar no_luajithb_platforms \ +armhf-linux,i386-cygwin,i386-netbsd,x86_64-cywin,x86_64-solaris +# +# Two engines plus texlua* links. binpattern f/!${no_luajit_platforms} bin/${ARCH}/luajittex binpattern f/!${no_luajit_platforms} bin/${ARCH}/texluajit binpattern f/!${no_luajit_platforms} bin/${ARCH}/texluajitc +binpattern f/!${no_luajithb_platforms} bin/${ARCH}/luajithbtex # +# Windows has additional .dll files as usual. The .exe are matched above. binpattern f bin/win32/luajit51.dll binpattern f bin/win32/luajittex.dll +binpattern f bin/win32/luajithbtex.dll # binpattern f/i386-cygwin bin/i386-cygwin/cygtexluajit*.dll binpattern f/x86_64-cygwin bin/x86_64-cygwin/cygtexluajit*.dll +# luajittex.1 (non-hb) is matched by the package name, so no need to +# mention that explicitly. +docpattern +f texmf-dist/doc/man/man1/luajithbtex.* + # On platforms where there is no luajittex, 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. |