diff options
author | Karl Berry <karl@freefriends.org> | 2018-05-06 21:43:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-05-06 21:43:48 +0000 |
commit | 29c6fa1753bcd3f219f1b63db4b31be72f9f6824 (patch) | |
tree | c4efc0b30238a68fc5e18df5273d1de618b02003 /Master/texmf-dist/scripts | |
parent | fb14462cfe35d61f907e883323450f54025fd11e (diff) |
l3build (6may18)
git-svn-id: svn://tug.org/texlive/trunk@47629 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
4 files changed, 11 insertions, 10 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index a51dafd07c7..0a0caa67c1d 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -89,15 +89,10 @@ local function formatlog(logfile, newfile, engine, errlevels) maxprintline = maxprintline + 1 -- Deal with an out-by-one error end local function killcheck(line) - -- Skip lines containing file dates - if match(line, "[^<]%d%d%d%d/%d%d/%d%d") - or match(line, "[^<]%d%d%d%d%-%d%d%-%d%d") then - return true - elseif -- Skip \openin/\openout lines in web2c 7.x -- As Lua doesn't allow "(in|out)", a slightly complex approach: -- do a substitution to check the line is exactly what is required! - match( + if match( gsub(line, "^\\openin", "\\openout"), "^\\openout%d%d? = " ) then return true @@ -138,6 +133,9 @@ local function formatlog(logfile, newfile, engine, errlevels) line = gsub(line, pattern, "../%1") end end + -- Print only 'place-marker' (ISO) dates + line = gsub(line, "%d%d%d%d%-%d%d%-%d%d", "YYYY-MM-DD") + line = gsub(line, "%d%d%d%d/%d%d/%d%d", "YYYY-MM-DD") -- Deal with the fact that "(.aux)" may have still a leading space line = gsub(line, "^ %(%.aux%)", "(.aux)") -- Merge all of .fd data into one line so will be removed later @@ -690,6 +688,10 @@ function runtest(name, engine, hide, ext, makepdf, breakout) break end end + -- Clean out any dynamic files + for _,filetype in pairs(dynamicfiles) do + rm(testdir,filetype) + end local errlevels = {} for i = 1, checkruns do errlevels[i] = run( diff --git a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua index a8c24356353..83b4bfb6539 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua @@ -283,9 +283,7 @@ function tree(path, glob) for _, file in ipairs(filelist(dir, pattern)) do local fullpath = path .. "/" .. file if file ~= "." and file ~= ".." and - fullpath ~= builddir and - (sub(pattern, 1, 1) == "." - or sub(file, 1, 1) ~= ".") + fullpath ~= builddir then local fulldir = dir .. "/" .. file if criterion(fulldir) then diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua index 4dbe06634cb..38be1c7c5ea 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua @@ -81,6 +81,7 @@ checksuppfiles = checksuppfiles or { } cleanfiles = cleanfiles or {"*.log", "*.pdf", "*.zip"} demofiles = demofiles or { } docfiles = docfiles or { } +dynamicfiles = dynamicfiles or { } excludefiles = excludefiles or {"*~"} installfiles = installfiles or {"*.sty","*.cls"} makeindexfiles = makeindexfiles or {"*.ist"} diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index f4b09813b7d..8ce5e37d896 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 = "2018-03-26" +release_date = "2018-05-06" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") |