texlive[66194] branches/branch2022.final: resolsysteme (26feb23)
commits+karl at tug.org
commits+karl at tug.org
Sun Feb 26 22:10:13 CET 2023
Revision: 66194
http://tug.org/svn/texlive?view=revision&revision=66194
Author: karl
Date: 2023-02-26 22:10:13 +0100 (Sun, 26 Feb 2023)
Log Message:
-----------
resolsysteme (26feb23) (branch)
Modified Paths:
--------------
branches/branch2022.final/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/README.md
branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/l3build.pdf
branches/branch2022.final/Master/texmf-dist/doc/man/man1/l3build.1
branches/branch2022.final/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-check.lua
branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-variables.lua
branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build.lua
branches/branch2022.final/Master/texmf-dist/source/latex/l3build/l3build.dtx
Removed Paths:
-------------
branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/CONTRIBUTING.md
Modified: branches/branch2022.final/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
===================================================================
--- branches/branch2022.final/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua 2023-02-26 21:09:56 UTC (rev 66193)
+++ branches/branch2022.final/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua 2023-02-26 21:10:13 UTC (rev 66194)
@@ -25,7 +25,7 @@
--]]
-- Version information
-release_date = "2023-02-20"
+release_date = "2023-02-26"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
@@ -118,17 +118,14 @@
end
epoch = normalise_epoch(epoch)
--- Sanity check
-check_engines()
-
--
-- Deal with multiple configs for tests
--
-- When we have specific files to deal with, only use explicit configs
--- (or just the std one)
+-- (or just the default one)
if options["names"] then
- checkconfigs = options["config"] or {stdconfig}
+ checkconfigs = options["config"] or {"build"}
else
checkconfigs = options["config"] or checkconfigs
end
@@ -205,22 +202,28 @@
end
end
if #checkconfigs == 1 and
- 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"
+ if checkconfigs[1] == "build" then
+ -- Sanity check for default config
+ check_engines("build.lua")
+ else
+ local configname = gsub(checkconfigs[1], "%.lua$", "")
+ local config = "./" .. configname .. ".lua"
+ if fileexists(config) then
+ local savedtestfiledir = testfiledir
+ dofile(config)
+ -- Sanity check for non-default config
+ check_engines(configname .. ".lua")
+ 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 " .. configname .. ".lua")
+ exit(1)
end
- else
- print("Error: Cannot find configuration " .. checkconfigs[1])
- exit(1)
end
end
Modified: branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
===================================================================
--- branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md 2023-02-26 21:09:56 UTC (rev 66193)
+++ branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md 2023-02-26 21:10:13 UTC (rev 66194)
@@ -7,6 +7,17 @@
## [Unreleased]
+## [2023-02-26]
+
+### Changed
+- Run engine sanity check per config
+
+### Fixed
+- Restore epoch settings for `dvitopdf()`
+- Use plural form of variable `ps2pdfopts` consistently in code and doc, and
+ retain compatibility with singular form `ps2pdfopt` (issue #275)
+- Remove the last trace of dropped variable `stdconfig`
+
## [2023-02-20]
### Changed
@@ -629,7 +640,8 @@
- Rationalise short option names: removed `-d`, `-E`, `-r`
- Target `cmdcheck`: specific to LaTeX kernel work
-[Unreleased]: https://github.com/latex3/l3build/compare/2023-02-20...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2023-02-26...HEAD
+[2023-02-26]: https://github.com/latex3/l3build/compare/2023-02-20...2023-02-26
[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
Deleted: branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/CONTRIBUTING.md
===================================================================
--- branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/CONTRIBUTING.md 2023-02-26 21:09:56 UTC (rev 66193)
+++ branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/CONTRIBUTING.md 2023-02-26 21:10:13 UTC (rev 66194)
@@ -1,52 +0,0 @@
-Thanks for considering contributing to `l3build`: feedback, fixes and ideas are
-all useful. Here, we ([The LaTeX Project](https://www.latex-project.org)) have
-collected together a few pointers to help things along.
-
-## Bugs
-
-Please log bugs using the [issues](https://github.com/latex3/l3build/issues)
-system on GitHub, and choose the 'bug' label. Handy information that you might
-include, depending on the nature of the issue, includes
-
-- Your version of `l3build` (`texlua l3build.lua version`)
-- Your TeX system details (for example 'TeX Live 2017')
-- Your operating system
-- The contents of your `build.lua` file
-- An 'ASCII art' explanation of your directory layout
-
-## Feature requests
-
-Feature requests are welcome: log them in the same way as bugs and pick
-the 'Enhancement' label. We welcome feature requests for the test set up,
-the build process, _etc._
-
-## Code contributions
-
-If you want to discuss a possible contribution before (or instead of)
-making a pull request, drop a line to
-[the team](mailto:latex-team at latex-project.org).
-
-There are a few things that might look non-standard to most Lua programmers,
-which come about as `l3build`'s focus is testing and building LaTeX packages:
-
-- Our target Lua set up is `texlua` (part of LuaTeX), not standalone `lua`
-- The main `l3build.lua` file is self-contained as this helps with
- bootstrapping LaTeX: we are aiming to maintain a single file with no
- `.lua` dependencies
-- The primary documentation is aimed at the TeX world, so is in PDF format
- and generated from `l3build.dtx`; documentation in the `.lua` file is
- also welcome, but anything for general use does need to be in the `.dtx`
-- As far as possible, everything is done within `l3build` itself or tools
- directly available in a TeX system or as standard in the supported
- systems (Windows, MacOS, Linux)
-- The `l3build` interfaces should be platform-agnostic (though it may be
- necessary of course to branch inside particular functions)
-
-If you are submitting a pull request, notice that
-
-- We use Travis-CI for (light) testing so add `[ci skip]` to documentation-only
- commit messages
-- We favour a single linear history so will rebase agreed pull requests on to
- the `master` branch
-- Where a commit fixes or closes an issue, please include this information
- in the first line of the commit message
Modified: branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/README.md
===================================================================
--- branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/README.md 2023-02-26 21:09:56 UTC (rev 66193)
+++ branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/README.md 2023-02-26 21:10:13 UTC (rev 66194)
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX
=================================================
-Release 2023-02-20
+Release 2023-02-26
Overview
--------
@@ -31,6 +31,6 @@
-----
-<p>Copyright (C) 2014-2022 The LaTeX Project <br />
+<p>Copyright (C) 2014-2023 The LaTeX Project <br />
<a href="http://latex-project.org/">http://latex-project.org/</a> <br />
All rights reserved.</p>
Modified: branches/branch2022.final/Master/texmf-dist/doc/latex/l3build/l3build.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2022.final/Master/texmf-dist/doc/man/man1/l3build.1
===================================================================
--- branches/branch2022.final/Master/texmf-dist/doc/man/man1/l3build.1 2023-02-26 21:09:56 UTC (rev 66193)
+++ branches/branch2022.final/Master/texmf-dist/doc/man/man1/l3build.1 2023-02-26 21:10:13 UTC (rev 66194)
@@ -1,4 +1,4 @@
-.TH l3build 1 "2023-02-20"
+.TH l3build 1 "2023-02-26"
.SH NAME
l3build \- Checking and building packages
.SH SYNOPSIS
Modified: branches/branch2022.final/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
===================================================================
--- branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-arguments.lua 2023-02-26 21:09:56 UTC (rev 66193)
+++ branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-arguments.lua 2023-02-26 21:10:13 UTC (rev 66194)
@@ -291,16 +291,16 @@
options = argparse()
-- Sanity check
-function check_engines()
+function check_engines(config)
if options["engine"] and not options["force"] then
- -- Make a lookup table
- local t = { }
+ -- Make a lookup table
+ local t = { }
for _, engine in pairs(checkengines) do
t[engine] = true
end
for _, engine in pairs(options["engine"]) do
if not t[engine] then
- print("\n! Error: Engine \"" .. engine .. "\" not set up for testing!")
+ print("\n! Error: Engine \"" .. engine .. "\" not set up for testing with configuration " .. config .. "!")
print("\n Valid values are:")
for _, engine in ipairs(checkengines) do
print(" - " .. engine)
Modified: branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-check.lua
===================================================================
--- branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-check.lua 2023-02-26 21:09:56 UTC (rev 66193)
+++ branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-check.lua 2023-02-26 21:10:13 UTC (rev 66194)
@@ -791,7 +791,7 @@
.. (checksearch and os_pathsep or "")
.. os_concat ..
-- ensure epoch settings
- set_epoch_cmd(epoch, forcecheckepoch) ..
+ set_epoch_cmd(epoch, forcecheckepoch) ..
-- Ensure lines are of a known length
os_setenv .. " max_print_line=" .. maxprintline
.. os_concat ..
Modified: branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
===================================================================
--- branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua 2023-02-26 21:09:56 UTC (rev 66193)
+++ branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua 2023-02-26 21:10:13 UTC (rev 66194)
@@ -57,10 +57,11 @@
function dvitopdf(name, dir, engine, hide)
runcmd(
+ set_epoch_cmd(epoch, forcecheckepoch) ..
"dvips " .. name .. dviext
.. (hide and (" > " .. os_null) or "")
.. os_concat ..
- "ps2pdf " .. ps2pdfopt .. name .. psext
+ "ps2pdf " .. ps2pdfopts .. name .. psext
.. (hide and (" > " .. os_null) or ""),
dir
)
Modified: branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-variables.lua
===================================================================
--- branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-variables.lua 2023-02-26 21:09:56 UTC (rev 66193)
+++ branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build-variables.lua 2023-02-26 21:10:13 UTC (rev 66194)
@@ -193,7 +193,8 @@
end
maxprintline = maxprintline or 79
packtdszip = packtdszip or false
-ps2pdfopt = ps2pdfopt or ""
+-- support "ps2pdfopt" for backward compatibility, gh issue #275
+ps2pdfopts = ps2pdfopts or ps2pdfopt or ""
typesetcmds = typesetcmds or ""
typesetruns = typesetruns or 3
recordstatus = recordstatus or false
Modified: branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build.lua
===================================================================
--- branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build.lua 2023-02-26 21:09:56 UTC (rev 66193)
+++ branches/branch2022.final/Master/texmf-dist/scripts/l3build/l3build.lua 2023-02-26 21:10:13 UTC (rev 66194)
@@ -25,7 +25,7 @@
--]]
-- Version information
-release_date = "2023-02-20"
+release_date = "2023-02-26"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
@@ -118,17 +118,14 @@
end
epoch = normalise_epoch(epoch)
--- Sanity check
-check_engines()
-
--
-- Deal with multiple configs for tests
--
-- When we have specific files to deal with, only use explicit configs
--- (or just the std one)
+-- (or just the default one)
if options["names"] then
- checkconfigs = options["config"] or {stdconfig}
+ checkconfigs = options["config"] or {"build"}
else
checkconfigs = options["config"] or checkconfigs
end
@@ -205,22 +202,28 @@
end
end
if #checkconfigs == 1 and
- 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"
+ if checkconfigs[1] == "build" then
+ -- Sanity check for default config
+ check_engines("build.lua")
+ else
+ local configname = gsub(checkconfigs[1], "%.lua$", "")
+ local config = "./" .. configname .. ".lua"
+ if fileexists(config) then
+ local savedtestfiledir = testfiledir
+ dofile(config)
+ -- Sanity check for non-default config
+ check_engines(configname .. ".lua")
+ 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 " .. configname .. ".lua")
+ exit(1)
end
- else
- print("Error: Cannot find configuration " .. checkconfigs[1])
- exit(1)
end
end
Modified: branches/branch2022.final/Master/texmf-dist/source/latex/l3build/l3build.dtx
===================================================================
--- branches/branch2022.final/Master/texmf-dist/source/latex/l3build/l3build.dtx 2023-02-26 21:09:56 UTC (rev 66193)
+++ branches/branch2022.final/Master/texmf-dist/source/latex/l3build/l3build.dtx 2023-02-26 21:10:13 UTC (rev 66194)
@@ -236,7 +236,7 @@
% }^^A
% }
%
-% \date{Released 2023-02-20}
+% \date{Released 2023-02-26}
%
% \maketitle
% \tableofcontents
More information about the tex-live-commits
mailing list.