summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-16 21:35:01 +0000
committerKarl Berry <karl@freefriends.org>2023-02-16 21:35:01 +0000
commit1538cbdea74c4293bdab159355aff01352830ae6 (patch)
tree66874e3d48381a7f75e812af5b29f2b52deae1ef /Master/texmf-dist/scripts/l3build
parent56382445de8a6a31771c01a758ee6eddfd332233 (diff)
l3build (16feb23)
git-svn-id: svn://tug.org/texlive/trunk@65852 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua19
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-manifest.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-typesetting.lua23
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
4 files changed, 20 insertions, 26 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 7b3191aa204..d6d68086bcc 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-check.lua Copyright (C) 2018-2022 The LaTeX Project
+File l3build-check.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
@@ -126,8 +126,8 @@ local function normalize_log(content,engine,errlevels)
-- Zap line numbers from \show, \showbox, \box_show and the like:
-- do this before wrapping lines
line = gsub(line, "^l%.%d+ ", "l. ...")
- -- Also from lua stack traces.
- line = gsub(line, "lua:%d+: in function", "lua:...: in function")
+ -- Also from Lua stack traces
+ line = gsub(line, "lua:%d+:", "lua:...:")
-- Allow for wrapped lines: preserve the content and wrap
-- Skip lines that have an explicit marker for truncation
if len(line) == maxprintline and
@@ -778,8 +778,7 @@ function runtest(name, engine, hide, ext, test_type, breakout)
rmfile(testdir,name .. logext)
local errlevels = {}
for i = 1, checkruns do
- errlevels[i] = run(
- testdir,
+ errlevels[i] = runcmd(
-- No use of localdir here as the files get copied to testdir:
-- avoids any paths in the logs
os_setenv .. " TEXINPUTS=." .. localtexmf()
@@ -788,13 +787,6 @@ function runtest(name, engine, hide, ext, test_type, breakout)
os_setenv .. " LUAINPUTS=." .. localtexmf()
.. (checksearch and os_pathsep or "")
.. os_concat ..
- -- Avoid spurious output from (u)pTeX
- os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0"
- .. os_concat ..
- -- Allow for local texmf files
- os_setenv .. " TEXMFCNF=." .. os_pathsep
- .. os_concat ..
- set_epoch_cmd(epoch, forcecheckepoch) ..
-- Ensure lines are of a known length
os_setenv .. " max_print_line=" .. maxprintline
.. os_concat ..
@@ -803,7 +795,8 @@ function runtest(name, engine, hide, ext, test_type, breakout)
.. setup(lvtfile)
.. (hide and (" > " .. os_null) or "")
.. os_concat ..
- runtest_tasks(jobname(lvtfile),i)
+ runtest_tasks(jobname(lvtfile),i),
+ testdir
)
-- Break the loop if the result is stable
if breakout and i < checkruns then
diff --git a/Master/texmf-dist/scripts/l3build/l3build-manifest.lua b/Master/texmf-dist/scripts/l3build/l3build-manifest.lua
index 8f3e5ef4217..5642c91c432 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-manifest.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-manifest.lua
@@ -58,6 +58,8 @@ function manifest()
printline = "Manifest written to " .. manifestfile
print((printline:gsub(".","*"))) print(printline) print((printline:gsub(".","*")))
+ return 0
+
end
--[[
diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
index c173b2593b1..7f5327b5a26 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
@@ -35,18 +35,6 @@ local match = string.match
local os_type = os.type
-function dvitopdf(name, dir, engine, hide)
- run(
- dir,
- set_epoch_cmd(epoch, forcecheckepoch) ..
- "dvips " .. name .. dviext
- .. (hide and (" > " .. os_null) or "")
- .. os_concat ..
- "ps2pdf " .. ps2pdfopt .. name .. psext
- .. (hide and (" > " .. os_null) or "")
- )
-end
-
-- An auxiliary used to set up the environmental variables
function runcmd(cmd,dir,vars)
dir = dir or "."
@@ -67,6 +55,17 @@ function runcmd(cmd,dir,vars)
return run(dir,set_epoch_cmd(epoch, forcedocepoch) .. env .. os_concat .. cmd)
end
+function dvitopdf(name, dir, engine, hide)
+ runcmd(
+ "dvips " .. name .. dviext
+ .. (hide and (" > " .. os_null) or "")
+ .. os_concat ..
+ "ps2pdf " .. ps2pdfopt .. name .. psext
+ .. (hide and (" > " .. os_null) or ""),
+ dir
+ )
+end
+
function biber(name,dir)
if fileexists(dir .. "/" .. name .. ".bcf") then
return
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index d0657cfd702..110d3947720 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 = "2022-11-10"
+release_date = "2023-02-16"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")