l3build (17jul23)

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

7 files changed, 50 insertions, 42 deletions

diff --git a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
index 76b661e26c6..c2a9263b325 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
@@ -1,6 +1,6 @@
 --[[
 
-File l3build-arguments.lua Copyright (C) 2018-2021 The LaTeX Project
+File l3build-arguments.lua Copyright (C) 2018-2021,2023 The LaTeX Project
 
 It may be distributed and/or modified under the conditions of the
 LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -300,7 +300,7 @@ function check_engines(config)
     end
     for _, engine in pairs(options["engine"]) do
       if not t[engine] then
-        print("\n! Error: Engine \"" .. engine .. "\" not set up for testing with configuration " .. config .. "!")
+        print("\n! Error: Engine \"" .. engine .. "\" not set up for testing with configuration \"" .. config .. "\"!")
         print("\n  Valid values are:")
         for _, engine in ipairs(checkengines) do
           print("  - " .. engine)
diff --git a/Master/texmf-dist/scripts/l3build/l3build-aux.lua b/Master/texmf-dist/scripts/l3build/l3build-aux.lua
index 2f6902a7b02..5511802c160 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-aux.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-aux.lua
@@ -1,6 +1,6 @@
 --[[
 
-File l3build-aux.lua Copyright (C) 2018-2021 The LaTeX Project
+File l3build-aux.lua Copyright (C) 2018-2021,2023 The LaTeX Project
 
 It may be distributed and/or modified under the conditions of the
 LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -32,6 +32,8 @@ local print = print
 local lookup = kpse.lookup
 
 local os_time = os.time
+local os_type = os.type
+
 --
 -- Auxiliary functions which are used by more than one main function
 --
@@ -133,9 +135,9 @@ function call(modules, target, opts)
   for _, module in ipairs(modules) do
     local text
     if module == "." and opts["config"] and #opts["config"]>0 then
-      text = " with configuration " .. opts["config"][1]
+      text = " and configuration \"" .. opts["config"][1] .. "\""
     else
-      text = " for module " .. module
+      text = " for module \"" .. module .. "\""
     end
     print("Running l3build with target \"" .. target .. "\"" .. text )
     local error_level = run(
@@ -179,3 +181,30 @@ function localtexmf()
   end
   return paths
 end
+
+-- Run a command after setting up the environmental variables
+function runcmd(cmd,dir,vars)
+  dir = dir or "."
+  dir = abspath(dir)
+  vars = vars or {}
+  -- Allow for local texmf files
+  local env = ""
+  if not match(checkformat,"^context$")  then
+    env = os_setenv .. " TEXMFCNF=." .. os_pathsep .. os_concat
+  end
+  local envpaths = "." .. localtexmf() .. os_pathsep
+    .. abspath(localdir) .. os_pathsep
+    .. dir .. (typesetsearch and os_pathsep or "")
+  -- Deal with spaces in paths
+  if os_type == "windows" and match(envpaths," ") then
+    envpaths = gsub(envpaths,'"','')
+  end
+  for _,var in pairs(vars) do
+    if env ~= "" then
+      env = env .. os_setenv .. " " .. var .. "=" .. envpaths .. os_concat
+    else
+      env = os_setenv .. " " .. var .. "=" .. envpaths
+    end
+  end
+  return run(dir,set_epoch_cmd(epoch, forcedocepoch) .. env .. cmd)
+end
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index d7430b2f5d2..b1c33c6d56c 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -152,6 +152,9 @@ local function normalize_log(content,engine,errlevels)
     -- luaotfload files start with keywords
     line = gsub(line, "from " .. pattern .. "$", "from ../%1")
     line = gsub(line, ": " .. pattern .. "%)", ": ../%1)")
+    -- More luaotfload
+    line = gsub(line, "database loaded from " .. pattern .. "%)",
+      "database loaded from ../%1)")
     -- Deal with XeTeX specials
     if match(line, "^%.+\\XeTeX.?.?.?file") then
       line = gsub(line, pattern, "../%1")
diff --git a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
index 841c05571ae..d6ec0cd5139 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
@@ -1,6 +1,6 @@
 --[[
 
-File l3build-file-functions.lua Copyright (C) 2018-2022 The LaTeX Project
+File l3build-file-functions.lua Copyright (C) 2018-2023 The LaTeX Project
 
 It may be distributed and/or modified under the conditions of the
 LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -130,8 +130,6 @@ os_setenv  = "export"
 os_yes     = "printf 'y\\n%.0s' {1..300}"
 
 os_ascii   = "echo \"\""
-os_cmpexe  = getenv("cmpexe") or "cmp"
-os_cmpext  = getenv("cmpext") or ".cmp"
 os_diffext = getenv("diffext") or ".diff"
 os_diffexe = getenv("diffexe") or "diff -c --strip-trailing-cr"
 os_grepexe = "grep"
@@ -139,8 +137,6 @@ os_newline = "\n"
 
 if os_type == "windows" then
   os_ascii   = "@echo."
-  os_cmpexe  = getenv("cmpexe") or "fc /b"
-  os_cmpext  = getenv("cmpext") or ".cmp"
   os_concat  = "&"
   os_diffext = getenv("diffext") or ".fc"
   os_diffexe = getenv("diffexe") or "fc /n"
diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
index 2a7dbad510f..d0e491d4c59 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
@@ -1,6 +1,6 @@
 --[[
 
-File l3build-typesetting.lua Copyright (C) 2018-2021 The LaTeX Project
+File l3build-typesetting.lua Copyright (C) 2018-2021,2023 The LaTeX Project
 
 It may be distributed and/or modified under the conditions of the
 LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -31,37 +31,16 @@ local pairs  = pairs
 local print  = print
 
 local gsub  = string.gsub
-local match = string.match
 
 local os_type = os.type
 
--- An auxiliary used to set up the environmental variables
-function runcmd(cmd,dir,vars)
-  dir = dir or "."
-  dir = abspath(dir)
-  vars = vars or {}
-  -- Allow for local texmf files
-  local env = os_setenv .. " TEXMFCNF=." .. os_pathsep
-  local envpaths = "." .. localtexmf() .. os_pathsep
-    .. abspath(localdir) .. os_pathsep
-    .. dir .. (typesetsearch and os_pathsep or "")
-  -- Deal with spaces in paths
-  if os_type == "windows" and match(envpaths," ") then
-    envpaths = gsub(envpaths,'"','')
-  end
-  for _,var in pairs(vars) do
-    env = env .. os_concat .. os_setenv .. " " .. var .. "=" .. envpaths
-  end
-  return run(dir,set_epoch_cmd(epoch, forcedocepoch) .. env .. os_concat .. cmd)
-end
-
 function dvitopdf(name, dir, engine, hide)
   runcmd(
     set_epoch_cmd(epoch, forcecheckepoch) ..
     "dvips " .. name .. dviext
       .. (hide and (" > " .. os_null) or "")
       .. os_concat ..
-    "ps2pdf " .. ps2pdfopts .. name .. psext
+    "ps2pdf " .. ps2pdfopts .. " " .. name .. psext
       .. (hide and (" > " .. os_null) or ""),
     dir
   )
diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
index 576fb15e82d..5ee366c0582 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
@@ -117,15 +117,16 @@ checkengines = checkengines or {"pdftex", "xetex", "luatex"}
 checkformat  = checkformat  or "latex"
 specialformats = specialformats or { }
 specialformats.context = specialformats.context or {
-    luatex = {binary = "context", format = ""},
-    pdftex = {binary = "texexec", format = ""},
-    xetex  = {binary = "texexec", format = "", options = "--xetex"}
+    luametatex = {binary = "context", format = ""},
+    luatex     = {binary = "context", format = "", options = "--luatex"},
+    pdftex     = {binary = "texexec", format = ""},
+    xetex      = {binary = "texexec", format = "", options = "--xetex"}
   }
 specialformats.latex = specialformats.latex or { }
 specialformats.latex.etex = specialformats.latex.etex or
   {format = "latex"}
 specialformats.latex.ptex = specialformats.latex.ptex or
-   {binary = "eptex"}
+   {binary = "euptex"}
 specialformats.latex.uptex = specialformats.latex.uptex or
   {binary = "euptex"}
 if not string.find(status.banner,"2019") then
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index cefc59b905a..1124b9611f1 100755
--- a/Master/texmf-dist/scripts/l3build/l3build.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
 --]]
 
 -- Version information
-release_date = "2023-03-27"
+release_date = "2023-07-17"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")
@@ -147,7 +147,7 @@ if #checkconfigs > 1 then
     end
     if next(failed) then
       for _,config in ipairs(failed) do
-        print("Failed tests for configuration " .. config .. ":")
+        print("Failed tests for configuration \"" .. config .. "\":")
         print("\n  Check failed with difference files")
         local testdir = testdir
         if config ~= "build" then
@@ -167,8 +167,8 @@ if #checkconfigs > 1 then
           end
           local f = open(testdir .. "/.savecommands")
           if not f then
-            print("Error: Cannot find save commands for configuration " ..
-              config)
+            print("Error: Cannot find save commands for configuration \"" ..
+              config .. "\"")
             exit(2)
           end
           for line in f:lines() do
@@ -221,7 +221,7 @@ if #checkconfigs == 1 and
         testsuppdir = testfiledir .. "/support"
       end
     else
-      print("Error: Cannot find configuration " ..  configname .. ".lua")
+      print("Error: Cannot find configuration \"" ..  configname .. ".lua\"")
       exit(1)
     end
   end