diff options
author | Karl Berry <karl@freefriends.org> | 2023-02-20 21:01:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-02-20 21:01:17 +0000 |
commit | 581ad0b74b17bcdc81b09c04368271bf453562bb (patch) | |
tree | 33ddde7f8a8c109a777ca3efa9bf2df72028adec /Master/texmf-dist | |
parent | d64be73b8aea11c37d5fc24ef6db13de68a249a7 (diff) |
l3build (20feb23)
git-svn-id: svn://tug.org/texlive/trunk@65983 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-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 | 742232 -> 741730 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 | 14932 -> 14818 bytes | |||
-rw-r--r-- | Master/texmf-dist/scripts/l3build/l3build-check.lua | 7 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/l3build/l3build.lua | 35 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/l3build/l3build.dtx | 2 |
8 files changed, 38 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index f14e4db1a0b..eda72d0a200 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] +## [2023-02-20] + +### Changed +- Unify `testdir` by dropping possibly trailing `.lua` passed to `--config` + +### Fixed +- Ensure directories `testdir` and `resultdir` exist when `--dirty` is set +- epoch settings with xetex + ## [2023-02-16] ### Changed @@ -620,7 +629,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-02-16...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2023-02-20...HEAD +[2023-02-20]: https://github.com/latex3/l3build/compare/2023-02-16...2023-02-20 [2023-02-16]: https://github.com/latex3/l3build/compare/2022-11-10...2023-02-16 [2022-11-10]: https://github.com/latex3/l3build/compare/2022-09-15...2022-11-10 [2022-09-15]: https://github.com/latex3/l3build/compare/2022-04-19...2022-09-15 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index e33fee32292..40741a74ed7 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-02-16 +Release 2023-02-20 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf Binary files differindex 5172226c843..4afb71bd9b8 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 f36d695a069..f9738ed8d93 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-02-16" +.TH l3build 1 "2023-02-20" .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 ceef5be0598..9574272e7aa 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 d6d68086bcc..b77a7e26cc4 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -55,7 +55,10 @@ local remove = os.remove -- Set up the check system files: needed for checking one or more tests and -- for saving the test files function checkinit() - if not options["dirty"] then + if options["dirty"] then + mkdir(testdir) + mkdir(resultdir) + else cleandir(testdir) cleandir(resultdir) end @@ -787,6 +790,8 @@ function runtest(name, engine, hide, ext, test_type, breakout) os_setenv .. " LUAINPUTS=." .. localtexmf() .. (checksearch and os_pathsep or "") .. os_concat .. + -- ensure epoch settings + set_epoch_cmd(epoch, forcecheckepoch) .. -- Ensure lines are of a known length os_setenv .. " max_print_line=" .. maxprintline .. os_concat .. diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 110d3947720..ff80523b174 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-02-16" +release_date = "2023-02-20" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -205,22 +205,23 @@ if #checkconfigs > 1 then end end if #checkconfigs == 1 and - checkconfigs[1] ~= "build" and - (options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then - local config = "./" .. gsub(checkconfigs[1],"%.lua$","") .. ".lua" - if fileexists(config) then - local savedtestfiledir = testfiledir - dofile(config) - testdir = testdir .. "-" .. checkconfigs[1] - -- Reset testsuppdir if required - if savedtestfiledir ~= testfiledir and - testsuppdir == savedtestfiledir .. "/support" then - testsuppdir = testfiledir .. "/support" - end - else - print("Error: Cannot find configuration " .. checkconfigs[1]) - exit(1) - end + checkconfigs[1] ~= "build" and + (options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then + local configname = gsub(checkconfigs[1], "%.lua$", "") + local config = "./" .. configname .. ".lua" + if fileexists(config) then + local savedtestfiledir = testfiledir + dofile(config) + testdir = testdir .. "-" .. configname + -- Reset testsuppdir if required + if savedtestfiledir ~= testfiledir and + testsuppdir == savedtestfiledir .. "/support" then + testsuppdir = testfiledir .. "/support" + end + else + print("Error: Cannot find configuration " .. checkconfigs[1]) + exit(1) + end end -- Call the main function diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index 435036c8bf2..085ac1d022f 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -236,7 +236,7 @@ % }^^A % } % -% \date{Released 2023-02-16} +% \date{Released 2023-02-20} % % \maketitle % \tableofcontents |