From 67e5dc203c1d0786466f822b0af848767137da62 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 7 Sep 2023 20:14:13 +0000 Subject: l3build (7sep23) git-svn-id: svn://tug.org/texlive/trunk@68198 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/l3build/CHANGELOG.md | 9 +++++++- Master/texmf-dist/doc/latex/l3build/README.md | 2 +- Master/texmf-dist/doc/latex/l3build/l3build.pdf | Bin 744734 -> 744608 bytes Master/texmf-dist/doc/man/man1/l3build.1 | 2 +- Master/texmf-dist/doc/man/man1/l3build.man1.pdf | Bin 15051 -> 14980 bytes .../texmf-dist/scripts/l3build/l3build-check.lua | 3 ++- Master/texmf-dist/scripts/l3build/l3build.lua | 25 +++++++++++++-------- Master/texmf-dist/source/latex/l3build/l3build.dtx | 3 ++- 8 files changed, 30 insertions(+), 14 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index e23a7764f98..7c6c7f83c40 100644 --- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md @@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2023-09-07] + +### Changed +- Refine `-utc` support +- Apply `checkopts` in addition to engine-specific options + ## [2023-09-05] ### Changed @@ -691,7 +697,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2023-09-05...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2023-09-07...HEAD +[2023-09-07]: https://github.com/latex3/l3build/compare/2023-09-05...2023-09-07 [2023-09-05]: https://github.com/latex3/l3build/compare/2023-07-20...2023-09-05 [2023-07-20]: https://github.com/latex3/l3build/compare/2023-07-17...2023-07-20 [2023-07-17]: https://github.com/latex3/l3build/compare/2023-03-27...2023-07-17 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index 779c91cad96..825c32f55bf 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 LaTeX ================================================= -Release 2023-09-05 +Release 2023-09-07 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf index ac44c0e0cec..e713477fca5 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 941958d57fe..87dbac2ce35 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 "2023-09-05" +.TH l3build 1 "2023-09-07" .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 d485138cf9b..97ac9ee0187 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 3f1f5d55426..3e26de429be 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -753,7 +753,8 @@ function runtest(name, engine, hide, ext, test_type, breakout) if engine_info then binary = engine_info.binary or binary format = engine_info.format or format - checkopts = engine_info.options or checkopts + checkopts = (engine_info.options + and (checkopts .. " " .. engine_info.options)) or checkopts tokens = engine_info.tokens and (' "' .. engine_info.tokens .. '" ') or tokens end diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 66f50e96419..1ac608c9711 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 = "2023-09-05" +release_date = "2023-09-07" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -118,15 +118,22 @@ if options["epoch"] then end epoch = normalise_epoch(epoch) -- LuaTeX needs the `-utc` option -if next(specialformats) and next(specialformats.latex) - and next (specialformats.latex.luatex) then - local options = specialformats.latex.luatex.options - specialformats.latex.luatex.options = (options and (options .. " ") or "") .. "-utc" +if forcecheckepoch then + if next(specialformats) and next(specialformats.latex) + and next (specialformats.latex.luatex) then + local options = specialformats.latex.luatex.options + specialformats.latex.luatex.options = (options and (options .. " ") or "") .. "-utc" + end + if next(specialformats) and next(specialformats["latex-dev"]) + and next (specialformats["latex-dev"].luatex) then + local options = specialformats["latex-dev"].luatex.options + specialformats["latex-dev"].luatex.options = (options and (options .. " ") or "") .. "-utc" + end end -if next(specialformats) and next(specialformats["latex-dev"]) - and next (specialformats["latex-dev"].luatex) then - local options = specialformats["latex-dev"].luatex.options - specialformats["latex-dev"].luatex.options = (options and (options .. " ") or "") .. "-utc" +if forcedocepoch then + if match(typesetexe,"luatex") or match(typesetexe,"lualatex") then + typesetopts = typsetopts .. " -utc" + end end -- diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index 0ca5366d817..d8778fcce7c 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -251,7 +251,7 @@ % }^^A % } % -% \date{Released 2023-09-05} +% \date{Released 2023-09-07} % % \maketitle % \tableofcontents @@ -437,6 +437,7 @@ % To perform the check, the engine typesets each test up to \var{checkruns} times. % More detail on this in the documentation on |save|. % Options passed to the binary are defined in the variable \var{checkopts}. +% These are applied in addition to any % % By default, |texmf| trees are searched for input files when checking. This can be disabled by setting \var{checksearch} to |false|: isolation provides confidence that the tests cannot accidentally be running with incorrect files installed in the main distribution or |hometexmf|. % -- cgit v1.2.3