texlive[63079] trunk: l3build (19apr22)
commits+karl at tug.org
commits+karl at tug.org
Tue Apr 19 22:06:46 CEST 2022
Revision: 63079
http://tug.org/svn/texlive?view=revision&revision=63079
Author: karl
Date: 2022-04-19 22:06:46 +0200 (Tue, 19 Apr 2022)
Log Message:
-----------
l3build (19apr22)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/l3build/README.md
trunk/Master/texmf-dist/doc/latex/l3build/l3build.pdf
trunk/Master/texmf-dist/doc/man/man1/l3build.1
trunk/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua
trunk/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
trunk/Master/texmf-dist/scripts/l3build/l3build-install.lua
trunk/Master/texmf-dist/scripts/l3build/l3build.lua
trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx
Modified: trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua 2022-04-19 12:33:25 UTC (rev 63078)
+++ trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua 2022-04-19 20:06:46 UTC (rev 63079)
@@ -25,7 +25,7 @@
--]]
-- Version information
-release_date = "2022-04-12"
+release_date = "2022-04-19"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
@@ -156,7 +156,7 @@
if config ~= "build" then
testdir = testdir .. "-" .. config
end
- for _,i in ipairs(filelist(testdir,"*" .. os_diffext)) do
+ for _,i in ipairs(ordered_filelist(testdir,"*" .. os_diffext)) do
print(" - " .. testdir .. "/" .. i)
end
print("")
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2022-04-19 12:33:25 UTC (rev 63078)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2022-04-19 20:06:46 UTC (rev 63079)
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 63033 2022-04-15 05:19:42Z preining $
+# $Id: tlmgr.pl 63068 2022-04-18 05:58:07Z preining $
#
# Copyright 2008-2022 Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -7,8 +7,8 @@
use strict; use warnings;
-my $svnrev = '$Revision: 63033 $';
-my $datrev = '$Date: 2022-04-15 07:19:42 +0200 (Fri, 15 Apr 2022) $';
+my $svnrev = '$Revision: 63068 $';
+my $datrev = '$Date: 2022-04-18 07:58:07 +0200 (Mon, 18 Apr 2022) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -10240,7 +10240,7 @@
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 63033 2022-04-15 05:19:42Z preining $
+$Id: tlmgr.pl 63068 2022-04-18 05:58:07Z preining $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
Modified: trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md 2022-04-19 12:33:25 UTC (rev 63078)
+++ trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md 2022-04-19 20:06:46 UTC (rev 63079)
@@ -7,6 +7,12 @@
## [Unreleased]
+## [2022-04-19]
+
+### Changed
+- Normalise GhostScript version in PDF-based tests
+- Sort list of names of difference files for failing tests.
+
## [2022-04-12]
### Added
@@ -592,7 +598,8 @@
- Rationalise short option names: removed `-d`, `-E`, `-r`
- Target `cmdcheck`: specific to LaTeX kernel work
-[Unreleased]: https://github.com/latex3/l3build/compare/2022-04-12...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2022-04-19...HEAD
+[2022-04-19]: https://github.com/latex3/l3build/compare/2022-04-12...2022-04-19
[2022-04-12]: https://github.com/latex3/l3build/compare/2022-03-15...2022-04-12
[2022-03-15]: https://github.com/latex3/l3build/compare/2022-02-24...2022-03-15
[2022-02-24]: https://github.com/latex3/l3build/compare/2021-12-14...2022-02-24
Modified: trunk/Master/texmf-dist/doc/latex/l3build/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3build/README.md 2022-04-19 12:33:25 UTC (rev 63078)
+++ trunk/Master/texmf-dist/doc/latex/l3build/README.md 2022-04-19 20:06:46 UTC (rev 63079)
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX
=================================================
-Release 2022-04-12
+Release 2022-04-19
Overview
--------
Modified: trunk/Master/texmf-dist/doc/latex/l3build/l3build.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/man/man1/l3build.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/l3build.1 2022-04-19 12:33:25 UTC (rev 63078)
+++ trunk/Master/texmf-dist/doc/man/man1/l3build.1 2022-04-19 20:06:46 UTC (rev 63079)
@@ -1,4 +1,4 @@
-.TH l3build 1 "2022-04-12"
+.TH l3build 1 "2022-04-19"
.SH NAME
l3build \- Checking and building packages
.SH SYNOPSIS
Modified: trunk/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua 2022-04-19 12:33:25 UTC (rev 63078)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua 2022-04-19 20:06:46 UTC (rev 63079)
@@ -553,6 +553,7 @@
not match(line,"^%%%%%+") then
line = gsub(line,"%/ID( ?)%[<[^>]+><[^>]+>]","/ID%1[<ID-STRING><ID-STRING>]")
line = gsub(line,"%/ID( ?)%[(%b())%2%]","/ID%1[<ID-STRING><ID-STRING>]")
+ line = gsub(line,"GhostScript %d%.%d+%.?%d*","GhostScript ...")
new_content = new_content .. line .. os_newline
end
end
@@ -827,7 +828,7 @@
test_type.rewrite(gen_file,new_file,engine,errlevels)
-- Store secondary files for this engine
for _,filetype in pairs(auxfiles) do
- for _,file in pairs(filelist(testdir, filetype)) do
+ for _,file in ipairs(filelist(testdir, filetype)) do
if match(file,"^" .. name .. "%.[^.]+$") then
local newname = gsub(file,"(%.[^.]+)$","." .. engine .. "%1")
if fileexists(testdir .. "/" .. newname) then
@@ -930,7 +931,7 @@
excludepatterns[num_exclude] = glob_to_pattern(glob .. ext)
end
for _,glob in pairs(includetests) do
- for _,name in pairs(filelist(testfiledir, glob .. ext)) do
+ for _,name in ipairs(filelist(testfiledir, glob .. ext)) do
local exclude
for i=1, num_exclude do
if match(name, excludepatterns[i]) then
@@ -942,7 +943,7 @@
insert(names,jobname(name))
end
end
- for _,name in pairs(filelist(unpackdir, glob .. ext)) do
+ for _,name in ipairs(filelist(unpackdir, glob .. ext)) do
local exclude
for i=1, num_exclude do
if not match(name, excludepatterns[i]) then
@@ -1027,7 +1028,7 @@
-- A short auxiliary to print the list of differences for check
function checkdiff()
print("\n Check failed with difference files")
- for _,i in ipairs(filelist(testdir, "*" .. os_diffext)) do
+ for _,i in ipairs(ordered_filelist(testdir, "*" .. os_diffext)) do
print(" - " .. testdir .. "/" .. i)
end
print("")
@@ -1035,7 +1036,7 @@
function showfailedlog(name)
print("\nCheck failed with log file")
- for _,i in ipairs(filelist(testdir, name..".log")) do
+ for _,i in ipairs(ordered_filelist(testdir, name..".log")) do
print(" - " .. testdir .. "/" .. i)
print("")
local f = open(testdir .. "/" .. i,"r")
@@ -1049,7 +1050,7 @@
function showfaileddiff()
print("\nCheck failed with difference file")
- for _,i in ipairs(filelist(testdir, "*" .. os_diffext)) do
+ for _,i in ipairs(ordered_filelist(testdir, "*" .. os_diffext)) do
print(" - " .. testdir .. "/" .. i)
print("")
local f = open(testdir .. "/" .. i,"r")
Modified: trunk/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua 2022-04-19 12:33:25 UTC (rev 63078)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua 2022-04-19 20:06:46 UTC (rev 63079)
@@ -198,7 +198,7 @@
else
path = gsub(path,"\\ ","[PATH-SPACE]")
path = gsub(path," ","\\ ")
- return gsub(path,"%[PATH-SPACE%]","\\ ")
+ return gsub(path,"%[PATH%-SPACE%]","\\ ")
end
end
@@ -234,13 +234,13 @@
if os_type == "windows" then
if direxists(p.cwd) then
errorlevel = execute(
- 'xcopy /y /e /i "' .. unix_to_win(p.cwd) .. '" "'
- .. unix_to_win(dest .. '/' .. p.src) .. '" > nul'
+ 'xcopy /y /e /i "' .. unix_to_win(p.cwd) .. '" '
+ .. unix_to_win(dest .. '/' .. escapepath(p.src)) .. ' > nul'
) and 0 or 1
else
errorlevel = execute(
- 'xcopy /y "' .. unix_to_win(p.cwd) .. '" "'
- .. unix_to_win(dest .. '/') .. '" > nul'
+ 'xcopy /y "' .. unix_to_win(p.cwd) .. '" '
+ .. unix_to_win(dest .. '/') .. ' > nul'
) and 0 or 1
end
else
@@ -250,7 +250,7 @@
if errorlevel ~=0 then return errorlevel end
end
errorlevel = execute(
- "cp -RLf '" .. p.cwd .. "' '" .. dest .. "'"
+ "cp -RLf '" .. p.cwd .. "' " .. dest
) and 0 or 1
end
if errorlevel ~=0 then
@@ -283,6 +283,11 @@
end
return files
end
+function ordered_filelist(...)
+ local files = filelist(...)
+ table.sort(files)
+ return files
+end
--- at class tree_entry_t
--- at field src string path relative to the source directory
@@ -367,6 +372,7 @@
end
function mkdir(dir)
+ dir = escapepath(dir)
if os_type == "windows" then
-- Windows (with the extensions) will automatically make directory trees
-- but issues a warning if the dir already exists: avoid by including a test
Modified: trunk/Master/texmf-dist/scripts/l3build/l3build-install.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-install.lua 2022-04-19 12:33:25 UTC (rev 63078)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-install.lua 2022-04-19 20:06:46 UTC (rev 63079)
@@ -52,9 +52,9 @@
local installdir = gethome() .. "/" .. dir
if options["dry-run"] then
local files = filelist(installdir)
- if next(files) then
+ if files[1] then
print("\n" .. "For removal from " .. installdir .. ":")
- for _,file in pairs(filelist(installdir)) do
+ for _,file in ipairs(ordered_filelist(installdir)) do
print("- " .. file)
end
end
Modified: trunk/Master/texmf-dist/scripts/l3build/l3build.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build.lua 2022-04-19 12:33:25 UTC (rev 63078)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build.lua 2022-04-19 20:06:46 UTC (rev 63079)
@@ -25,7 +25,7 @@
--]]
-- Version information
-release_date = "2022-04-12"
+release_date = "2022-04-19"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
@@ -156,7 +156,7 @@
if config ~= "build" then
testdir = testdir .. "-" .. config
end
- for _,i in ipairs(filelist(testdir,"*" .. os_diffext)) do
+ for _,i in ipairs(ordered_filelist(testdir,"*" .. os_diffext)) do
print(" - " .. testdir .. "/" .. i)
end
print("")
Modified: trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx 2022-04-19 12:33:25 UTC (rev 63078)
+++ trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx 2022-04-19 20:06:46 UTC (rev 63079)
@@ -237,7 +237,7 @@
% }^^A
% }
%
-% \date{Released 2022-04-12}
+% \date{Released 2022-04-19}
%
% \maketitle
% \tableofcontents
@@ -1743,6 +1743,13 @@
% all files in the \meta{path}.
% \end{function}
%
+% \begin{function}{ordered_filelist()}
+% \begin{syntax}
+% |ordered_filelist(|\meta{path}, \oarg{glob}|)|
+% \end{syntax}
+% Like |filelist()| but returning a sorted table.
+% \end{function}
+%
% \begin{function}{glob_to_pattern()}
% \begin{syntax}
% |glob_to_pattern(|\meta{glob}|)|
More information about the tex-live-commits
mailing list.