l3build (5jun20)

git-svn-id: svn://tug.org/texlive/trunk@55426 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 35 insertions, 10 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
index 083b6b81baf..e7acd47fb3b 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 = "2020-03-25"
+release_date = "2020-06-04"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")
@@ -107,6 +107,7 @@ testsuppdir   = escapepath(testsuppdir)
 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 @@ if options["target"] == "check" then
         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
diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
index 67509493f36..012467cd782 100644
--- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
@@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [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 @@ 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/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
diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md
index b721010c22c..c3630c8f0d6 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 2020-03-25
+Release 2020-06-04
 
 Overview
 --------
diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
index a3ee41c4261..958de58c4db 100644
--- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf
+++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1
index 776d9e9eded..9262d7c5b6e 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 "2020-03-25"
+.TH l3build 1 "2020-06-04"
 .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 d27e170b5b2..1d6a2e28535 100644
--- a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 9f83b934122..ff022c60793 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -57,6 +57,7 @@ local remove           = os.remove
 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 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
     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)
diff --git a/Master/texmf-dist/scripts/l3build/l3build-upload.lua b/Master/texmf-dist/scripts/l3build/l3build-upload.lua
index fc25d5d6ac0..ba743094924 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-upload.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-upload.lua
@@ -163,14 +163,19 @@ end
       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
 
   -- 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 @@ end
         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)
diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
index 432bfe6b15d..87ce01d611f 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
@@ -53,6 +53,7 @@ texmfdir      = texmfdir      or maindir .. "/texmf"
 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"
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 083b6b81baf..e7acd47fb3b 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 = "2020-03-25"
+release_date = "2020-06-04"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")
@@ -107,6 +107,7 @@ testsuppdir   = escapepath(testsuppdir)
 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 @@ if options["target"] == "check" then
         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
diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx
index a513e3e6c50..198042469e6 100644
--- a/Master/texmf-dist/source/latex/l3build/l3build.dtx
+++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx
@@ -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