summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-24 20:54:22 +0000
committerKarl Berry <karl@freefriends.org>2022-02-24 20:54:22 +0000
commita376a4dd47279e493eb5c5b3130ccf92598b1504 (patch)
tree03a24e342883e6d4572f02dd3dfb6c08f78fe721 /Master/texmf-dist/scripts/l3build
parent9b56d03fb7b3241bc831b04e814e4f4b0218efe7 (diff)
l3 (24feb22)
git-svn-id: svn://tug.org/texlive/trunk@62165 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-arguments.lua4
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-file-functions.lua7
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-upload.lua10
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua4
4 files changed, 17 insertions, 8 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
index fdabb9d9497..49c80a75966 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-arguments.lua
@@ -49,7 +49,7 @@ option_list =
},
debug =
{
- desc = "Runs target in debug mode (not supported by all targets)",
+ desc = "Runs target in debug mode",
type = "boolean"
},
dirty =
@@ -59,7 +59,7 @@ option_list =
},
["dry-run"] =
{
- desc = "Dry run for install",
+ desc = "Dry run for install or upload",
type = "boolean"
},
email =
diff --git a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
index 4aa591dd50d..ca393335a18 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-file-functions.lua Copyright (C) 2018-2021 The LaTeX Project
+File l3build-file-functions.lua Copyright (C) 2018-2022 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -244,6 +244,11 @@ function cp(glob, source, dest)
) and 0 or 1
end
else
+ -- Ensure we get similar behavior on all platforms
+ if not direxists(dirname(dest)) then
+ errorlevel = mkdir(dirname(dest))
+ if errorlevel ~=0 then return errorlevel end
+ end
errorlevel = execute(
"cp -RLf '" .. p.cwd .. "' '" .. dest .. "'"
) and 0 or 1
diff --git a/Master/texmf-dist/scripts/l3build/l3build-upload.lua b/Master/texmf-dist/scripts/l3build/l3build-upload.lua
index 4b3aa7aea61..d6328d62fe3 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-upload.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-upload.lua
@@ -245,8 +245,12 @@ end
function shell(s)
local h = assert(popen(s, 'r'))
local t = assert(h:read('*a'))
- h:close()
- return t
+ local success = h:close()
+ if (success) then
+ return t
+ else
+ error("\nError from shell command:\n" .. s .. "\n" .. t .. "\n")
+ end
end
function construct_ctan_post(uploadfile,debug)
@@ -324,7 +328,7 @@ function ctan_single_field(fname,fvalue,max,desc,mandatory)
vs = vs:gsub('`','\\`')
vs = vs:gsub('\n','\\n')
-- for strings on commandline version ctan_post=ctan_post .. ' --form "' .. fname .. "=" .. vs .. '"'
- ctan_post=ctan_post .. '\nform="' .. fname .. '=' .. vs .. '"'
+ ctan_post=ctan_post .. '\nform-string="' .. fname .. '=' .. vs .. '"'
end
else
error("The value of the field '" .. fname .."' must be a scalar not a table")
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 9c811c3fc87..744f7628b8c 100755
--- a/Master/texmf-dist/scripts/l3build/l3build.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build.lua
@@ -2,7 +2,7 @@
--[[
-File l3build.lua Copyright (C) 2014-2021 The LaTeX Project
+File l3build.lua Copyright (C) 2014-2022 The LaTeX Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -25,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2021-12-14"
+release_date = "2022-02-24"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")