summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-08-07 22:07:07 +0000
committerKarl Berry <karl@freefriends.org>2018-08-07 22:07:07 +0000
commit3a62e05a651e7f80170acb4e0d3cf121b85a7f7b (patch)
treec81234acbbe18eff451a537c5456a8ae72f979e9
parent706448acbd096e1a59cb987e8352abdd43624ebe (diff)
l3build (7aug18)
git-svn-id: svn://tug.org/texlive/trunk@48367 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/linked_scripts/l3build/l3build.lua2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl14
-rw-r--r--Master/texmf-dist/doc/latex/l3build/CHANGELOG.md9
-rw-r--r--Master/texmf-dist/doc/latex/l3build/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3build/l3build.pdfbin672071 -> 672061 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.12
-rw-r--r--Master/texmf-dist/doc/man/man1/l3build.man1.pdfbin15209 -> 15200 bytes
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-ctan.lua7
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-install.lua2
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-stdmain.lua4
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
-rw-r--r--Master/texmf-dist/source/latex/l3build/l3build.dtx10
-rw-r--r--Master/texmf-dist/tex/latex/l3build/regression-test.tex8
14 files changed, 48 insertions, 16 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
index 2107f024d3a..1ece096e7f3 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 = "2018-08-04"
+release_date = "2018-08-07"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index d2cfaaebbf3..5bd28758d4b 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,15 +1,16 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 48271 2018-07-25 01:51:31Z preining $
+# $Id: tlmgr.pl 48361 2018-08-06 21:44:39Z karl $
#
# Copyright 2008-2018 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 48271 $';
-my $datrev = '$Date: 2018-07-25 03:51:31 +0200 (Wed, 25 Jul 2018) $';
+my $svnrev = '$Revision: 48361 $';
+my $datrev = '$Date: 2018-08-06 23:44:39 +0200 (Mon, 06 Aug 2018) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
+my $bindir;
if ($svnrev =~ m/: ([0-9]+) /) {
$tlmgrrevision = $1;
} else {
@@ -46,7 +47,7 @@ BEGIN {
# Unix-specific problems with use as library will probably go undetected.
# make subprograms (including kpsewhich) have the right path:
- my ($bindir, $kpsewhichname);
+ my $kpsewhichname;
if ($^O =~ /^MSWin/i) {
# on w32 $0 and __FILE__ point directly to tlmgr.pl; they can be relative
$Master = __FILE__;
@@ -848,7 +849,8 @@ sub handle_execute_actions {
if ($::files_changed) {
$errors += do_cmd_and_check("mktexlsr");
- if (defined($localtlpdb->get_package('context'))) {
+ if (defined($localtlpdb->get_package('context'))
+ && (-x "$bindir/texlua" || -x "$bindir/texlua.exe")) {
$errors += do_cmd_and_check("mtxrun --generate");
}
$::files_changed = 0;
@@ -9729,7 +9731,7 @@ This script and its documentation were written for the TeX Live
distribution (L<http://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 48271 2018-07-25 01:51:31Z preining $
+$Id: tlmgr.pl 48361 2018-08-06 21:44:39Z karl $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
index 2d59804c698..d168f93fccb 100644
--- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
@@ -7,6 +7,14 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2018-08-07]
+
+### Changed
+- Suppress file name info in PDF output for included images, etc.
+
+### Fixed
+- Issue with creation of CTAN releases for bundles
+
## [2018-08-04]
### Added
@@ -143,6 +151,7 @@ this project uses date-based 'snapshot' version identifiers.
- Target `cmdcheck`: specific to LaTeX3 kernel work
[Unreleased]: https://github.com/latex3/l3build/compare/2018-08-04...HEAD
+[2018-08-07]: https://github.com/latex3/l3build/compare/2018-08-04...2018-08-07
[2018-08-04]: https://github.com/latex3/l3build/compare/2018-08-02...2018-08-04
[2018-08-02]: https://github.com/latex3/l3build/compare/2018-05-10...2018-08-02
[2018-05-10]: https://github.com/latex3/l3build/compare/2018-05-06...2018-05-10
diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md
index 1014ef3cd4a..5204d281726 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 2018-08-04
+Release 2018-08-07
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
index cdbb633e42f..39f6ab8785a 100644
--- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf
+++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1
index c3ef55a52c8..653d7c0e0a6 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 "2018-08-04"
+.TH l3build 1 "2018-08-07"
.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 2c0b133a7be..1607dd45f1f 100644
--- a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index f5d1716de9e..de01514d5a9 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -580,7 +580,7 @@ function setup_check(name, engine)
if not (tlgfile or tpffile) then
if not locate({unpackdir, testfiledir}, {name .. lveext}) then
print(
- "Error: failed to find " .. tlgext .. ", " .. tlpext .. " or "
+ "Error: failed to find " .. tlgext .. ", " .. tpfext .. " or "
.. lveext .. " file for " .. name .. "!"
)
exit(1)
diff --git a/Master/texmf-dist/scripts/l3build/l3build-ctan.lua b/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
index 9d29f63f1c7..f1e0757e9b0 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-ctan.lua
@@ -55,7 +55,12 @@ function copyctan()
end
end
--- Standard versions of the main targets for building modules
+function bundlectan()
+ local errorlevel = install_files(tdsdir,true)
+ if errorlevel ~=0 then return errorlevel end
+ copyctan()
+ return 0
+end
function ctan()
-- Always run tests for all engines
diff --git a/Master/texmf-dist/scripts/l3build/l3build-install.lua b/Master/texmf-dist/scripts/l3build/l3build-install.lua
index 2c4274454db..88ac5bad6f3 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-install.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-install.lua
@@ -100,7 +100,7 @@ function install_files(target,full,dry_run)
if tool and module == "base" then
subdir = nil
end
- dir = dir .. (subdir and "/" or "") .. subdir
+ dir = dir .. (subdir and ("/" .. subdir) or "")
local filenames = { }
for _,glob_table in pairs(files) do
for _,glob in pairs(glob_table) do
diff --git a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
index 6398288a0a2..26a229ce31c 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
@@ -58,6 +58,10 @@ target_list =
return 0
end
},
+ bundlectan =
+ {
+ func = bundlectan
+ },
bundleunpack =
{
func = bundleunpack,
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 2107f024d3a..1ece096e7f3 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 = "2018-08-04"
+release_date = "2018-08-07"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx
index 5032e78ce5c..7e465398e51 100644
--- a/Master/texmf-dist/source/latex/l3build/l3build.dtx
+++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx
@@ -222,7 +222,7 @@
% }^^A
% }
%
-% \date{Released 2018-08-04}
+% \date{Released 2018-08-07}
%
% \maketitle
% \tableofcontents
@@ -1920,7 +1920,11 @@
\pdfinfo{/Producer (\ifx\directlua\@undefined pdf\else Lua\fi TeX)}
\ifx\pdfinfoomitdate\@undefined\else
\pdfinfoomitdate = 1 %
- \pdfsuppressptexinfo = 1 %
+ \pdfsuppressptexinfo = \numexpr
+ 0
+ + 1 % PTEX.Fullbanner
+ + 2 % PTEX.FileName
+ \relax
\pdftrailerid{}
\fi
\else
@@ -1928,8 +1932,10 @@
\pdfvariable suppressoptionalinfo \numexpr
0
+ 1 % PTEX.Fullbanner
+ + 2 % PTEX.FileName
+ 32 % CreationDate
+ 64 % ModDate
+ + 512 % ID
\relax
\fi
\else
diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
index 8f559a7e3c7..34cb639dc6c 100644
--- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex
+++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
@@ -149,7 +149,11 @@
\pdfinfo{/Producer (\ifx\directlua\@undefined pdf\else Lua\fi TeX)}
\ifx\pdfinfoomitdate\@undefined\else
\pdfinfoomitdate = 1 %
- \pdfsuppressptexinfo = 1 %
+ \pdfsuppressptexinfo = \numexpr
+ 0
+ + 1 % PTEX.Fullbanner
+ + 2 % PTEX.FileName
+ \relax
\pdftrailerid{}
\fi
\else
@@ -157,8 +161,10 @@
\pdfvariable suppressoptionalinfo \numexpr
0
+ 1 % PTEX.Fullbanner
+ + 2 % PTEX.FileName
+ 32 % CreationDate
+ 64 % ModDate
+ + 512 % ID
\relax
\fi
\else