texlive[54001] Master: new luajithbtex engine (not on all platforms)

commits+karl at tug.org commits+karl at tug.org
Mon Mar 2 18:58:53 CET 2020


Revision: 54001
          http://tug.org/svn/texlive?view=revision&revision=54001
Author:   karl
Date:     2020-03-02 18:58:52 +0100 (Mon, 02 Mar 2020)
Log Message:
-----------
new luajithbtex engine (not on all platforms)

Modified Paths:
--------------
    trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
    trunk/Master/tlpkg/TeXLive/TLConfig.pm
    trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
    trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
    trunk/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
    trunk/Master/tlpkg/tlpsrc/luajittex.tlpsrc

Added Paths:
-----------
    trunk/Master/bin/amd64-freebsd/luajithbtex
    trunk/Master/bin/i386-freebsd/luajithbtex
    trunk/Master/bin/i386-linux/luajithbtex
    trunk/Master/bin/i386-solaris/luajithbtex
    trunk/Master/bin/x86_64-darwin/luajithbtex
    trunk/Master/bin/x86_64-darwinlegacy/luajithbtex
    trunk/Master/bin/x86_64-linux/luajithbtex
    trunk/Master/bin/x86_64-linuxmusl/luajithbtex
    trunk/Master/texmf-dist/doc/man/man1/luajithbtex.1
    trunk/Master/texmf-dist/doc/man/man1/luajithbtex.man1.pdf

Added: trunk/Master/bin/amd64-freebsd/luajithbtex
===================================================================
(Binary files differ)

Index: trunk/Master/bin/amd64-freebsd/luajithbtex
===================================================================
--- trunk/Master/bin/amd64-freebsd/luajithbtex	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/bin/amd64-freebsd/luajithbtex	2020-03-02 17:58:52 UTC (rev 54001)

Property changes on: trunk/Master/bin/amd64-freebsd/luajithbtex
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/bin/i386-freebsd/luajithbtex
===================================================================
(Binary files differ)

Index: trunk/Master/bin/i386-freebsd/luajithbtex
===================================================================
--- trunk/Master/bin/i386-freebsd/luajithbtex	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/bin/i386-freebsd/luajithbtex	2020-03-02 17:58:52 UTC (rev 54001)

Property changes on: trunk/Master/bin/i386-freebsd/luajithbtex
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/bin/i386-linux/luajithbtex
===================================================================
(Binary files differ)

Index: trunk/Master/bin/i386-linux/luajithbtex
===================================================================
--- trunk/Master/bin/i386-linux/luajithbtex	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/bin/i386-linux/luajithbtex	2020-03-02 17:58:52 UTC (rev 54001)

Property changes on: trunk/Master/bin/i386-linux/luajithbtex
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/bin/i386-solaris/luajithbtex
===================================================================
(Binary files differ)

Index: trunk/Master/bin/i386-solaris/luajithbtex
===================================================================
--- trunk/Master/bin/i386-solaris/luajithbtex	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/bin/i386-solaris/luajithbtex	2020-03-02 17:58:52 UTC (rev 54001)

Property changes on: trunk/Master/bin/i386-solaris/luajithbtex
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/bin/x86_64-darwin/luajithbtex
===================================================================
(Binary files differ)

Index: trunk/Master/bin/x86_64-darwin/luajithbtex
===================================================================
--- trunk/Master/bin/x86_64-darwin/luajithbtex	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/bin/x86_64-darwin/luajithbtex	2020-03-02 17:58:52 UTC (rev 54001)

Property changes on: trunk/Master/bin/x86_64-darwin/luajithbtex
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/bin/x86_64-darwinlegacy/luajithbtex
===================================================================
(Binary files differ)

Index: trunk/Master/bin/x86_64-darwinlegacy/luajithbtex
===================================================================
--- trunk/Master/bin/x86_64-darwinlegacy/luajithbtex	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/bin/x86_64-darwinlegacy/luajithbtex	2020-03-02 17:58:52 UTC (rev 54001)

Property changes on: trunk/Master/bin/x86_64-darwinlegacy/luajithbtex
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/bin/x86_64-linux/luajithbtex
===================================================================
(Binary files differ)

Index: trunk/Master/bin/x86_64-linux/luajithbtex
===================================================================
--- trunk/Master/bin/x86_64-linux/luajithbtex	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/bin/x86_64-linux/luajithbtex	2020-03-02 17:58:52 UTC (rev 54001)

Property changes on: trunk/Master/bin/x86_64-linux/luajithbtex
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/bin/x86_64-linuxmusl/luajithbtex
===================================================================
(Binary files differ)

Index: trunk/Master/bin/x86_64-linuxmusl/luajithbtex
===================================================================
--- trunk/Master/bin/x86_64-linuxmusl/luajithbtex	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/bin/x86_64-linuxmusl/luajithbtex	2020-03-02 17:58:52 UTC (rev 54001)

Property changes on: trunk/Master/bin/x86_64-linuxmusl/luajithbtex
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/man/man1/luajithbtex.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/luajithbtex.1	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/man/man1/luajithbtex.1	2020-03-02 17:58:52 UTC (rev 54001)
@@ -0,0 +1 @@
+.so man1/luatex.1


Property changes on: trunk/Master/texmf-dist/doc/man/man1/luajithbtex.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/man/man1/luajithbtex.man1.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/man/man1/luajithbtex.man1.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/luajithbtex.man1.pdf	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/texmf-dist/doc/man/man1/luajithbtex.man1.pdf	2020-03-02 17:58:52 UTC (rev 54001)

Property changes on: trunk/Master/texmf-dist/doc/man/man1/luajithbtex.man1.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2020-03-02 17:58:52 UTC (rev 54001)
@@ -5714,7 +5714,7 @@
     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 @@
       # * 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 @@
   # 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 interested in helping to pretest the new release (when
-pretests are available), please read https://tug.org/texlive/pretest.html.
+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.
+
 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!

Modified: trunk/Master/tlpkg/TeXLive/TLConfig.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLConfig.pm	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/tlpkg/TeXLive/TLConfig.pm	2020-03-02 17:58:52 UTC (rev 54001)
@@ -236,7 +236,7 @@
 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

Modified: trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc	2020-03-02 17:58:52 UTC (rev 54001)
@@ -19,10 +19,10 @@
 # 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 @@
 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,

Modified: trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc	2020-03-02 17:58:52 UTC (rev 54001)
@@ -46,6 +46,6 @@
 
 # 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

Modified: trunk/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/luahbtex.tlpsrc	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/tlpkg/tlpsrc/luahbtex.tlpsrc	2020-03-02 17:58:52 UTC (rev 54001)
@@ -4,9 +4,9 @@
 # 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
 

Modified: trunk/Master/tlpkg/tlpsrc/luajittex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/luajittex.tlpsrc	2020-03-02 17:29:15 UTC (rev 54000)
+++ trunk/Master/tlpkg/tlpsrc/luajittex.tlpsrc	2020-03-02 17:58:52 UTC (rev 54001)
@@ -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.



More information about the tex-live-commits mailing list.