summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-01-09 21:08:00 +0000
committerKarl Berry <karl@freefriends.org>2024-01-09 21:08:00 +0000
commitf02046b3f6cb97b9206720be8ad437c26fd6d527 (patch)
tree812f1018399d4105dfd752eb865bd35cf052cb4a
parentc7282435cd999572e255e6d6d7f0499b71269475 (diff)
l3build (9jan24)
git-svn-id: svn://tug.org/texlive/trunk@69360 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/linked_scripts/l3build/l3build.lua2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl12
-rw-r--r--Master/texmf-dist/doc/latex/l3build/CHANGELOG.md10
-rw-r--r--Master/texmf-dist/doc/latex/l3build/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3build/l3build.pdfbin747742 -> 749004 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.138
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.man1.pdfbin14890 -> 15775 bytes
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua2
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
-rw-r--r--Master/texmf-dist/source/latex/l3build/l3build.dtx19
10 files changed, 63 insertions, 24 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
index 995eefe533a..8b0dcbda6f8 100644
--- a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
+++ b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2024-01-04"
+release_date = "2024-01-09"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 3fcf84bb117..60e5b1fede8 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 68903 2023-11-19 18:53:19Z karl $
+# $Id: tlmgr.pl 69327 2024-01-07 11:10:51Z preining $
# Copyright 2008-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -8,8 +8,8 @@
use strict; use warnings;
-my $svnrev = '$Revision: 68903 $';
-my $datrev = '$Date: 2023-11-19 19:53:19 +0100 (Sun, 19 Nov 2023) $';
+my $svnrev = '$Revision: 69327 $';
+my $datrev = '$Date: 2024-01-07 12:10:51 +0100 (Sun, 07 Jan 2024) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -690,7 +690,9 @@ for the full story.\n";
# if we are asked to use persistent connections try to start it here
ddebug("tlmgr:main: do persistent downloads = $opts{'persistent-downloads'}\n");
if ($opts{'persistent-downloads'}) {
- TeXLive::TLUtils::setup_persistent_downloads() ;
+ TeXLive::TLUtils::setup_persistent_downloads(
+ "$Master/tlpkg/installer/curl/curl-ca-bundle.crt"
+ ) ;
}
if (!defined($::tldownload_server)) {
debug("tlmgr:main: ::tldownload_server not defined\n");
@@ -10279,7 +10281,7 @@ This script and its documentation were written for the TeX Live
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 68903 2023-11-19 18:53:19Z karl $
+$Id: tlmgr.pl 69327 2024-01-07 11:10:51Z preining $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
index c06b9a380fa..02ad0179e19 100644
--- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
@@ -7,6 +7,13 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2024-01-09]
+
+### Fixed
+- Type of return value of `runtest_tasks()` in doc
+- Print failures correctly when these occur in multiple configurations
+ including the core (`build`) one
+
## [2024-01-04]
### Changed
@@ -753,7 +760,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/2024-01-04...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2024-01-09...HEAD
+[2024-01-09]: https://github.com/latex3/l3build/compare/2024-01-04...2024-01-09
[2024-01-04]: https://github.com/latex3/l3build/compare/2023-12-15...2024-01-04
[2023-12-15]: https://github.com/latex3/l3build/compare/2023-12-13-2...2023-12-15
[2023-12-13-2]: https://github.com/latex3/l3build/compare/2023-12-13...2023-12-13-2
diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md
index c2bba6cc5bd..1196dc6d422 100644
--- a/Master/texmf-dist/doc/latex/l3build/README.md
+++ b/Master/texmf-dist/doc/latex/l3build/README.md
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX
=================================================
-Release 2024-01-04
+Release 2024-01-09
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
index 763d37dc2d7..8883e78d95f 100644
--- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf
+++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1
index e6d604b5601..47462ae7a4e 100644
--- a/Master/texmf-dist/doc/man/man1/l3build.1
+++ b/Master/texmf-dist/doc/man/man1/l3build.1
@@ -1,4 +1,4 @@
-.TH l3build 1 "2024-01-04"
+.TH l3build 1 "2024-01-09"
.SH NAME
l3build \- Checking and building packages
.SH SYNOPSIS
@@ -10,53 +10,77 @@ can be used by any modern TeX distribution with the texlua interpreter. A
package for building with l3build can be written in any TeX dialect; its
defaults are set up for LaTeX packages written in the DocStrip style.
.PP
-The most commonly used l3build targets are:
+The standard l3build targets are:
.IP check
Run all automated tests
.IP clean
Clean out directory tree
+.IP ctan
+Create CTAN-ready archive
.IP doc
Typesets all documentation files
.IP install
Installs files into the local texmf tree
+.IP manifest
+Creates a manifest file
.IP save
Saves test validation log
.IP tag
-Update release tags in files
+Updates release tags in files
.IP uninstall
Uninstalls files from the local texmf tree
.IP unpack
Unpacks the source files into the build tree
+.IP upload
+Send archive to CTAN for public release
.SH OPTIONS
-Various options apply
+Various options apply
.IP --config|-c
Sets the config(s) used for running tests
.IP --date
Sets the date to insert into sources
+.IP --debug
+Runs target in debug mode
+.IP --dirty
+Skip cleaning up the test area
.IP --dry-run
-Dry run for install
+Dry run for install or upload
+.IP --email
+Email address of CTAN uploader
.IP --engine|-e
Sets the engine(s) to use for running test
.IP --epoch
Sets the epoch for tests and typesetting
+.IP --file|-F
+Take the upload announcement from the given file
.IP --first
Name of first test to run
.IP --force|-f
Force tests to run if engine is not set up
+.IP --full
+Install all files
.IP --halt-on-error|-H
Stops running tests after the first failure
+.IP --help|-h
+Print help message and exit
.IP --last
Name of last test to run
-.IP --pdf|-p
-Check/save PDF files
+.IP --message|-m
+Text for upload announcement message
.IP --quiet|-q
Suppresses TeX output when unpacking
.IP --rerun
Skip setup: simply rerun tests
+.IP --show-log-on-error
+Show the full log of the failure with 'halt-on-error'
+.IP --show-saves|-S
+Show the invocation to update failing .tlg files
.IP --shuffle
Shuffle order of tests
.IP --texmfhome
Location of user texmf tree
+.IP --version
+Print version information and exit
.SH BUGS
.SH AUTHOR
The LaTeX Project (latex-team@latex-project.org)
diff --git a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
index 5d34b0193cd..5074a796303 100644
--- a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 1f2b04ce5a3..2a50c590dbb 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -1058,7 +1058,7 @@ end
-- A short auxiliary to print the list of differences for check
function checkdiff(config)
local testdir = testdir
- if config then
+ if config and config ~= "build" then
testdir = testdir .. "-" .. config
end
local diff_files = ordered_filelist(testdir, "*" .. os_diffext)
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 995eefe533a..8b0dcbda6f8 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 = "2024-01-04"
+release_date = "2024-01-09"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx
index 047f43f4df1..e02dfd6f533 100644
--- a/Master/texmf-dist/source/latex/l3build/l3build.dtx
+++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx
@@ -251,7 +251,7 @@
% }^^A
% }
%
-% \date{Released 2024-01-04}
+% \date{Released 2024-01-09}
%
% \maketitle
% \tableofcontents
@@ -713,24 +713,28 @@
%
% For example, for the core \LaTeXe{} tests the main test files are contained
% in a directory |testfiles|. To test font loading for \XeTeX{} and \LuaTeX{}
-% there are a second set of tests in |testfiles-TU| which use the short
-% |config-TU.lua| file shown in Listing~\vref{lst:configs}. To run both sets of
-% tests, the main |build.lua| file contains the setting
+% there are a second set of tests in |testfiles-TU| which use a short
+% |config-TU.lua| file similar to the one shown in Listing~\vref{lst:configs}.
+% To run both sets of tests, the main |build.lua| file contains the setting
% |checkconfigs = {"build", "config-TU"}|. This will cause \pkg{l3build} to run
% first using no additional settings (\emph{i.e.}~reading the normal
% |build.lua| file alone), then running \emph{also} loading the settings from
% |config-TU.lua|.
% \begin{floating-listing}[caption={Example of using additional (or overriding) settings for configuring tests in a different subdirectory.},label={lst:configs}]
% -- Special config for these tests
-% checksearch = true
+% stdengine = "xetex"
% checkengines = {"xetex","luatex"}
+% checksearch = true
% testfiledir = "testfiles-TU"
% \end{floating-listing}
%
% To allow selection of one or more configurations, and to allow saving of
% |.tlg| files in non-standard configurations, the |--config| (|-c|) option may
% be used. This works in the same way as |--engine|: it takes a comma list of
-% configurations to apply, overriding \var{checkconfigs}.
+% configurations to apply, overriding \var{checkconfigs}. For example, in the
+% directory containing |config-TU.lua|, you can use
+% |l3build check -cconfig-TU <name(s)>| and |l3build save -cconfig-TU <name(s)>|
+% to check and save tests in |testfiles-TU| directory.
%
% \subsection{Dependencies}
%
@@ -1157,7 +1161,8 @@
% of the current test (this is equivalent to \TeX{}'s \cs{jobname},
% \emph{i.e.}~it lacks an extension) and the current run number.
% The function |runtest_tasks| is run after the main call to the
-% engine for a test cycle. It should return an errorlevel value.
+% engine for a test cycle. It should return a string consists of task(s),
+% i.e., the CLI command(s) to execute.
% If more than one task is required, these should be separated
% by use of |os_concat|, a string variable defined by \pkg{l3build} as the
% correct concatenation marker for the system. An example of |runtest_tasks|