diff options
| -rw-r--r-- | Build/source/texk/texlive/linked_scripts/l3build/l3build.lua | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/l3build/CHANGELOG.md | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/l3build/README.md | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/l3build/l3build.pdf | bin | 672061 -> 672068 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/man/man1/l3build.1 | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/man/man1/l3build.man1.pdf | bin | 15200 -> 15261 bytes | |||
| -rw-r--r-- | Master/texmf-dist/scripts/l3build/l3build-check.lua | 40 | ||||
| -rw-r--r-- | Master/texmf-dist/scripts/l3build/l3build-clean.lua | 2 | ||||
| -rwxr-xr-x | Master/texmf-dist/scripts/l3build/l3build.lua | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/l3build/l3build.dtx | 16 |
10 files changed, 49 insertions, 29 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua index 1ece096e7f3..d97fecd8298 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-08-07" +release_date = "2018-09-21" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index d168f93fccb..5b760755937 100644 --- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md @@ -7,6 +7,15 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2018-09-21] + +### Changed + +- Normalise date lines to contain "...-..-.." rather than removing + (including normalising version data in such lines): note that + `.tlg` file updates may be required after this change +- Explicitly exclude `.fd` file lines + ## [2018-08-07] ### Changed @@ -150,7 +159,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX3 kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2018-08-04...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2018-09-21...HEAD +[2018-09-21]: https://github.com/latex3/l3build/compare/2018-08-07...2018-09-21 [2018-08-07]: https://github.com/latex3/l3build/compare/2018-08-04...2018-08-07 [2018-08-04]: https://github.com/latex3/l3build/compare/2018-08-02...2018-08-04 [2018-08-02]: https://github.com/latex3/l3build/compare/2018-05-10...2018-08-02 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index 5204d281726..fcb8a9c471e 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-08-07 +Release 2018-09-21 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf Binary files differindex 39f6ab8785a..36dd4564708 100644 --- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf +++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1 index 653d7c0e0a6..d02772c505c 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-08-07" +.TH l3build 1 "2018-09-21" .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 Binary files differindex 1607dd45f1f..b18393cac51 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index de01514d5a9..e59f6ca7e54 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -102,23 +102,23 @@ local function normalize_log(content,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( - gsub(line, "^\\openin", "\\openout"), "^\\openout%d%d? = " - ) then - return true - end + if match(gsub(line, "^\\openin", "\\openout"), "^\\openout%d%d? = ") then + return true + end return false end -- Substitutions to remove some non-useful changes - local function normalize(line, lastline) + local function normalize(line,lastline,drop_fd) + if drop_fd then + if match(line," *%)") then + return "","" + else + return "","",true + end + end -- Zap line numbers from \show, \showbox, \box_show and the like: -- do this before wrapping lines line = gsub(line, "^l%.%d+ ", "l. ...") @@ -151,12 +151,16 @@ local function normalize_log(content,engine,errlevels) line = gsub(line, pattern, "../%1") end end + -- Deal with dates + if match(line, "[^<]%d%d%d%d[/%-]%d%d[/%-]%d%d") then + line = gsub(line,"%d%d%d%d[/%-]%d%d[/%-]%d%d","....-..-..") + line = gsub(line,"v%d+%.?%d?%d?%w?","v...") + end -- 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 + -- Zap .fd lines: drop the first part, and skip to the end if match(line, "^ *%([%.%/%w]+%.fd[^%)]*$") then - lastline = (lastline or "") .. line - return "", (lastline or "") .. line + return "","",true end -- TeX90/XeTeX knows only the smaller set of dimension units line = gsub(line, @@ -250,6 +254,7 @@ local function normalize_log(content,engine,errlevels) return line, lastline end local lastline = "" + local drop_fd = false local new_content = "" local prestart = true local skipping = false @@ -264,7 +269,7 @@ local function normalize_log(content,engine,errlevels) elseif match(line, "^%)?TIMO$") then skipping = false elseif not prestart and not skipping then - line, lastline = normalize(line, lastline) + line, lastline, drop_fd = normalize(line, lastline,drop_fd) if not match(line, "^ *$") and not killcheck(line) then new_content = new_content .. line .. os_newline end @@ -526,7 +531,10 @@ end -- Run one test which may have multiple engine-dependent comparisons -- Should create a difference file for each failed test function runcheck(name, hide) - if not testexists(name) then return 1 end + if not testexists(name) then + print("Failed to find input for test " .. name) + return 1 + end local checkengines = checkengines if options["engine"] then checkengines = options["engine"] diff --git a/Master/texmf-dist/scripts/l3build/l3build-clean.lua b/Master/texmf-dist/scripts/l3build/l3build-clean.lua index 3fd8396c9ce..01927a71d04 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-clean.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-clean.lua @@ -45,7 +45,7 @@ end function bundleclean() local errorlevel = call(modules, "clean") for _,i in ipairs(cleanfiles) do - errorlevel = rm(maindir, i) + errorlevel + errorlevel = rm(currentdir, i) + errorlevel end return ( errorlevel + diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 1ece096e7f3..d97fecd8298 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-08-07" +release_date = "2018-09-21" -- 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 7e465398e51..f6c691d3fdf 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -59,7 +59,7 @@ \luavarseparator \luavarset{maindir} {"."} {Top level directory for the module/bundle} \luavarset{docfiledir} {"."} {Directory containing documentation files} -\luavarset{sourcfiledir}{"."} {Directory containing source files} +\luavarset{sourcefiledir}{"."} {Directory containing source files} \luavarset{supportdir} {maindir .. "/support"} {Directory containing general support files} \luavarset{testfiledir}{"./testfiles"} {Directory containing test files} \luavarset{testsuppdir}{testfiledir .. "/support"}{Directory containing test-specific support files} @@ -158,7 +158,7 @@ \luavarset{maxprintline}{79} {Length of line to use in log files} \luavarset{packtdszip} {false} {Switch to build a TDS-style zip file for CTAN} \luavarset{typesetcmds} {""} {Instructions to be passed to \TeX{} when doing typesetting.} -\luavarset{typsetcycles}{3} {Number of cycles of typesetting to carry out.} +\luavarset{typesetruns}{3} {Number of cycles of typesetting to carry out.} \luavarset{recordstatus}{false} {Switch to include error level from test runs in \texttt{.tlg} files} \luavarset{manifestfile} {"MANIFEST.md"} {Filename to use for the manifest file.} } @@ -222,7 +222,7 @@ % }^^A % } % -% \date{Released 2018-08-07} +% \date{Released 2018-09-21} % % \maketitle % \tableofcontents @@ -330,7 +330,7 @@ % \item |--force| (|-f|) Force checks to run even if sanity % checks fail, \emph{e.g.}~when |--engine| is not given in % \luavar{checkengines} -% \item |--full| Instructs the \texttt{install} target to include the +% \item |--full| Instructs the \texttt{install} target to include the % \texttt{doc} and \texttt{source} trees % \item |--halt-on-error| (|-H|) Specifies that checks % should stop as soon as possible, rather than running all requested @@ -630,7 +630,7 @@ % % Tests are run in a single directory, so whilst they are may be isolated from % the system \TeX{} tree they do share files. This may be significant if -% installation-type files are generated during a test, for example by a +% installation-type files are generated during a test, for example by a % |filecontents| environment in \LaTeX{}. Typically, you should set up your % tests such that they do not use the same names for such files: this may lead % to variable outcomes depending on the order in which tests are run. @@ -745,8 +745,8 @@ % \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 related to loading |.fd| files (from \texttt{(\meta{name}.fd} +% to the matching \texttt{)}). % \item Lines starting \cs{openin} or \cs{openout}. % \end{itemize} % Modifications made in lines are: @@ -762,6 +762,8 @@ % years due to a \TeX{} bug). % \item Conversion of \texttt{on line \meta{number}} to \texttt{on line ...} % to allow flexibility in changes to test files. +% \item Conversion of file dates to \texttt{....-..-..}, and any version +% numbers on the same lines to \texttt{v...}. % \item Conversion of register numbers in assignment lines % \texttt{\cs{\meta{register}}=\cs{\meta{type}}\meta{number}} to % \texttt{\cs{\meta{type}}\meta{...}} |