l3build (5jun20)

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

4 files changed, 19 insertions, 4 deletions

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