From 509b34215883ebf181d665743177ea82522fa13c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 24 Aug 2019 20:34:17 +0000 Subject: l3build (24aug19) git-svn-id: svn://tug.org/texlive/trunk@51950 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/scripts/l3build/l3build-check.lua | 4 ++++ Master/texmf-dist/scripts/l3build/l3build-typesetting.lua | 2 +- Master/texmf-dist/scripts/l3build/l3build-unpack.lua | 3 +++ Master/texmf-dist/scripts/l3build/l3build.lua | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) (limited to 'Master/texmf-dist/scripts/l3build') diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index e45d210e537..c05defc792c 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -715,6 +715,8 @@ function runtest(name, engine, hide, ext, pdfmode, breakout) for _,filetype in pairs(dynamicfiles) do rm(testdir,filetype) end + -- Ensure there is no stray .log file + rm(testdir,name .. logext) local errlevels = {} for i = 1, checkruns do errlevels[i] = run( @@ -723,6 +725,8 @@ function runtest(name, engine, hide, ext, pdfmode, breakout) -- avoids any paths in the logs os_setenv .. " TEXINPUTS=." .. (checksearch and os_pathsep or "") .. os_concat .. + os_setenv .. " LUAINPUTS=." .. (checksearch and os_pathsep or "") + .. os_concat .. -- Avoid spurious output from (u)pTeX os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0" .. os_concat .. diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua index 5133d081719..eb2974cdf2d 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua @@ -127,7 +127,7 @@ function tex(file,dir) local dir = dir or "." return runcmd(typesetexe .. " " .. typesetopts .. " \"" .. typesetcmds .. "\\input " .. file .. "\"", - dir,{"TEXINPUTS"}) + dir,{"TEXINPUTS","LUAINPUTS"}) end local function typesetpdf(file,dir) diff --git a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua index 9779502c2fc..89bbfaa17f6 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua @@ -85,6 +85,9 @@ bundleunpack = bundleunpack or function(sourcedirs, sources) unpackdir .. "/" .. path, os_setenv .. " TEXINPUTS=." .. os_pathsep .. localdir .. (unpacksearch and os_pathsep or "") .. + os_concat .. + os_setenv .. " LUAINPUTS=." .. os_pathsep + .. localdir .. (unpacksearch and os_pathsep or "") .. os_concat .. unpackexe .. " " .. unpackopts .. " " .. name .. " < " .. localdir .. "/yes" diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index f0965e07587..627778ef228 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 = "2019-07-31" +release_date = "2019-08-24" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") -- cgit v1.2.3