texlive[66471] trunk: l3build (8mar23)

commits+karl at tug.org commits+karl at tug.org
Wed Mar 8 22:31:50 CET 2023 

Revision: 66471
          http://tug.org/svn/texlive?view=revision&revision=66471
Author:   karl
Date:     2023-03-08 22:31:49 +0100 (Wed, 08 Mar 2023)
Log Message:
-----------
l3build (8mar23)

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
    trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
    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-zip.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	2023-03-08 21:31:23 UTC (rev 66470)
+++ trunk/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua	2023-03-08 21:31:49 UTC (rev 66471)
@@ -25,7 +25,7 @@
 --]]
 
 -- Version information
-release_date = "2023-02-26"
+release_date = "2023-03-08"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")

Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl	2023-03-08 21:31:23 UTC (rev 66470)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl	2023-03-08 21:31:49 UTC (rev 66471)
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 66378 2023-03-05 21:09:54Z karl $
+# $Id: tlmgr.pl 66457 2023-03-07 23:07:12Z preining $
 # Copyright 2008-2023 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
@@ -8,8 +8,8 @@
 
 use strict; use warnings;
 
-my $svnrev = '$Revision: 66378 $';
-my $datrev = '$Date: 2023-03-05 22:09:54 +0100 (Sun, 05 Mar 2023) $';
+my $svnrev = '$Revision: 66457 $';
+my $datrev = '$Date: 2023-03-08 00:07:12 +0100 (Wed, 08 Mar 2023) $';
 my $tlmgrrevision;
 my $tlmgrversion;
 my $prg;
@@ -896,7 +896,7 @@
     my $lmtx = "$bindir/luametatex";
     if (defined($localtlpdb->get_package('context'))
         && (-x "$lmtx" || -x "$lmtx.exe")
-        && (wndws() || TeXLive::TLUtils::system_ok("$lmtx --version"))
+        && TeXLive::TLUtils::system_ok("$lmtx --version")
        ) {
       $errors += do_cmd_and_check("mtxrun --generate");
       $errors += do_cmd_and_check("context --luatex --generate");
@@ -10254,7 +10254,7 @@
 distribution (L<https://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
-$Id: tlmgr.pl 66378 2023-03-05 21:09:54Z karl $
+$Id: tlmgr.pl 66457 2023-03-07 23:07:12Z preining $
 =cut
 
 # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html

Modified: trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md	2023-03-08 21:31:23 UTC (rev 66470)
+++ trunk/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md	2023-03-08 21:31:49 UTC (rev 66471)
@@ -7,6 +7,13 @@
 
 ## [Unreleased]
 
+## [2023-03-08]
+
+### Changed
+- Generalize normalization of ghostscript version in PDF-based tests
+- Include UNIX timestamps in generated ZIP files
+- Normalize pdfTeX `.enc` file loading
+
 ## [2023-02-26]
 
 ### Changed
@@ -640,7 +647,8 @@
 - Rationalise short option names: removed `-d`, `-E`, `-r`
 - Target `cmdcheck`: specific to LaTeX kernel work
 
-[Unreleased]: https://github.com/latex3/l3build/compare/2023-02-26...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2023-03-08...HEAD
+[2023-03-08]: https://github.com/latex3/l3build/compare/2023-02-26...2023-03-08
 [2023-02-26]: https://github.com/latex3/l3build/compare/2023-02-20...2023-02-26
 [2023-02-20]: https://github.com/latex3/l3build/compare/2023-02-16...2023-02-20
 [2023-02-16]: https://github.com/latex3/l3build/compare/2022-11-10...2023-02-16

Modified: trunk/Master/texmf-dist/doc/latex/l3build/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3build/README.md	2023-03-08 21:31:23 UTC (rev 66470)
+++ trunk/Master/texmf-dist/doc/latex/l3build/README.md	2023-03-08 21:31:49 UTC (rev 66471)
@@ -1,7 +1,7 @@
 l3build: a testing and building system for LaTeX
 =================================================
 
-Release 2023-02-26
+Release 2023-03-08
 
 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	2023-03-08 21:31:23 UTC (rev 66470)
+++ trunk/Master/texmf-dist/doc/man/man1/l3build.1	2023-03-08 21:31:49 UTC (rev 66471)
@@ -1,4 +1,4 @@
-.TH l3build 1 "2023-02-26"
+.TH l3build 1 "2023-03-08"
 .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	2023-03-08 21:31:23 UTC (rev 66470)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-check.lua	2023-03-08 21:31:49 UTC (rev 66471)
@@ -156,6 +156,10 @@
     if match(line, "^%.+\\XeTeX.?.?.?file") then
       line = gsub(line, pattern, "../%1")
     end
+    -- pdfTeX .enc files
+    if match(line, "%.enc%}") then
+      line = gsub(line,"%{" .. pattern .. "%}","")
+    end
     -- Deal with dates
     if match(line, "[^<]%d%d%d%d[/%-]%d%d[/%-]%d%d") then
         line = gsub(line,"%d%d%d%d[/%-]%d%d[/%-]%d%d","....-..-..")
@@ -556,7 +560,7 @@
       not match(line,"^%%%%%+") then
       line = gsub(line,"%/ID( ?)%[<[^>]+><[^>]+>]","/ID%1[<ID-STRING><ID-STRING>]")
       line = gsub(line,"%/ID( ?)%[(%b())%2%]","/ID%1[<ID-STRING><ID-STRING>]")
-      line = gsub(line,"GhostScript %d%.%d+%.?%d*","GhostScript ...")
+      line = gsub(line,"Ghost[sS]cript %d+%.%d+%.?%d*","Ghostscript ...")
       new_content = new_content .. line .. os_newline
     end
   end

Modified: trunk/Master/texmf-dist/scripts/l3build/l3build-zip.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build-zip.lua	2023-03-08 21:31:23 UTC (rev 66470)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build-zip.lua	2023-03-08 21:31:49 UTC (rev 66471)
@@ -39,6 +39,26 @@
   return date, time
 end
 
+local function extra_timestamp(mod, access, creation)
+  local flags = 0
+  local local_extra, central_extra = '', ''
+  if mod then
+    flags = flags | 0x1
+    local_extra = pack('<I4', mod)
+    central_extra = local_extra
+  end
+  if access then
+    flags = flags | 0x2
+    local_extra = local_extra .. pack('<I4', access)
+  end
+  if creation then
+    flags = flags | 0x4
+    local_extra = local_extra .. pack('<I4', creation)
+  end
+  if flags == 0 then return '', '' end
+  return pack('<c2I2B', 'UT', #central_extra + 1, flags) .. central_extra, pack('<c2I2B', 'UT', #local_extra + 1, flags) .. local_extra
+end
+
 local meta = {__index = {
   add = function(z, filename, innername, binary, executable)
     innername = innername or filename
@@ -55,7 +75,9 @@
     if #compressed >= #content then
       compressed = nil
     end
-    local date, time = encode_time(nil)
+    local timestamp = os.time()
+    local date, time = encode_time(timestamp)
+    local central_extra, local_extra = extra_timestamp(timestamp, nil, nil)
     z.f:write(pack("<c4I2I2I2I2I2I4I4I4I2I2",
         'PK\3\4',
         compressed and 20 or 10, -- ZIP 2.0 to allow deflate
@@ -67,8 +89,9 @@
         compressed and #compressed or #content,
         #content,
         #innername,
-        0),
+        #local_extra),
       innername,
+      local_extra,
       compressed or content)
     local central = pack("<c4I2I2I2I2I2I2I4I4I4I2I2I2I2I2I4I4",
         'PK\1\2',
@@ -82,13 +105,13 @@
         compressed and #compressed or #content,
         #content,
         #innername,
-        0, -- no extra data
+        #central_extra,
         0, -- no comment
         0, -- Disc 0
         binary and 0 or 1,
         (executable and 0x81ED--[[0100755]] or 0x81A4--[[0100644]]) << 16,
         offset)
-    z.central[#z.central+1] = central .. innername
+    z.central[#z.central+1] = central .. innername .. central_extra
   end,
   close = function(z, comment)
     comment = comment or ''

Modified: trunk/Master/texmf-dist/scripts/l3build/l3build.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/l3build/l3build.lua	2023-03-08 21:31:23 UTC (rev 66470)
+++ trunk/Master/texmf-dist/scripts/l3build/l3build.lua	2023-03-08 21:31:49 UTC (rev 66471)
@@ -25,7 +25,7 @@
 --]]
 
 -- Version information
-release_date = "2023-02-26"
+release_date = "2023-03-08"
 
 -- 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	2023-03-08 21:31:23 UTC (rev 66470)
+++ trunk/Master/texmf-dist/source/latex/l3build/l3build.dtx	2023-03-08 21:31:49 UTC (rev 66471)
@@ -236,7 +236,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2023-02-26}
+% \date{Released 2023-03-08}
 %
 % \maketitle
 % \tableofcontents

More information about the tex-live-commits mailing list.