summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-08-24 20:34:17 +0000
committerKarl Berry <karl@freefriends.org>2019-08-24 20:34:17 +0000
commit509b34215883ebf181d665743177ea82522fa13c (patch)
tree38dabfa777adc6fa816e4225ece83cd2a6febf24
parent2fad25e7999ea7b2858792822a1e4d6aeb86784b (diff)
l3build (24aug19)
git-svn-id: svn://tug.org/texlive/trunk@51950 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/linked_scripts/l3build/l3build.lua2
-rw-r--r--Master/texmf-dist/doc/latex/l3build/CHANGELOG.md13
-rw-r--r--Master/texmf-dist/doc/latex/l3build/README.md34
-rw-r--r--Master/texmf-dist/doc/latex/l3build/l3build.pdfbin703339 -> 703605 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.12
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.man1.pdfbin15158 -> 15307 bytes
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua4
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-typesetting.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-unpack.lua3
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
-rw-r--r--Master/texmf-dist/source/latex/l3build/l3build.dtx2
11 files changed, 29 insertions, 35 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
index f0965e07587..627778ef228 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 = "2019-07-31"
+release_date = "2019-08-24"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
index 082bdb74e96..b7d20890a63 100644
--- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
@@ -7,6 +7,16 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2019-08-24]
+
+### Changed
+
+- Include `LUAINPUTS` when setting `TEXINPUTS` for `checksearch = false`, etc.
+
+### Fixed
+
+- Remove `.log` file before each check run: prevent inter-engine confusion
+
## [2019-07-31]
### Fixed
@@ -304,7 +314,8 @@ this project uses date-based 'snapshot' version identifiers.
- Rationalise short option names: removed `-d`, `-E`, `-r`
- Target `cmdcheck`: specific to LaTeX3 kernel work
-[Unreleased]: https://github.com/latex3/l3build/compare/2019-07-31...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2019-08-24...HEAD
+[2019-08-24]: https://github.com/latex3/l3build/compare/2019-07-31...2019-08-24
[2019-07-31]: https://github.com/latex3/l3build/compare/2019-07-30...2019-07-31
[2019-07-30]: https://github.com/latex3/l3build/compare/2019-06-27...2019-07-30
[2019-06-27]: https://github.com/latex3/l3build/compare/2019-06-26...2019-06-27
diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md
index 24187f0dc3f..16abce04d9e 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 LaTeX3
=================================================
-Release 2019-07-31
+Release 2019-08-24
Overview
--------
@@ -24,37 +24,13 @@ Issues
The issue tracker for LaTeX3 is currently located
[on GitHub](https://github.com/latex3/l3build/issues).
-The LaTeX3 Project
-------------------
+Development team
+----------------
-Development of LaTeX3 is carried out by
-[The LaTeX3 Project](http://www.latex-project.org/latex3.html). Currently,
-the team members are
-
-* Johannes Braams
-* David Carlisle
-* Robin Fairbairns
-* Morten Høgholm
-* Bruno Le Floch
-* Thomas Lotze
-* Frank Mittelbach
-* Will Robertson
-* Chris Rowley
-* Rainer Schöpf
-* Joseph Wright
-
-Former members of The LaTeX3 Project team were
-
-* Michael Downes
-* Denys Duchier
-* Alan Jeffrey
-* Martin Schröder
-
-The development team can be contacted
-by e-mail: <latex-team@latex-project.org>.
+The LaTeX kernel is developed by [The LaTeX3 Project](https://latex-project.org).
-----
-<p>Copyright (C) 2014-2018 The LaTeX3 Project <br />
+<p>Copyright (C) 2014-2019 The LaTeX3 Project <br />
<a href="http://latex-project.org/">http://latex-project.org/</a> <br />
All rights reserved.</p>
diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
index 356a3bffce8..41ff401a007 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 d1861aa2b9e..4addb91317d 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 "2019-07-31"
+.TH l3build 1 "2019-08-24"
.SH NAME
l3build \- Checking and building packages
.SH SYNOPSIS
diff --git a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
index 2271630c070..0fcb5a0677c 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 e45d210e537..c05defc792c 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -715,6 +715,8 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
for _,filetype in pairs(dynamicfiles) do
rm(testdir,filetype)
end
+ -- Ensure there is no stray .log file
+ rm(testdir,name .. logext)
local errlevels = {}
for i = 1, checkruns do
errlevels[i] = run(
@@ -723,6 +725,8 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
-- avoids any paths in the logs
os_setenv .. " TEXINPUTS=." .. (checksearch and os_pathsep or "")
.. os_concat ..
+ os_setenv .. " LUAINPUTS=." .. (checksearch and os_pathsep or "")
+ .. os_concat ..
-- Avoid spurious output from (u)pTeX
os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0"
.. os_concat ..
diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
index 5133d081719..eb2974cdf2d 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
@@ -127,7 +127,7 @@ function tex(file,dir)
local dir = dir or "."
return runcmd(typesetexe .. " " .. typesetopts .. " \"" .. typesetcmds
.. "\\input " .. file .. "\"",
- dir,{"TEXINPUTS"})
+ dir,{"TEXINPUTS","LUAINPUTS"})
end
local function typesetpdf(file,dir)
diff --git a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
index 9779502c2fc..89bbfaa17f6 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
@@ -85,6 +85,9 @@ bundleunpack = bundleunpack or function(sourcedirs, sources)
unpackdir .. "/" .. path,
os_setenv .. " TEXINPUTS=." .. os_pathsep
.. localdir .. (unpacksearch and os_pathsep or "") ..
+ os_concat ..
+ os_setenv .. " LUAINPUTS=." .. os_pathsep
+ .. localdir .. (unpacksearch and os_pathsep or "") ..
os_concat ..
unpackexe .. " " .. unpackopts .. " " .. name .. " < "
.. localdir .. "/yes"
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index f0965e07587..627778ef228 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 = "2019-07-31"
+release_date = "2019-08-24"
-- 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 4c8db7f9aa7..e4dbf51fb66 100644
--- a/Master/texmf-dist/source/latex/l3build/l3build.dtx
+++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx
@@ -229,7 +229,7 @@
% }^^A
% }
%
-% \date{Released 2019-07-31}
+% \date{Released 2019-08-24}
%
% \maketitle
% \tableofcontents