summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-26 21:48:49 +0000
committerKarl Berry <karl@freefriends.org>2019-09-26 21:48:49 +0000
commit8a294669f9624eae14a2acd6446a70745ce6452c (patch)
tree79f96e997fda87a7883c926e574113c06554dbf0 /Master/texmf-dist/scripts/l3build
parent5c8ba225e36daa34b72f01c4a5e1d65d2e69c359 (diff)
l3build (26sep19)
git-svn-id: svn://tug.org/texlive/trunk@52183 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua11
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-typesetting.lua5
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-variables.lua1
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua4
4 files changed, 17 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 8d1d58aee3e..731d4282eaa 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -721,14 +721,21 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
-- Ensure there is no stray .log file
rm(testdir,name .. logext)
local errlevels = {}
+ local localtexmf = ""
+ if texmfdir and texmfdir ~= "" then
+ localtexmf = os_pathsep .. abspath(texmfdir) .. "//"
+ end
+ local texmfdir = abspath(texmfdir) .. "//"
for i = 1, checkruns do
errlevels[i] = run(
testdir,
-- No use of localdir here as the files get copied to testdir:
-- avoids any paths in the logs
- os_setenv .. " TEXINPUTS=." .. (checksearch and os_pathsep or "")
+ os_setenv .. " TEXINPUTS=." .. localtexmf
+ .. (checksearch and os_pathsep or "")
.. os_concat ..
- os_setenv .. " LUAINPUTS=." .. (checksearch and os_pathsep or "")
+ os_setenv .. " LUAINPUTS=." .. localtexmf
+ .. (checksearch and os_pathsep or "")
.. os_concat ..
-- Avoid spurious output from (u)pTeX
os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0"
diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
index eb2974cdf2d..8e5b17bfc44 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
@@ -63,7 +63,12 @@ function runcmd(cmd,dir,vars)
local vars = vars or {}
-- Allow for local texmf files
local env = os_setenv .. " TEXMFCNF=." .. os_pathsep
+ local localtexmf = ""
+ if texmfdir and texmfdir ~= "" then
+ localtexmf = os_pathsep .. abspath(texmfdir) .. "//"
+ end
local envpaths = "." .. os_pathsep
+ .. localtexmf
.. abspath(localdir) .. os_pathsep
.. dir .. (typesetsearch and os_pathsep or "")
-- Deal with spaces in paths
diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
index 6eb0f378589..11186c0e3f9 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
@@ -46,6 +46,7 @@ sourcefiledir = sourcefiledir or currentdir
supportdir = supportdir or maindir .. "/support"
testfiledir = testfiledir or currentdir .. "/testfiles"
testsuppdir = testsuppdir or testfiledir .. "/support"
+texmfdir = texmfdir or maindir .. "/texmf"
-- Structure within a development area
builddir = builddir or maindir .. "/build"
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index c0eea6b33a9..e9b47f8357a 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-09-18"
+release_date = "2019-09-25"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
@@ -174,7 +174,7 @@ if options["target"] == "check" then
end
if #checkconfigs == 1 and
checkconfigs[1] ~= "build" and
- (options["target"] == "check" or options["target"] == "save") then
+ (options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then
local config = "./" .. gsub(checkconfigs[1],".lua$","") .. ".lua"
if fileexists(config) then
dofile(config)