From 29c6fa1753bcd3f219f1b63db4b31be72f9f6824 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 6 May 2018 21:43:48 +0000 Subject: l3build (6may18) git-svn-id: svn://tug.org/texlive/trunk@47629 c570f23f-e606-0410-a88d-b1316a301751 --- .../texlive/linked_scripts/l3build/l3build.lua | 2 +- Master/texmf-dist/doc/latex/l3build/README.md | 2 +- Master/texmf-dist/doc/latex/l3build/l3build.pdf | Bin 670076 -> 670759 bytes Master/texmf-dist/doc/man/man1/l3build.1 | 2 +- Master/texmf-dist/doc/man/man1/l3build.man1.pdf | Bin 15244 -> 15381 bytes .../texmf-dist/scripts/l3build/l3build-check.lua | 14 ++++++++------ .../scripts/l3build/l3build-file-functions.lua | 4 +--- .../scripts/l3build/l3build-variables.lua | 1 + Master/texmf-dist/scripts/l3build/l3build.lua | 2 +- Master/texmf-dist/source/latex/l3build/l3build.dtx | 9 +++++---- 10 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua index f4b09813b7d..8ce5e37d896 100644 --- a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua +++ b/Build/source/texk/texlive/linked_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") diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index f742f0e8061..810a2e3b5c5 100644 --- a/Master/texmf-dist/doc/latex/l3build/README.md +++ b/Master/texmf-dist/doc/latex/l3build/README.md @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX3 ================================================= -Release 2018-03-26 +Release 2018-05-06 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf index 4de012f7ad8..dc5c72f4252 100644 Binary files a/Master/texmf-dist/doc/latex/l3build/l3build.pdf and b/Master/texmf-dist/doc/latex/l3build/l3build.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1 index b5ffee615c2..c6525574cc4 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.1 +++ b/Master/texmf-dist/doc/man/man1/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2018-03-26" +.TH l3build 1 "2018-05-06" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf index faa659c5b7f..f0c77ad1b49 100644 Binary files a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf and b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf differ 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") diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index d9720642f43..eae219f8b2b 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -84,6 +84,7 @@ \luavarset{cleanfiles} {\{"*.log", "*.pdf", "*.zip"\}}{Files to delete when cleaning} \luavarset{demofiles} {\{\}}{Files which show how to use a module} \luavarset{docfiles} {\{\}}{Files which are part of the documentation but should not be typeset} +\luavarset{dynamicfiles} {\{ \}}{Secondary files to cleared before each test is run} \luavarset{excludefiles} {\{"*\string~"\}}{Files to ignore entirely (default for Emacs backup files)} \luavarset{installfiles} {\{"*.sty","*.cls"\}}{Files to install to the \texttt{text} area of the \texttt{texmf} tree} \luavarset{makeindexfiles} {\{"*.ist"\}}{MakeIndex files to be included in a TDS-style zip} @@ -216,7 +217,7 @@ % }^^A % } % -% \date{Released 2018-03-26} +% \date{Released 2018-05-06} % % \maketitle % \tableofcontents @@ -748,17 +749,17 @@ % \item Lines before the \cs{START}, after the \cs{END} and within % \cs{OMIT}/\cs{TIMO} blocks % \item Entirely blank lines, including those consisting only of spaces. -% \item Lines containing file dates in format -% \texttt{\meta{yyyy}/\meta{mm}/\meta{dd}}. % \item Lines starting \cs{openin} or \cs{openout}. % \end{itemize} % Modifications made in lines are: % \begin{itemize} % \item Removal spaces at the start of lines. % \item Removal of |./| at start of file names. +% \item Conversion of dates (YYYY-MM-DD or YYYY/MM/DD format) to the +% place-holder |YYYY-MM-DD| % \item Standardisation of the list of units known to \TeX{} (\pdfTeX{} % and \LuaTeX{} add a small number of additional units which are not -% known to \TeX90 or \XeTeX{}, (u)p\TeX{} adds some additoonal non-standard +% known to \TeX90 or \XeTeX{}, (u)p\TeX{} adds some additional non-standard % ones) % \item Standardisation of \verb*|\csname\endcsname | to |\csname\endcsname| % (the former is formally correct, but the latter was produced for many -- cgit v1.2.3