[latex3-commits] [git/LaTeX3-latex3-luaotfload] dev: Handle new format engine mappings (b216523)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/luaotfload
On branch  : dev
Link       : https://github.com/latex3/luaotfload/commit/b216523df7c24e68256513a1100a8b106fec2968

>---------------------------------------------------------------

commit b216523df7c24e68256513a1100a8b106fec2968
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Thu Nov 14 19:08:49 2019 +0100

    Handle new format engine mappings


>---------------------------------------------------------------

b216523df7c24e68256513a1100a8b106fec2968
 build.lua  | 19 +++++++++++++------
 texlive.sh | 10 +---------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/build.lua b/build.lua
index 8230702..0b11452 100644
--- a/build.lua
+++ b/build.lua
@@ -71,14 +71,18 @@ local ismiktex = string.match (luatexstatus.banner,"MiKTeX")
 
 -- l3build check settings
 
+specialformats = specialformats or {}
+specialformats["latex-dev"] = specialformats["latex-dev"] or {
+    luahbtex = {format = "lualatex-dev"}
+  }
 local has_hbengine = os.execute(os.type == "unix"
                                   and "command -v luahbtex > /dev/null"
                                   or "where /q luahbtex") == 0 or nil
-stdengine    = "luatex"
-checkengines = {"luatex", has_hbengine and "luahbtex"}
-
 -- temporary for test dev branch
 if master_branch then
+stdengine    = "luatex"
+checkengines = {"luatex"}
+
 checkconfigs = {
                 "build",
                 "config-loader-unpackaged",
@@ -87,12 +91,15 @@ checkconfigs = {
                 "config-unicode-math",
                 "config-plain",
                 "config-fontspec",
-                has_hbengine and "config-harf",
                }
 else
+assert(has_hbengine, "luahbtex is required for latex-dev")
+stdengine    = "luahbtex"
+checkengines = {"luahbtex"}
+
 checkconfigs = {
                 "build",
-                has_hbengine and "config-harf",
+                "config-harf",
                }
 end
 checkruns = 3
@@ -124,7 +131,7 @@ docfiledir    = "./doc"
 -- documentation
 -------------------
 
-typesetexe = "luahblatex --fmt=luahb"..checkformat
+typesetexe = "luahbtex --fmt=lua"..checkformat
 
 -- main docu
 typesetfiles      = {"luaotfload-latex.tex"}
diff --git a/texlive.sh b/texlive.sh
index 73d6d3a..f28f505 100644
--- a/texlive.sh
+++ b/texlive.sh
@@ -19,18 +19,10 @@ if ! command -v texlua > /dev/null; then
   cd ..
 fi
 tlmgr update --self
-tlmgr pinning add tlcontrib 'luahbtex*'
-
-if ! tlmgr repository list | grep -q tlcontrib; then
-  # Add TL contrib
-  tlmgr repository add http://contrib.texlive.info/current tlcontrib
-fi
 
 (
 # Needed for any use of texlua even if not testing LuaTeX
-echo l3build latex latex-bin  luatex  latex-bin-dev
-
-echo luahbtex
+echo l3build latex latex-bin luatex latex-bin-dev
 
 # Required to build plain and LaTeX formats:
 # TeX90 plain for unpacking, pdfLaTeX, LuaLaTeX and XeTeX for tests