first attempt at luahbtex as engine for lualatex-dev, per latex request

git-svn-id: svn://tug.org/texlive/trunk@52744 c570f23f-e606-0410-a88d-b1316a301751

19 files changed, 14 insertions, 9 deletions

diff --git a/Master/bin/aarch64-linux/lualatex-dev b/Master/bin/aarch64-linux/lualatex-dev
deleted file mode 120000
index 582205a3e08..00000000000
--- a/Master/bin/aarch64-linux/lualatex-dev
+++ /dev/null
@@ -1 +0,0 @@
-lualatex
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/luahbtex b/Master/bin/amd64-freebsd/luahbtex
new file mode 100755
index 00000000000..07a050cbf33
--- /dev/null
+++ b/Master/bin/amd64-freebsd/luahbtex
diff --git a/Master/bin/amd64-netbsd/lualatex-dev b/Master/bin/amd64-netbsd/lualatex-dev
deleted file mode 120000
index 582205a3e08..00000000000
--- a/Master/bin/amd64-netbsd/lualatex-dev
+++ /dev/null
@@ -1 +0,0 @@
-lualatex
\ No newline at end of file
diff --git a/Master/bin/armhf-linux/lualatex-dev b/Master/bin/armhf-linux/lualatex-dev
deleted file mode 120000
index 582205a3e08..00000000000
--- a/Master/bin/armhf-linux/lualatex-dev
+++ /dev/null
@@ -1 +0,0 @@
-lualatex
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/lualatex-dev b/Master/bin/i386-cygwin/lualatex-dev
deleted file mode 120000
index 582205a3e08..00000000000
--- a/Master/bin/i386-cygwin/lualatex-dev
+++ /dev/null
@@ -1 +0,0 @@
-lualatex
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/luahbtex b/Master/bin/i386-freebsd/luahbtex
new file mode 100755
index 00000000000..7529b7147d4
--- /dev/null
+++ b/Master/bin/i386-freebsd/luahbtex
diff --git a/Master/bin/i386-linux/luahbtex b/Master/bin/i386-linux/luahbtex
new file mode 100755
index 00000000000..53f1876e7ee
--- /dev/null
+++ b/Master/bin/i386-linux/luahbtex
diff --git a/Master/bin/i386-netbsd/lualatex-dev b/Master/bin/i386-netbsd/lualatex-dev
deleted file mode 120000
index 582205a3e08..00000000000
--- a/Master/bin/i386-netbsd/lualatex-dev
+++ /dev/null
@@ -1 +0,0 @@
-lualatex
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/luahbtex b/Master/bin/i386-solaris/luahbtex
new file mode 100755
index 00000000000..857f4d3ec27
--- /dev/null
+++ b/Master/bin/i386-solaris/luahbtex
diff --git a/Master/bin/win32/luahbtex.dll b/Master/bin/win32/luahbtex.dll
new file mode 100644
index 00000000000..bda62a1dc1e
--- /dev/null
+++ b/Master/bin/win32/luahbtex.dll
diff --git a/Master/bin/win32/luahbtex.exe b/Master/bin/win32/luahbtex.exe
new file mode 100755
index 00000000000..fecf31c7d06
--- /dev/null
+++ b/Master/bin/win32/luahbtex.exe
diff --git a/Master/bin/x86_64-cygwin/lualatex-dev b/Master/bin/x86_64-cygwin/lualatex-dev
deleted file mode 120000
index 582205a3e08..00000000000
--- a/Master/bin/x86_64-cygwin/lualatex-dev
+++ /dev/null
@@ -1 +0,0 @@
-lualatex
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/luahbtex b/Master/bin/x86_64-darwin/luahbtex
new file mode 100755
index 00000000000..b0a6f1e4a79
--- /dev/null
+++ b/Master/bin/x86_64-darwin/luahbtex
diff --git a/Master/bin/x86_64-darwinlegacy/luahbtex b/Master/bin/x86_64-darwinlegacy/luahbtex
new file mode 100755
index 00000000000..b0a6f1e4a79
--- /dev/null
+++ b/Master/bin/x86_64-darwinlegacy/luahbtex
diff --git a/Master/bin/x86_64-linux/luahbtex b/Master/bin/x86_64-linux/luahbtex
new file mode 100755
index 00000000000..630b08ddc1d
--- /dev/null
+++ b/Master/bin/x86_64-linux/luahbtex
diff --git a/Master/bin/x86_64-linuxmusl/luahbtex b/Master/bin/x86_64-linuxmusl/luahbtex
new file mode 100755
index 00000000000..78f1d3e6380
--- /dev/null
+++ b/Master/bin/x86_64-linuxmusl/luahbtex
diff --git a/Master/bin/x86_64-solaris/luahbtex b/Master/bin/x86_64-solaris/luahbtex
new file mode 100755
index 00000000000..130d0c33dd6
--- /dev/null
+++ b/Master/bin/x86_64-solaris/luahbtex
diff --git a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
index 7f333ab0ebe..fb4df95bf3a 100644
--- a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
@@ -32,10 +32,20 @@ execute AddFormat name=dvilualatex-dev engine=luatex \
           options="dvilualatex.ini" \
           fmttriggers=${fmtcomm},${luafmtdeps}
 #
-binpattern f bin/${ARCH}/lualatex-dev
-execute AddFormat name=lualatex-dev engine=luatex \
+# binpattern below.
+execute AddFormat name=lualatex-dev engine=luahbtex \
           patterns=language.dat,language.dat.lua \
           options="lualatex.ini" \
           fmttriggers=${fmtcomm},${luafmtdeps}
 
 docpattern f texmf-dist/doc/man/man1/latex-dev.*
+
+# before the TL'20 release, let's include luahbtex here.
+# We only have it for auto-built platforms and Windows,
+# via /home/texlive/luahbtmp on tug.
+#
+tlpsetvar no_luahb_platforms \
+  aarch64-linux,amd64-netbsd,armhf-linux,i386-cygwin,i386-netbsd,x86_64-cygwin
+#
+binpattern f/!${no_luahb_platforms} bin/${ARCH}/luahbtex
+binpattern f/!${no_luahb_platforms} bin/${ARCH}/lualatex-dev
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index f65f8e0d426..26697d9696e 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -12,7 +12,8 @@ execute AddFormat name=dviluatex engine=luatex options="dviluatex.ini" \
   fmttriggers=${fmtdeps}
 #
 # On platforms where there is no luajittex, it will be ignored
-# due to special options in fmtutil, TLConfig.pm, tlmgr.
+# due to the special --no-error-if-no-engine option in fmtutil,
+# invoked by specifications in TLConfig.pm and tlmgr.pl.
 execute AddFormat name=luajittex engine=luajittex options="luatex.ini" \
   patterns=language.def,language.dat.lua \
   fmttriggers=${fmtdeps}