summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-18 22:31:29 +0000
committerKarl Berry <karl@freefriends.org>2020-02-18 22:31:29 +0000
commitcbb50a7bff75caadde7a46cb6bafe42f458ad320 (patch)
treef6f9e8cf8d8489be82ac9d6d6306769abfd9a556 /Master/texmf-dist/scripts
parenta340b6ccbdc7ac8f174570c9618d1b6e7a0cfd54 (diff)
l3build (18feb20)
git-svn-id: svn://tug.org/texlive/trunk@53834 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-arguments.lua8
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-aux.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua13
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-ctan.lua6
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-help.lua17
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-manifest.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-stdmain.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-tagging.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-typesetting.lua19
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-unpack.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-upload.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-variables.lua4
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
14 files changed, 54 insertions, 29 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
index cbf68c6254a..aa2f086d616 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-arguments.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-arguments.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
@@ -108,6 +108,7 @@ option_list =
},
help =
{
+ desc = "Print this message and exit",
short = "h",
type = "boolean"
},
@@ -147,6 +148,11 @@ option_list =
{
desc = "Location of user texmf tree",
type = "string"
+ },
+ version =
+ {
+ desc = "Print version information and exit",
+ type = "boolean"
}
}
diff --git a/Master/texmf-dist/scripts/l3build/l3build-aux.lua b/Master/texmf-dist/scripts/l3build/l3build-aux.lua
index 2146d9a1424..8fa4b0cd82c 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-aux.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-aux.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-aux.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-aux.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
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 8bafe0591c0..17e63217871 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-check.lua Copyright (C) 2018,2019 The LaTeX3 Project
+File l3build-check.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
@@ -292,9 +292,14 @@ local function normalize_log(content,engine,errlevels)
if recordstatus then
new_content = new_content .. '***************' .. os_newline
for i = 1, checkruns do
- new_content = new_content ..
- 'Compilation ' .. i .. ' of test file completed with exit status ' ..
- errlevels[i] .. os_newline
+ if (errlevels[i]==nil) then
+ new_content = new_content ..
+ 'Compilation ' .. i .. ' of test file skipped ' .. os_newline
+ else
+ new_content = new_content ..
+ 'Compilation ' .. i .. ' of test file completed with exit status ' ..
+ errlevels[i] .. os_newline
+ end
end
end
return new_content
diff --git a/Master/texmf-dist/scripts/l3build/l3build-ctan.lua b/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
index 09b10e0ecad..df1daf97287 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-ctan.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-ctan.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
@@ -54,7 +54,7 @@ function copyctan()
end
copyfiles(sourcefiles,sourcefiledir)
for _,file in pairs(textfiles) do
- cp(file, currentdir, ctandir .. "/" .. ctanpkg)
+ cp(file, textfiledir, ctandir .. "/" .. ctanpkg)
end
end
@@ -127,7 +127,7 @@ function ctan()
end
if errorlevel == 0 then
for _,i in ipairs(textfiles) do
- for _,j in pairs({unpackdir, currentdir}) do
+ for _,j in pairs({unpackdir, textfiledir}) do
cp(i, j, ctandir .. "/" .. ctanpkg)
cp(i, j, tdsdir .. "/doc/" .. tdsroot .. "/" .. bundle)
end
diff --git a/Master/texmf-dist/scripts/l3build/l3build-help.lua b/Master/texmf-dist/scripts/l3build/l3build-help.lua
index 8c3877595fc..055fc1a9186 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-help.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-help.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-help.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-help.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
@@ -31,7 +31,8 @@ function version()
print(
"\n" ..
"l3build: A testing and building system for LaTeX\n\n" ..
- "Release " .. release_date
+ "Release " .. release_date .. "\n" ..
+ "Copyright (C) 2014-2020 The LaTeX3 Project"
)
end
@@ -53,12 +54,12 @@ function help()
end
local scriptname = "l3build"
- if not match(arg[0], "l3build(%.lua)$") then
+ if not (match(arg[0], "l3build%.lua$") or match(arg[0],"l3build$")) then
scriptname = arg[0]
end
- print("usage: " .. scriptname .. " <command> [<options>] [<names>]")
+ print("usage: " .. scriptname .. " <target> [<options>] [<names>]")
print("")
- print("Valid commands are:")
+ print("Valid targets are:")
local longest,t = setup_list(target_list)
for _,k in ipairs(t) do
local target = target_list[k]
@@ -82,5 +83,9 @@ function help()
end
end
print("")
- print("See l3build.pdf for further details.")
+ print("Full manual available via 'texdoc l3build'.")
+ print("")
+ print("Repository : https://github.com/latex3/l3build")
+ print("Bug tracker : https://github.com/latex3/l3build/issues")
+ print("Copyright (C) 2014-2020 The LaTeX3 Project")
end
diff --git a/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua b/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua
index fb46eb1d369..26bf1ca008a 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-manifest-setup.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-manifest-setup.lua Copyright (C) 2017-2018 The LaTeX3 Project
+File l3build-manifest-setup.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
diff --git a/Master/texmf-dist/scripts/l3build/l3build-manifest.lua b/Master/texmf-dist/scripts/l3build/l3build-manifest.lua
index 3b899d55fd8..dc5138952c8 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-manifest.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-manifest.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-manifest.lua Copyright (C) 2017-2018 The LaTeX3 Project
+File l3build-manifest.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
diff --git a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
index 9123349ee08..10303b71f71 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-stdmain.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-stdmain.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
diff --git a/Master/texmf-dist/scripts/l3build/l3build-tagging.lua b/Master/texmf-dist/scripts/l3build/l3build-tagging.lua
index 2c0c1641a40..a00180b34cb 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-tagging.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-tagging.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-tagging.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-tagging.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
diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
index fe6a6a58dcc..b76edd913b2 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
@@ -127,9 +127,10 @@ function makeindex(name,dir,inext,outext,logext,style)
return 0
end
-function tex(file,dir)
+function tex(file,dir,cmd)
local dir = dir or "."
- return runcmd(typesetexe .. " " .. typesetopts .. " \"" .. typesetcmds
+ local cmd = cmd or typesetexe .. typesetopts
+ return runcmd(cmd .. " \"" .. typesetcmds
.. "\\input " .. file .. "\"",
dir,{"TEXINPUTS","LUAINPUTS"})
end
@@ -138,7 +139,13 @@ local function typesetpdf(file,dir)
local dir = dir or "."
local name = jobname(file)
print("Typesetting " .. name)
- local errorlevel = typeset(file,dir)
+ local fn = typeset
+ local cmd = typesetexe .. " " .. typesetopts
+ if specialtypesetting and specialtypesetting[file] then
+ fn = specialtypesetting[file].func or fn
+ cmd = specialtypesetting[file].cmd or cmd
+ end
+ local errorlevel = fn(file,dir,cmd)
if errorlevel ~= 0 then
print(" ! Compilation failed")
return errorlevel
@@ -148,9 +155,9 @@ local function typesetpdf(file,dir)
return cp(pdfname,dir,docfiledir)
end
-typeset = typeset or function(file,dir)
+typeset = typeset or function(file,dir,exe)
dir = dir or "."
- local errorlevel = tex(file,dir)
+ local errorlevel = tex(file,dir,exe)
if errorlevel ~= 0 then
return errorlevel
end
@@ -163,7 +170,7 @@ typeset = typeset or function(file,dir)
errorlevel =
makeindex(name,dir,".glo",".gls",".glg",glossarystyle) +
makeindex(name,dir,".idx",".ind",".ilg",indexstyle) +
- tex(file,dir)
+ tex(file,dir,exe)
if errorlevel ~= 0 then break end
end
return errorlevel
diff --git a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
index 89bbfaa17f6..47aaca7ca72 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-unpack.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-unpack.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
diff --git a/Master/texmf-dist/scripts/l3build/l3build-upload.lua b/Master/texmf-dist/scripts/l3build/l3build-upload.lua
index 257cce61a37..fc25d5d6ac0 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-upload.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-upload.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-upload.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-upload.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
diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
index 06cfdd34aff..e69eb5aff1c 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-variables.lua Copyright (C) 2018,2019 The LaTeX3 Project
+File l3build-variables.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
@@ -43,6 +43,7 @@ maindir = maindir or currentdir
-- Substructure for file locations
docfiledir = docfiledir or currentdir
sourcefiledir = sourcefiledir or currentdir
+textfiledir = textfiledir or currentdir
supportdir = supportdir or maindir .. "/support"
testfiledir = testfiledir or currentdir .. "/testfiles"
testsuppdir = testsuppdir or testfiledir .. "/support"
@@ -151,6 +152,7 @@ end
-- Additional settings to fine-tune typesetting
glossarystyle = glossarystyle or "gglo.ist"
indexstyle = indexstyle or "gind.ist"
+specialtypesetting = specialtypesetting or { }
-- Supporting binaries and options
biberexe = biberexe or "biber"
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 2c244c1ea57..03521ce612e 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-02-03"
+release_date = "2020-02-17"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")