summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/texlive/linked_scripts/l3build/l3build.lua11
-rw-r--r--Master/texmf-dist/doc/latex/l3build/CHANGELOG.md8
-rw-r--r--Master/texmf-dist/doc/latex/l3build/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3build/l3build.pdfbin741184 -> 741143 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.12
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.man1.pdfbin15602 -> 15555 bytes
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-variables.lua12
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua11
-rw-r--r--Master/texmf-dist/source/latex/l3build/l3build.dtx2
9 files changed, 27 insertions, 21 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
index 1d8d58c6946..9c811c3fc87 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 = "2021-12-09"
+release_date = "2021-12-14"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
@@ -136,11 +136,10 @@ end
if #checkconfigs > 1 then
if options["target"] == "check" then
local errorlevel = 0
- local opts = options
local failed = { }
for i = 1, #checkconfigs do
- opts["config"] = {checkconfigs[i]}
- errorlevel = call({"."}, "check", opts)
+ options["config"] = {checkconfigs[i]}
+ errorlevel = call({"."}, "check", options)
if errorlevel ~= 0 then
if options["halt-on-error"] then
exit(1)
@@ -199,8 +198,8 @@ if #checkconfigs > 1 then
elseif options["target"] == "clean" then
local failure
for i = 1, #checkconfigs do
- opts["config"] = {checkconfigs[i]}
- failure = 0 ~= call({"."}, "clean", opts) or failure
+ options["config"] = {checkconfigs[i]}
+ failure = 0 ~= call({"."}, "clean", options) or failure
end
exit(failure and 1 or 0)
end
diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
index 07631b0dd91..9c0dbdebb0d 100644
--- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
@@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2021-12-14]
+
+### Fixed
+- Use correct name for `options` table in multi configuration management code
+
## [2021-12-09]
### Added
@@ -553,7 +558,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/2021-12-09...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2021-12-14...HEAD
+[2021-12-14]: https://github.com/latex3/l3build/compare/2021-12-09...2021-12-14
[2021-12-09]: https://github.com/latex3/l3build/compare/2021-12-06...2021-12-09
[2021-12-06]: https://github.com/latex3/l3build/compare/2021-11-29...2021-12-06
[2021-11-29]: https://github.com/latex3/l3build/compare/2021-11-24...2021-11-29
diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md
index 2c5e33a0324..0b09e63bab1 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 2021-12-09
+Release 2021-12-14
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
index 43000ca1331..6f9d13aff91 100644
--- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf
+++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1
index 0a0fbf2344e..592424ba4f6 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 "2021-12-09"
+.TH l3build 1 "2021-12-14"
.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 411d02f970d..0edb064dce0 100644
--- a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
index ffabf3490a7..736df6ae826 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
@@ -121,11 +121,13 @@ specialformats.context = specialformats.context or {
pdftex = {binary = "texexec", format = ""},
xetex = {binary = "texexec", format = "", options = "--xetex"}
}
-specialformats.latex = specialformats.latex or {
- etex = {format = "latex"},
- ptex = {binary = "eptex"},
- uptex = {binary = "euptex"}
- }
+specialformats.latex = specialformats.latex or { }
+specialformats.latex.etex = specialformats.latex.etex or
+ {format = "latex"}
+specialformats.latex.ptex = specialformats.latex.ptex or
+ {binary = "eptex"}
+specialformats.latex.uptex = specialformats.latex.uptex or
+ {binary = "euptex"}
if not string.find(status.banner,"2019") then
specialformats.latex.luatex = specialformats.latex.luatex or
{binary = "luahbtex",format = "lualatex"}
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 1d8d58c6946..9c811c3fc87 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 = "2021-12-09"
+release_date = "2021-12-14"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
@@ -136,11 +136,10 @@ end
if #checkconfigs > 1 then
if options["target"] == "check" then
local errorlevel = 0
- local opts = options
local failed = { }
for i = 1, #checkconfigs do
- opts["config"] = {checkconfigs[i]}
- errorlevel = call({"."}, "check", opts)
+ options["config"] = {checkconfigs[i]}
+ errorlevel = call({"."}, "check", options)
if errorlevel ~= 0 then
if options["halt-on-error"] then
exit(1)
@@ -199,8 +198,8 @@ if #checkconfigs > 1 then
elseif options["target"] == "clean" then
local failure
for i = 1, #checkconfigs do
- opts["config"] = {checkconfigs[i]}
- failure = 0 ~= call({"."}, "clean", opts) or failure
+ options["config"] = {checkconfigs[i]}
+ failure = 0 ~= call({"."}, "clean", options) or failure
end
exit(failure and 1 or 0)
end
diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx
index b11dc1adcb8..e385c5249d9 100644
--- a/Master/texmf-dist/source/latex/l3build/l3build.dtx
+++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx
@@ -237,7 +237,7 @@
% }^^A
% }
%
-% \date{Released 2021-12-09}
+% \date{Released 2021-12-14}
%
% \maketitle
% \tableofcontents