From d1fff759e03eca70de32c79c2b9fcd3eacbda5c0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 26 Sep 2018 20:47:50 +0000 Subject: l3build (26sep18) git-svn-id: svn://tug.org/texlive/trunk@48767 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/l3build/CHANGELOG.md | 5 ++++- Master/texmf-dist/doc/latex/l3build/README.md | 2 +- Master/texmf-dist/doc/latex/l3build/l3build.pdf | Bin 674352 -> 674707 bytes Master/texmf-dist/doc/man/man1/l3build.1 | 2 +- Master/texmf-dist/doc/man/man1/l3build.man1.pdf | Bin 15260 -> 15376 bytes .../texmf-dist/scripts/l3build/l3build-check.lua | 7 +------ .../scripts/l3build/l3build-typesetting.lua | 7 ++----- Master/texmf-dist/scripts/l3build/l3build.lua | 6 +++--- Master/texmf-dist/source/latex/l3build/l3build.dtx | 2 +- 9 files changed, 13 insertions(+), 18 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index b6446a428af..d2101f6fe9c 100644 --- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md @@ -7,6 +7,8 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2018-09-26] + ## [2018-09-23] ## Changed @@ -168,7 +170,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/2018-09-23...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2018-09-26...HEAD +[2018-09-26]: https://github.com/latex3/l3build/compare/2018-09-23...2018-09-26 [2018-09-23]: https://github.com/latex3/l3build/compare/2018-09-21...2018-09-23 [2018-09-21]: https://github.com/latex3/l3build/compare/2018-08-07...2018-09-21 [2018-08-07]: https://github.com/latex3/l3build/compare/2018-08-04...2018-08-07 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index 45a2278c961..5cd4a6bfbfd 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 2018-09-23 +Release 2018-09-26 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf index 0de4f839baf..4af47c724ba 100644 Binary files a/Master/texmf-dist/doc/latex/l3build/l3build.pdf and b/Master/texmf-dist/doc/latex/l3build/l3build.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1 index 1060047cb42..160e805e288 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 "2018-09-23" +.TH l3build 1 "2018-09-26" .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 a7767b32c93..a54d0bc91a7 100644 Binary files a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf and b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf differ diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index 1c20067d9b6..556f326cd70 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -30,9 +30,6 @@ local output = io.output local rnd = math.random -local var_value = kpse.var_value -local set_program_name = kpse.set_program_name - local luatex_version = status.luatex_version local len = string.len @@ -729,8 +726,6 @@ function runtest(name, engine, hide, ext, pdfmode, breakout) break end end - -- Deal with TEXMFCNF - set_program_name("kpsewhich") -- Clean out any dynamic files for _,filetype in pairs(dynamicfiles) do rm(testdir,filetype) @@ -747,7 +742,7 @@ function runtest(name, engine, hide, ext, pdfmode, breakout) os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0" .. os_concat .. -- Allow for local texmf files - os_setenv .. " TEXMFCNF=." .. os_pathsep .. var_value("TEXMFCNF") + os_setenv .. " TEXMFCNF=." .. os_pathsep .. os_concat .. (forcecheckepoch and setepoch() or "") .. -- Ensure lines are of a known length diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua index 9f732f7fab4..6ce80cdf7a3 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua @@ -29,9 +29,6 @@ for those people who are interested. local gsub = string.gsub local match = string.match -local var_value = kpse.var_value -local set_program_name = kpse.set_program_name - function dvitopdf(name, dir, engine, hide) if match(engine, "^u?ptex$") then run( @@ -55,14 +52,13 @@ end -- An auxiliary used to set up the environmental variables function runtool(subdir, dir, envvar, command) - set_program_name("kpsewhich") dir = dir or "." return( run( typesetdir .. "/" .. subdir, (forcedocepoch and setepoch() or "") .. -- Allow for local texmf files - os_setenv .. " TEXMFCNF=." .. os_pathsep .. var_value("TEXMFCNF") + os_setenv .. " TEXMFCNF=." .. os_pathsep .. os_concat .. os_setenv .. " " .. envvar .. "=." .. os_pathsep .. abspath(localdir) .. os_pathsep @@ -254,3 +250,4 @@ function doc(files) end return 0 end + diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 827d3856a74..cdf1dead187 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-09-23" +release_date = "2018-09-26" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -140,8 +140,8 @@ if options["target"] == "check" then for _,config in ipairs(failed) do print("Failed tests for configuration " .. config .. ":") print("\n Check failed with difference files") - if failed ~= "build" then - local testdir = testdir .. "-" .. failed + if config ~= "build" then + local testdir = testdir .. "-" .. config end for _,i in ipairs(filelist(testdir,"*" .. os_diffext)) do print(" - " .. testdir .. "/" .. i) diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index 352db17b2fc..368ef71c42a 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -223,7 +223,7 @@ % }^^A % } % -% \date{Released 2018-09-23} +% \date{Released 2018-09-26} % % \maketitle % \tableofcontents -- cgit v1.2.3