From 293dbc2133c205a25092c69c509c285035ec3b21 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 25 Mar 2020 21:10:32 +0000 Subject: l3build (25mar20) git-svn-id: svn://tug.org/texlive/trunk@54544 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/scripts/l3build/l3build-clean.lua | 26 +++++++++++++++++----- .../scripts/l3build/l3build-file-functions.lua | 2 +- .../scripts/l3build/l3build-variables.lua | 7 ++++++ Master/texmf-dist/scripts/l3build/l3build.lua | 2 +- 4 files changed, 30 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/scripts') diff --git a/Master/texmf-dist/scripts/l3build/l3build-clean.lua b/Master/texmf-dist/scripts/l3build/l3build-clean.lua index 01927a71d04..27ed42be9c8 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-clean.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-clean.lua @@ -1,6 +1,6 @@ --[[ -File l3build-clean.lua Copyright (C) 2018 The LaTeX3 Project +File l3build-clean.lua Copyright (C) 2018,2020 The LaTeX3 Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -34,12 +34,28 @@ function clean() cleandir(testdir) + cleandir(typesetdir) + cleandir(unpackdir) - for _,i in ipairs(cleanfiles) do - for _,dir in pairs(remove_duplicates({maindir, sourcefiledir, docfiledir})) do - errorlevel = rm(dir, i) + errorlevel + + if errorlevel ~= 0 then return errorlevel end + + local clean_list = { } + for _,dir in pairs(remove_duplicates({maindir,sourcefiledir,docfiledir})) do + for _,glob in pairs(cleanfiles) do + for file,_ in pairs(tree(dir,glob)) do + clean_list[file] = true + end + end + for _,glob in pairs(sourcefiles) do + for file,_ in pairs(tree(dir,glob)) do + clean_list[file] = nil + end + end + for file,_ in pairs(clean_list) do + errorlevel = rm(dir,file) + if errorlevel ~= 0 then return errorlevel end end end - return errorlevel + + return 0 end function bundleclean() diff --git a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua index 6c420f80a26..7d13fc933ef 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua @@ -241,7 +241,7 @@ function direxists(dir) errorlevel = execute("if not exist \"" .. unix_to_win(dir) .. "\" exit 1") else - errorlevel = execute("[ -d " .. dir .. " ]") + errorlevel = execute("[ -d '" .. dir .. "' ]") end if errorlevel ~= 0 then return false diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua index dcb25218691..432bfe6b15d 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua @@ -128,6 +128,13 @@ specialformats.latex = specialformats.latex or { ptex = {binary = "eptex"}, uptex = {binary = "euptex"} } +if not string.find(status.banner,"2019") then + specialformats.latex.luatex = specialformats.latex.luatex or + {binary = "luahbtex",format = "lualatex"} + specialformats["latex-dev"] = specialformats["latex-dev"] or + {luatex = {binary="luahbtex",format = "lualatex-dev"}} +end + stdengine = stdengine or "pdftex" -- The tests themselves diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 63eed703068..083b6b81baf 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 = "2020-03-16" +release_date = "2020-03-25" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") -- cgit v1.2.3