summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-10 21:39:27 +0000
committerKarl Berry <karl@freefriends.org>2018-05-10 21:39:27 +0000
commit8c6ec9147394790c16fc597649f905eac2fac3be (patch)
tree00b7ef4983ee6ac90f1d46e5af5ef4b8bcaddc10 /Master/texmf-dist/scripts/l3build
parentb598c4bc94f19b893aeae19d89750d57121bf2b5 (diff)
l3build (10may18)
git-svn-id: svn://tug.org/texlive/trunk@47669 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua10
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
2 files changed, 7 insertions, 5 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 0a0caa67c1d..442bd916814 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -89,10 +89,15 @@ 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!
- if match(
+ match(
gsub(line, "^\\openin", "\\openout"), "^\\openout%d%d? = "
) then
return true
@@ -133,9 +138,6 @@ 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
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 8ce5e37d896..1ded83cc5b6 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-05-06"
+release_date = "2018-05-10"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")