summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3build
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-02-25 03:00:58 +0000
committerNorbert Preining <norbert@preining.info>2022-02-25 03:00:58 +0000
commit157cc9e776520d0b7d488317a69a10d4ae4d493b (patch)
treec12e70126efbe1e6c930d2e26223a004b075306e /macros/latex/contrib/l3build
parentdc88afec77f198ebb8774f9c87146f2985e8f156 (diff)
CTAN sync 202202250300
Diffstat (limited to 'macros/latex/contrib/l3build')
-rw-r--r--macros/latex/contrib/l3build/CHANGELOG.md19
-rw-r--r--macros/latex/contrib/l3build/README.md4
-rw-r--r--macros/latex/contrib/l3build/l3build-arguments.lua4
-rw-r--r--macros/latex/contrib/l3build/l3build-file-functions.lua7
-rw-r--r--macros/latex/contrib/l3build/l3build-upload.lua10
-rw-r--r--macros/latex/contrib/l3build/l3build.12
-rw-r--r--macros/latex/contrib/l3build/l3build.dtx8
-rwxr-xr-xmacros/latex/contrib/l3build/l3build.lua4
-rw-r--r--macros/latex/contrib/l3build/l3build.pdfbin741143 -> 741313 bytes
9 files changed, 44 insertions, 14 deletions
diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md
index 9c0dbdebb0..a8002e8d80 100644
--- a/macros/latex/contrib/l3build/CHANGELOG.md
+++ b/macros/latex/contrib/l3build/CHANGELOG.md
@@ -7,6 +7,22 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2022-02-24]
+
+### Fixed
+- Creation of subdirectories in TDS structures on Unix-like systems
+
+- use `form-string` rather than `form` for all curl fields to avoid
+ misinterpreting leading `@` or `<` eg a description starting `<p>`
+
+- Check the boolean value returned by executing shell commands in
+ `l3build-upload` and throw an error if this is false. This fixes
+ the issue that previously "validation successful" was reported
+ if `curl` failed.
+
+### Changed
+- Documentation of how to validate an upload
+
## [2021-12-14]
### Fixed
@@ -558,7 +574,8 @@ this project uses date-based 'snapshot' version identifiers.
- Rationalise short option names: removed `-d`, `-E`, `-r`
- Target `cmdcheck`: specific to LaTeX kernel work
-[Unreleased]: https://github.com/latex3/l3build/compare/2021-12-14...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2022-02-24...HEAD
+[2022-02-24]: https://github.com/latex3/l3build/compare/2021-12-14...2022-02-24
[2021-12-14]: https://github.com/latex3/l3build/compare/2021-12-09...2021-12-14
[2021-12-09]: https://github.com/latex3/l3build/compare/2021-12-06...2021-12-09
[2021-12-06]: https://github.com/latex3/l3build/compare/2021-11-29...2021-12-06
diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md
index 0b09e63bab..d2cc67987d 100644
--- a/macros/latex/contrib/l3build/README.md
+++ b/macros/latex/contrib/l3build/README.md
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX
=================================================
-Release 2021-12-14
+Release 2022-02-24
Overview
--------
@@ -31,6 +31,6 @@ The LaTeX kernel is developed by [The LaTeX Project](https://latex-project.org).
-----
-<p>Copyright (C) 2014-2021 The LaTeX Project <br />
+<p>Copyright (C) 2014-2022 The LaTeX Project <br />
<a href="http://latex-project.org/">http://latex-project.org/</a> <br />
All rights reserved.</p>
diff --git a/macros/latex/contrib/l3build/l3build-arguments.lua b/macros/latex/contrib/l3build/l3build-arguments.lua
index fdabb9d949..49c80a7596 100644
--- a/macros/latex/contrib/l3build/l3build-arguments.lua
+++ b/macros/latex/contrib/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/macros/latex/contrib/l3build/l3build-file-functions.lua b/macros/latex/contrib/l3build/l3build-file-functions.lua
index 4aa591dd50..ca393335a1 100644
--- a/macros/latex/contrib/l3build/l3build-file-functions.lua
+++ b/macros/latex/contrib/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/macros/latex/contrib/l3build/l3build-upload.lua b/macros/latex/contrib/l3build/l3build-upload.lua
index 4b3aa7aea6..d6328d62fe 100644
--- a/macros/latex/contrib/l3build/l3build-upload.lua
+++ b/macros/latex/contrib/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/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1
index 592424ba4f..1eaa9ca865 100644
--- a/macros/latex/contrib/l3build/l3build.1
+++ b/macros/latex/contrib/l3build/l3build.1
@@ -1,4 +1,4 @@
-.TH l3build 1 "2021-12-14"
+.TH l3build 1 "2022-02-24"
.SH NAME
l3build \- Checking and building packages
.SH SYNOPSIS
diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx
index e385c5249d..df9d152f9e 100644
--- a/macros/latex/contrib/l3build/l3build.dtx
+++ b/macros/latex/contrib/l3build/l3build.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-% File l3build.dtx (C) Copyright 2014-2021 The LaTeX Project
+% File l3build.dtx (C) Copyright 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
@@ -237,7 +237,7 @@
% }^^A
% }
%
-% \date{Released 2021-12-14}
+% \date{Released 2022-02-24}
%
% \maketitle
% \tableofcontents
@@ -1555,6 +1555,10 @@
% |uploadconfig.curl_file| field in the |build.lua| file to specify an
% alternative name or location for this file.
%
+% \paragraph{Validating}
+% To validate your upload but not actually submit to CTAN, you may use
+% the |--dry-run| command-line option.
+%
% \paragraph{Debugging}
% If you have have difficulty with the upload process, add the option |--debug| to divert
% the request from CTAN to a service that redirects the input back
diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua
index 9c811c3fc8..744f7628b8 100755
--- a/macros/latex/contrib/l3build/l3build.lua
+++ b/macros/latex/contrib/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")
diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf
index 6f9d13aff9..9e229e7248 100644
--- a/macros/latex/contrib/l3build/l3build.pdf
+++ b/macros/latex/contrib/l3build/l3build.pdf
Binary files differ