texlive[55426] trunk: l3build (5jun20)
commits+karl at tug.org
commits+karl at tug.org
Fri Jun 5 23:49:02 CEST 2020
Revision: 55426
http://tug.org/svn/texlive?view=revision&revision=55426
Author: karl
Date: 2020-06-05 23:49:02 +0200 (Fri, 05 Jun 2020)
Log Message:
-----------
l3build (5jun20)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/l3build/README.md
trunk/Master/texmf-dist/doc/latex/l3build/l3build.pdf
trunk/Master/texmf-dist/doc/man/man1/l3build.1
trunk/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua
trunk/Master/texmf-dist/scripts/l3build/l3build-upload.lua
trunk/Master/texmf-dist/scripts/l3build/l3build-variables.lua
trunk/Master/texmf-dist/scripts/l3build/l3build.lua
trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx
Modified: trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua 2020-06-05 21:48:38 UTC (rev 55425)
+++ trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua 2020-06-05 21:49:02 UTC (rev 55426)
@@ -25,7 +25,7 @@
--]]
-- Version information
-release_date = "2020-03-25"
+release_date = "2020-06-04"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
@@ -107,6 +107,7 @@
builddir = escapepath(builddir)
distribdir = escapepath(distribdir)
localdir = escapepath(localdir)
+resultdir = escapepath(resultdir)
testdir = escapepath(testdir)
typesetdir = escapepath(typesetdir)
unpackdir = escapepath(unpackdir)
@@ -158,6 +159,7 @@
print("\n Check failed with difference files")
local testdir = testdir
if config ~= "build" then
+ resultdir = resultdir .. "-" .. config
testdir = testdir .. "-" .. config
end
for _,i in ipairs(filelist(testdir,"*" .. os_diffext)) do
Modified: trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md 2020-06-05 21:48:38 UTC (rev 55425)
+++ trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md 2020-06-05 21:49:02 UTC (rev 55426)
@@ -7,6 +7,12 @@
## [Unreleased]
+## [2020-06-04]
+
+### Added
+- Store 'raw' PDF files when testing using PDFs, to allow further checks
+ with e.g. PDF validators
+
## [2020-03-25]
### Changed
@@ -466,7 +472,8 @@
- Rationalise short option names: removed `-d`, `-E`, `-r`
- Target `cmdcheck`: specific to LaTeX3 kernel work
-[Unreleased]: https://github.com/latex3/l3build/compare/2020-03-25...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2020-06-04...HEAD
+[2020-06-04]: https://github.com/latex3/l3build/compare/2020-03-25...2020-06-04
[2020-03-25]: https://github.com/latex3/l3build/compare/2020-03-16...2020-03-25
[2020-03-16]: https://github.com/latex3/l3build/compare/2020-03-13...2020-03-16
[2020-03-13]: https://github.com/latex3/l3build/compare/2020-03-12...2020-03-13
Modified: trunk/Master/texmf-dist/doc/latex/l3build/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3build/README.md 2020-06-05 21:48:38 UTC (rev 55425)
+++ trunk/Master/texmf-dist/doc/latex/l3build/README.md 2020-06-05 21:49:02 UTC (rev 55426)
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX3
=================================================
-Release 2020-03-25
+Release 2020-06-04
Overview
--------
Modified: trunk/Master/texmf-dist/doc/latex/l3build/l3build.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/man/man1/l3build.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/l3build.1 2020-06-05 21:48:38 UTC (rev 55425)
+++ trunk/Master/texmf-dist/doc/man/man1/l3build.1 2020-06-05 21:49:02 UTC (rev 55426)
@@ -1,4 +1,4 @@
-.TH l3build 1 "2020-03-25"
+.TH l3build 1 "2020-06-04"
.SH NAME
l3build \- Checking and building packages
.SH SYNOPSIS
Modified: trunk/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua 2020-06-05 21:48:38 UTC (rev 55425)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua 2020-06-05 21:49:02 UTC (rev 55426)
@@ -57,6 +57,7 @@
function checkinit()
if not options["dirty"] then
cleandir(testdir)
+ cleandir(resultdir)
end
depinstall(checkdeps)
-- Copy dependencies to the test directory itself: this makes the paths
@@ -792,6 +793,8 @@
dvitopdf(name, testdir, engine, hide)
end
if pdfmode then
+ cp(name .. pdfext,testdir,resultdir)
+ ren(resultdir,name .. pdfext,name .. "." .. engine .. pdfext)
rewrite(pdffile,npffile,normalize_pdf)
else
rewrite(logfile,newfile,normalize_log,engine,errlevels)
Modified: trunk/Master/texmf-dist/scripts/l3build/l3build-upload.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-upload.lua 2020-06-05 21:48:38 UTC (rev 55425)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-upload.lua 2020-06-05 21:49:02 UTC (rev 55426)
@@ -163,7 +163,7 @@
fp_return = shell(ctan_post .. "validate")
end
end
- if match(fp_return,"WARNING") or match(fp_return,"ERROR") then
+ if (match(fp_return,"ERROR")) then
exit_status=1
end
@@ -170,7 +170,12 @@
-- if upload requested and validation succeeded repost to the upload URL
if (exit_status==0 or exit_status==nil) then
if (ctanupload ~=nil and ctanupload ~=false and ctanupload ~= true) then
- print("Validation successful, do you want to upload to CTAN? [y/n]" )
+ if (match(fp_return,"WARNING")) then
+ print("Warnings from CTAN package validation:" .. fp_return:gsub("%[","\n["):gsub("%]%]","]\n]"))
+ else
+ print("Validation successful." )
+ end
+ print("Do you want to upload to CTAN? [y/n]" )
local answer=""
io.stdout:write("> ")
io.stdout:flush()
@@ -189,7 +194,11 @@
exit_status=1
end
else
- print("CTAN validation successful")
+ if (match(fp_return,"WARNING")) then
+ print("Warnings from CTAN package validation:" .. fp_return:gsub("%[","\n["):gsub("%]%]","]\n]"))
+ else
+ print("CTAN validation successful")
+ end
end
else
error("Warnings from CTAN package validation:\n" .. fp_return)
Modified: trunk/Master/texmf-dist/scripts/l3build/l3build-variables.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-variables.lua 2020-06-05 21:48:38 UTC (rev 55425)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-variables.lua 2020-06-05 21:49:02 UTC (rev 55426)
@@ -53,6 +53,7 @@
builddir = builddir or maindir .. "/build"
distribdir = distribdir or builddir .. "/distrib"
localdir = localdir or builddir .. "/local"
+resultdir = resultdir or builddir .. "/result"
testdir = testdir or builddir .. "/test"
typesetdir = typesetdir or builddir .. "/doc"
unpackdir = unpackdir or builddir .. "/unpacked"
Modified: trunk/Master/texmf-dist/scripts/l3build/l3build.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build.lua 2020-06-05 21:48:38 UTC (rev 55425)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build.lua 2020-06-05 21:49:02 UTC (rev 55426)
@@ -25,7 +25,7 @@
--]]
-- Version information
-release_date = "2020-03-25"
+release_date = "2020-06-04"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
@@ -107,6 +107,7 @@
builddir = escapepath(builddir)
distribdir = escapepath(distribdir)
localdir = escapepath(localdir)
+resultdir = escapepath(resultdir)
testdir = escapepath(testdir)
typesetdir = escapepath(typesetdir)
unpackdir = escapepath(unpackdir)
@@ -158,6 +159,7 @@
print("\n Check failed with difference files")
local testdir = testdir
if config ~= "build" then
+ resultdir = resultdir .. "-" .. config
testdir = testdir .. "-" .. config
end
for _,i in ipairs(filelist(testdir,"*" .. os_diffext)) do
Modified: trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx 2020-06-05 21:48:38 UTC (rev 55425)
+++ trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx 2020-06-05 21:49:02 UTC (rev 55426)
@@ -69,9 +69,10 @@
\luavarset{builddir} {maindir .. "/build"} {Directory for building and testing}
\luavarset{distribdir}{builddir .. "/distrib"}{Directory for generating distribution structure}
\luavarset{localdir} {builddir .. "/local"} {Directory for extracted files in \enquote{sandboxed} \TeX{} runs}
+\luavarset{resultdir} {builddir .. "/result"} {Directory for PDF files when using PDF-based tests}
\luavarset{testdir} {builddir .. "/test"} {Directory for running tests}
\luavarset{typesetdir}{builddir .. "/doc"} {Directory for building documentation}
-\luavarset{unpackdir} {builddir .. "/unpack"} {Directory for unpacking sources}
+\luavarset{unpackdir} {builddir .. "/unpacked"}{Directory for unpacking sources}
\luavarseparator
\luavarset{ctandir}{distribdir .. "/ctan"}{Directory for organising files for CTAN}
\luavarset{tdsdir} {distribdir .. "/tds"} {Directory for organised files into TDS structure}
@@ -234,7 +235,7 @@
% }^^A
% }
%
-% \date{Released 2020-03-25}
+% \date{Released 2020-06-04}
%
% \maketitle
% \tableofcontents
More information about the tex-live-commits
mailing list.