texlive[49994] trunk: l3build (10feb19)

commits+karl at tug.org commits+karl at tug.org
Sun Feb 10 23:47:49 CET 2019


Revision: 49994
          http://tug.org/svn/texlive?view=revision&revision=49994
Author:   karl
Date:     2019-02-10 23:47:49 +0100 (Sun, 10 Feb 2019)
Log Message:
-----------
l3build (10feb19)

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-aux.lua
    trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua
    trunk/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
    trunk/Master/texmf-dist/scripts/l3build/l3build-upload.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	2019-02-10 19:14:27 UTC (rev 49993)
+++ trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua	2019-02-10 22:47:49 UTC (rev 49994)
@@ -25,7 +25,7 @@
 --]]
 
 -- Version information
-release_date = "2019-02-06"
+release_date = "2019-02-10"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")

Modified: trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md	2019-02-10 19:14:27 UTC (rev 49993)
+++ trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md	2019-02-10 22:47:49 UTC (rev 49994)
@@ -7,6 +7,13 @@
 
 ## [Unreleased]
 
+## [2019-02-10]
+
+### Fixed
+
+- Handling of ASCII engines
+- Execution of all tests by `ctan` target (see #85)
+
 ## [2019-02-06]
 
 ### Added
@@ -244,7 +251,8 @@
 - Rationalise short option names: removed `-d`, `-E`, `-r`
 - Target `cmdcheck`: specific to LaTeX3 kernel work
 
-[Unreleased]: https://github.com/latex3/l3build/compare/2019-02-06...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2019-02-10...HEAD
+[2019-02-10]: https://github.com/latex3/l3build/compare/2019-02-06...2019-02-10
 [2019-02-06]: https://github.com/latex3/l3build/compare/2018-12-23...2019-02-06
 [2018-12-23]: https://github.com/latex3/l3build/compare/2018-12-18...2018-12-23
 [2018-12-18]: https://github.com/latex3/l3build/compare/2018-11-08...2018-12-18

Modified: trunk/Master/texmf-dist/doc/latex/l3build/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3build/README.md	2019-02-10 19:14:27 UTC (rev 49993)
+++ trunk/Master/texmf-dist/doc/latex/l3build/README.md	2019-02-10 22:47:49 UTC (rev 49994)
@@ -1,7 +1,7 @@
 l3build: a testing and building system for LaTeX3
 =================================================
 
-Release 2019-02-06
+Release 2019-02-10
 
 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	2019-02-10 19:14:27 UTC (rev 49993)
+++ trunk/Master/texmf-dist/doc/man/man1/l3build.1	2019-02-10 22:47:49 UTC (rev 49994)
@@ -1,4 +1,4 @@
-.TH l3build 1 "2019-02-06"
+.TH l3build 1 "2019-02-10"
 .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-aux.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-aux.lua	2019-02-10 19:14:27 UTC (rev 49993)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-aux.lua	2019-02-10 22:47:49 UTC (rev 49994)
@@ -97,7 +97,7 @@
   local scriptname = getscriptname()
   for _,i in ipairs(dirs) do
     local text = " for module " .. i
-    if i == "." then
+    if i == "." and opts["config"] then
       text = " with configuration " .. opts["config"][1]
     end
     print("Running l3build with target \"" .. target .. "\"" .. text )

Modified: trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua	2019-02-10 19:14:27 UTC (rev 49993)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua	2019-02-10 22:47:49 UTC (rev 49994)
@@ -1,6 +1,6 @@
 --[[
 
-File l3build-check.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-check.lua Copyright (C) 2018,2019 The LaTeX3 Project
 
 It may be distributed and/or modified under the conditions of the
 LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -701,7 +701,7 @@
   local npffile = basename .. "." .. engine .. pdfext
   local asciiopt = ""
   for _,i in ipairs(asciiengines) do
-    if realengine == i then
+    if binary == i then
       asciiopt = "-translate-file ./ascii.tcx "
       break
     end

Modified: trunk/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-ctan.lua	2019-02-10 19:14:27 UTC (rev 49993)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-ctan.lua	2019-02-10 22:47:49 UTC (rev 49994)
@@ -102,7 +102,7 @@
     standalone = true
   end
   if standalone then
-    errorlevel = check()
+    errorlevel = call({"."},"check")
     bundle = module
   else
     errorlevel = call(modules, "bundlecheck")

Modified: trunk/Master/texmf-dist/scripts/l3build/l3build-upload.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-upload.lua	2019-02-10 19:14:27 UTC (rev 49993)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-upload.lua	2019-02-10 22:47:49 UTC (rev 49994)
@@ -29,6 +29,7 @@
 local close = io.close
 local flush = io.flush
 local open  = io.open
+local output = io.output
 local popen = io.popen
 local read  = io.read
 local write = io.write
@@ -93,9 +94,12 @@
     uploadconfig.announcement = assert(f:read('*a'))
     close(f)
   end
-  uploadconfig.announcement = options["message"] or uploadconfig.announcement
+  uploadconfig.announcement = options["message"] or uploadconfig.announcement or file_contents(uploadconfig.announcement_file)
   uploadconfig.email = options["email"] or uploadconfig.email
 
+
+  uploadconfig.note =   uploadconfig.note  or file_contents(uploadconfig.note_file)
+
   local tagnames = tagnames or { }
   uploadconfig.version = tagnames[1] or uploadconfig.version
 
@@ -115,7 +119,18 @@
 
   ctan_post = construct_ctan_post(uploadfile,options["debug"])
 
-  if options["debug"] then
+
+-- curl file version
+  local curlopt=open(ctanzip .. ".curlopt","w")
+  output(curlopt)
+  write(ctan_post)
+  close(curlopt)
+  
+  ctan_post=curlexe .. " --config " .. ctanzip .. ".curlopt"
+  
+
+if options["debug"] then
+    ctan_post = ctan_post ..  ' https://httpbin.org/post'
     fp_return = shell(ctan_post)
     print('\n\nCURL COMMAND:')
     print(ctan_post)
@@ -122,7 +137,9 @@
     print("\n\nHTTP RESPONSE:")
     print(fp_return)
     return 1
-  end
+else
+    ctan_post = ctan_post ..  ' https://ctan.org/submit/'
+end
 
   -- call post command to validate the upload at CTAN's validate URL
   local exit_status=0
@@ -150,12 +167,12 @@
   end
 
   -- if upload requested and validation succeeded repost to the upload URL
-  if (exit_status==0 or exit_status==nil) then
+    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]" )
       local answer=""
-      write("> ")
-      flush()
+      io.stdout:write("> ")
+      io.stdout:flush()
       answer=read()
       if(lower(answer,1,1)=="y") then
         ctanupload=true
@@ -195,8 +212,9 @@
 function construct_ctan_post(uploadfile,debug)
 
   -- start building the curl command:
-  ctan_post = curlexe .. " "
-
+-- commandline  ctan_post = curlexe .. " "
+  ctan_post=""
+  
   -- build up the curl command field-by-field:
 
   --         field                                   max  desc                                 mandatory  multi
@@ -225,12 +243,8 @@
   if os_type == "windows" then
     qq = '\"'
   end
-  ctan_post = ctan_post .. ' --form ' .. qq .. 'file=@' .. tostring(uploadfile) .. ';filename=' .. tostring(uploadfile) .. qq
-  if debug then
-    ctan_post = ctan_post ..  ' https://httpbin.org/post'
-  else
-    ctan_post = ctan_post ..  ' https://ctan.org/submit/'
-  end
+-- commandline   ctan_post = ctan_post .. ' --form ' .. qq .. 'file=@' .. tostring(uploadfile) .. ';filename=' .. tostring(uploadfile) .. qq
+  ctan_post = ctan_post .. '\nform="file=@' .. tostring(uploadfile) .. ';filename=' .. tostring(uploadfile) .. '"'
 
   return ctan_post
 
@@ -270,7 +284,8 @@
       vs = vs:gsub('"','\\"')
       vs = vs:gsub('`','\\`')
       vs = vs:gsub('\n','\\n')
-      ctan_post=ctan_post .. ' --form "' .. fname .. "=" .. vs .. '"'
+-- for strings on commandline version      ctan_post=ctan_post .. ' --form "' .. fname .. "=" .. vs .. '"'
+      ctan_post=ctan_post .. '\nform="' .. fname .. '=' .. vs .. '"'
     end
   else
     error("The value of the field '" .. fname .."' must be a scalar not a table")
@@ -301,7 +316,7 @@
         field = field .. "\n" .. answer_line
       end
      end
-  until (return_count==3 or answer_line==nil)
+  until (return_count==3 or answer_line==nil or answer_line=='\004')
   return field
 end
 
@@ -316,3 +331,19 @@
   return field
 end
 
+
+-- if filename is non nil and file readable return contents otherwise nil
+function file_contents (filename)
+  if filename ~= nil then
+    local f= open(filename,"r")
+    if f==nil then
+      return nil
+    else 
+      local s = f:read("*all")
+      close(f)
+      return s
+    end
+  else
+    return nil
+  end
+end

Modified: trunk/Master/texmf-dist/scripts/l3build/l3build.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build.lua	2019-02-10 19:14:27 UTC (rev 49993)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build.lua	2019-02-10 22:47:49 UTC (rev 49994)
@@ -25,7 +25,7 @@
 --]]
 
 -- Version information
-release_date = "2019-02-06"
+release_date = "2019-02-10"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")

Modified: trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx	2019-02-10 19:14:27 UTC (rev 49993)
+++ trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx	2019-02-10 22:47:49 UTC (rev 49994)
@@ -227,7 +227,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2019-02-06}
+% \date{Released 2019-02-10}
 %
 % \maketitle
 % \tableofcontents



More information about the tex-live-commits mailing list