summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-09-13 20:40:56 +0000
committerKarl Berry <karl@freefriends.org>2023-09-13 20:40:56 +0000
commit99bdd2e42bf8c8ec861eb8b6a7708f63396c5d8e (patch)
tree31f555c33bcc0153b169a88c625085b6c39389ee /Master/texmf-dist/scripts
parent8f22ac5379816e4b6bdd9e5c9dc981b4223187b4 (diff)
latex-dev (13sep23)
git-svn-id: svn://tug.org/texlive/trunk@68270 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua3
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-install.lua1
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-typesetting.lua6
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-variables.lua2
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
5 files changed, 10 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 3e26de429be..3279f2c4a16 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -171,6 +171,9 @@ local function normalize_log(content,engine,errlevels)
-- Deal with dates
if match(line, "[^<]%d%d%d%d[/%-]%d%d[/%-]%d%d") then
line = gsub(line,"%d%d%d%d[/%-]%d%d[/%-]%d%d","....-..-..")
+ -- Semantic version-like ones
+ line = gsub(line,"v%d+%.%d+%.%d+[%d%a.+%-]*","v...")
+ -- Classical LaTeX version strings
line = gsub(line,"v%d+%.?%d?%d?%w?","v...")
end
-- Deal with leading spaces for file and page number lines
diff --git a/Master/texmf-dist/scripts/l3build/l3build-install.lua b/Master/texmf-dist/scripts/l3build/l3build-install.lua
index 64d29fc5904..e96259caa30 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-install.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-install.lua
@@ -215,6 +215,7 @@ function install_files(target,full,dry_run)
dir = dir or currentdir
include = include or { }
exclude = exclude or { }
+ insert(exclude,excludefiles)
local excludelist = { }
for _,glob_table in pairs(exclude) do
for _,glob in pairs(glob_table) do
diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
index d0e491d4c59..c12c5447381 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
@@ -72,8 +72,10 @@ function bibtex(name,dir)
os_grepexe .. " \"^" .. grep .. "bibdata{\" " .. name .. ".aux > "
.. os_null
) == 0 then
- return runcmd(bibtexexe .. " " .. bibtexopts .. " " .. name,dir,
- {"BIBINPUTS","BSTINPUTS"})
+ local errorlevel = runcmd(bibtexexe .. " " .. bibtexopts .. " " .. name,
+ dir,{"BIBINPUTS","BSTINPUTS"})
+ -- BibTeX(8) signals warnings with errorlevel 1
+ if errorlevel > 1 then return errorlevel else return 0 end
end
end
return 0
diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
index 204c386f690..bbebf2fd081 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
@@ -83,7 +83,7 @@ cleanfiles = cleanfiles or {"*.log", "*.pdf", "*.zip"}
demofiles = demofiles or { }
docfiles = docfiles or { }
dynamicfiles = dynamicfiles or { }
-excludefiles = excludefiles or {"*~"}
+excludefiles = excludefiles or {"*~","build.lua","config-*.lua"}
exefiles = exefiles or { }
installfiles = installfiles or {"*.sty","*.cls"}
makeindexfiles = makeindexfiles or {"*.ist"}
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 1ac608c9711..e520cd18110 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-07"
+release_date = "2023-09-13"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")