summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-08-07 22:07:07 +0000
committerKarl Berry <karl@freefriends.org>2018-08-07 22:07:07 +0000
commit3a62e05a651e7f80170acb4e0d3cf121b85a7f7b (patch)
treec81234acbbe18eff451a537c5456a8ae72f979e9 /Master/texmf-dist/scripts/l3build
parent706448acbd096e1a59cb987e8352abdd43624ebe (diff)
l3build (7aug18)
git-svn-id: svn://tug.org/texlive/trunk@48367 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-ctan.lua7
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-install.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-stdmain.lua4
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
5 files changed, 13 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index f5d1716de9e..de01514d5a9 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -580,7 +580,7 @@ function setup_check(name, engine)
if not (tlgfile or tpffile) then
if not locate({unpackdir, testfiledir}, {name .. lveext}) then
print(
- "Error: failed to find " .. tlgext .. ", " .. tlpext .. " or "
+ "Error: failed to find " .. tlgext .. ", " .. tpfext .. " or "
.. lveext .. " file for " .. name .. "!"
)
exit(1)
diff --git a/Master/texmf-dist/scripts/l3build/l3build-ctan.lua b/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
index 9d29f63f1c7..f1e0757e9b0 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
@@ -55,7 +55,12 @@ function copyctan()
end
end
--- Standard versions of the main targets for building modules
+function bundlectan()
+ local errorlevel = install_files(tdsdir,true)
+ if errorlevel ~=0 then return errorlevel end
+ copyctan()
+ return 0
+end
function ctan()
-- Always run tests for all engines
diff --git a/Master/texmf-dist/scripts/l3build/l3build-install.lua b/Master/texmf-dist/scripts/l3build/l3build-install.lua
index 2c4274454db..88ac5bad6f3 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-install.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-install.lua
@@ -100,7 +100,7 @@ function install_files(target,full,dry_run)
if tool and module == "base" then
subdir = nil
end
- dir = dir .. (subdir and "/" or "") .. subdir
+ dir = dir .. (subdir and ("/" .. subdir) or "")
local filenames = { }
for _,glob_table in pairs(files) do
for _,glob in pairs(glob_table) do
diff --git a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
index 6398288a0a2..26a229ce31c 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
@@ -58,6 +58,10 @@ target_list =
return 0
end
},
+ bundlectan =
+ {
+ func = bundlectan
+ },
bundleunpack =
{
func = bundleunpack,
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 2107f024d3a..1ece096e7f3 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 = "2018-08-04"
+release_date = "2018-08-07"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")