From 8a294669f9624eae14a2acd6446a70745ce6452c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Sep 2019 21:48:49 +0000 Subject: l3build (26sep19) git-svn-id: svn://tug.org/texlive/trunk@52183 c570f23f-e606-0410-a88d-b1316a301751 --- .../texlive/linked_scripts/l3build/l3build.lua | 4 +-- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 35 ++++++++++++++------- Master/texmf-dist/doc/latex/l3build/CHANGELOG.md | 13 +++++++- Master/texmf-dist/doc/latex/l3build/README.md | 2 +- Master/texmf-dist/doc/latex/l3build/l3build.pdf | Bin 705121 -> 704972 bytes Master/texmf-dist/doc/man/man1/l3build.1 | 2 +- Master/texmf-dist/doc/man/man1/l3build.man1.pdf | Bin 15245 -> 15229 bytes .../texmf-dist/scripts/l3build/l3build-check.lua | 11 +++++-- .../scripts/l3build/l3build-typesetting.lua | 5 +++ .../scripts/l3build/l3build-variables.lua | 1 + Master/texmf-dist/scripts/l3build/l3build.lua | 4 +-- Master/texmf-dist/source/latex/l3build/l3build.dtx | 5 ++- 12 files changed, 61 insertions(+), 21 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua index c0eea6b33a9..e9b47f8357a 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 = "2019-09-18" +release_date = "2019-09-25" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -174,7 +174,7 @@ if options["target"] == "check" then end if #checkconfigs == 1 and checkconfigs[1] ~= "build" and - (options["target"] == "check" or options["target"] == "save") then + (options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then local config = "./" .. gsub(checkconfigs[1],".lua$","") .. ".lua" if fileexists(config) then dofile(config) diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index fc6c96906ed..69793b92eef 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1095,9 +1095,10 @@ sub backup_and_remove_package { } if ($opts{"backup"}) { $tlp->make_container($::progs{'compressor'}, $localtlpdb->root, - $opts{"backupdir"}, - "${pkg}.r" . $tlp->revision, - $tlp->relocated); + destdir => $opts{"backupdir"}, + containername => "${pkg}.r" . $tlp->revision, + relative => $tlp->relocated, + user => 1); if ($autobackup) { # in case we do auto backups we remove older backups clear_old_backups($pkg, $opts{"backupdir"}, $autobackup); @@ -2164,7 +2165,9 @@ sub action_backup { $tlp->revision . ".tar.$compressorextension\n"); if (!$opts{"dry-run"}) { $tlp->make_container($::progs{'compressor'}, $localtlpdb->root, - $opts{"backupdir"}, "${pkg}.r" . $tlp->revision); + destdir => $opts{"backupdir"}, + containername => "${pkg}.r" . $tlp->revision, + user => 1); } } } @@ -2279,8 +2282,13 @@ sub write_w32_updater { push (@rst_tlpobj, "tlpkg\\tlpobj\\$pkg.tlpobj"); push (@rst_info, "$pkg ^($oldrev^)"); next if ($opts{"dry-run"}); - # create backup; make_container expects file name in a format: some-name.r[0-9]+ - my ($size, undef, $fullname) = $localtlp->make_container("tar", $root, $temp, "__BACKUP_$pkg.r$oldrev"); + # create backup; + # make_container expects filename with format: somename.r[0-9]+ + my ($size, undef, $fullname) + = $localtlp->make_container("tar", $root, + destdir => $temp, + containername => "__BACKUP_$pkg.r$oldrev", + user => 1); if ($size <= 0) { tlwarn("$prg: Creation of backup container of $pkg failed.\n"); return 1; # backup failed? abort @@ -3200,8 +3208,10 @@ sub action_update { if ($opts{"backup"} && !$opts{"dry-run"}) { my $compressorextension = $Compressors{$::progs{'compressor'}}{'extension'}; $tlp->make_container($::progs{'compressor'}, $root, - $opts{"backupdir"}, "${pkg}.r" . $tlp->revision, - $tlp->relocated); + destdir => $opts{"backupdir"}, + containername => "${pkg}.r" . $tlp->revision, + relative => $tlp->relocated, + user => 1); $unwind_package = "$opts{'backupdir'}/${pkg}.r" . $tlp->revision . ".tar.$compressorextension"; @@ -3239,9 +3249,12 @@ sub action_update { # no backup was made, so let us create a temporary .tar file # of the package my $tlp = $localtlpdb->get_package($pkg); - my ($s, undef, $fullname) = $tlp->make_container("tar", $root, $temp, - "__BACKUP_${pkg}.r" . $tlp->revision, - $tlp->relocated); + my ($s, undef, $fullname) + = $tlp->make_container("tar", $root, + destdir => $temp, + containername => "__BACKUP_${pkg}.r" . $tlp->revision, + relative => $tlp->relocated, + user => 1); if ($s <= 0) { tlwarn("\n$prg: Creation of backup container of $pkg failed.\n"); tlwarn("$prg: Continuing to update other packages, please retry...\n"); diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index 50d5d5cc9da..09a8b1a94bb 100644 --- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md @@ -7,6 +7,16 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2019-09-25] + +### Added + +- New `texmfdir` variable for more complex local additions + +### Fixed + +- Clean out all configuration test dirs (see #98) + ## [2019-09-18] ### Added @@ -327,7 +337,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/2019-09-18...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2019-09-25...HEAD +[2019-09-25]: https://github.com/latex3/l3build/compare/2019-09-18...2019-09-25 [2019-09-18]: https://github.com/latex3/l3build/compare/2019-09-14...2019-09-18 [2019-09-14]: https://github.com/latex3/l3build/compare/2019-08-24...2019-09-14 [2019-08-24]: https://github.com/latex3/l3build/compare/2019-07-31...2019-08-24 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index 39787b78564..432fd5583c8 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 2019-09-18 +Release 2019-09-25 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf index 3efe981d03e..c5790412520 100644 Binary files a/Master/texmf-dist/doc/latex/l3build/l3build.pdf and b/Master/texmf-dist/doc/latex/l3build/l3build.pdf differ diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1 index bf724455ecd..4959f4b0e99 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 "2019-09-18" +.TH l3build 1 "2019-09-25" .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 0719ac5d4db..7da18e7d4cc 100644 Binary files a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf and b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf differ diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index 8d1d58aee3e..731d4282eaa 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -721,14 +721,21 @@ function runtest(name, engine, hide, ext, pdfmode, breakout) -- Ensure there is no stray .log file rm(testdir,name .. logext) local errlevels = {} + local localtexmf = "" + if texmfdir and texmfdir ~= "" then + localtexmf = os_pathsep .. abspath(texmfdir) .. "//" + end + local texmfdir = abspath(texmfdir) .. "//" for i = 1, checkruns do errlevels[i] = run( testdir, -- No use of localdir here as the files get copied to testdir: -- avoids any paths in the logs - os_setenv .. " TEXINPUTS=." .. (checksearch and os_pathsep or "") + os_setenv .. " TEXINPUTS=." .. localtexmf + .. (checksearch and os_pathsep or "") .. os_concat .. - os_setenv .. " LUAINPUTS=." .. (checksearch and os_pathsep or "") + os_setenv .. " LUAINPUTS=." .. localtexmf + .. (checksearch and os_pathsep or "") .. os_concat .. -- Avoid spurious output from (u)pTeX os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0" diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua index eb2974cdf2d..8e5b17bfc44 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua @@ -63,7 +63,12 @@ function runcmd(cmd,dir,vars) local vars = vars or {} -- Allow for local texmf files local env = os_setenv .. " TEXMFCNF=." .. os_pathsep + local localtexmf = "" + if texmfdir and texmfdir ~= "" then + localtexmf = os_pathsep .. abspath(texmfdir) .. "//" + end local envpaths = "." .. os_pathsep + .. localtexmf .. abspath(localdir) .. os_pathsep .. dir .. (typesetsearch and os_pathsep or "") -- Deal with spaces in paths diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua index 6eb0f378589..11186c0e3f9 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua @@ -46,6 +46,7 @@ sourcefiledir = sourcefiledir or currentdir supportdir = supportdir or maindir .. "/support" testfiledir = testfiledir or currentdir .. "/testfiles" testsuppdir = testsuppdir or testfiledir .. "/support" +texmfdir = texmfdir or maindir .. "/texmf" -- Structure within a development area builddir = builddir or maindir .. "/build" diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index c0eea6b33a9..e9b47f8357a 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 = "2019-09-18" +release_date = "2019-09-25" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -174,7 +174,7 @@ if options["target"] == "check" then end if #checkconfigs == 1 and checkconfigs[1] ~= "build" and - (options["target"] == "check" or options["target"] == "save") then + (options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then local config = "./" .. gsub(checkconfigs[1],".lua$","") .. ".lua" if fileexists(config) then dofile(config) diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index a7e04a1a6f6..05979335570 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -63,6 +63,7 @@ \luavarset{supportdir} {maindir .. "/support"} {Directory containing general support files} \luavarset{testfiledir}{"./testfiles"} {Directory containing test files} \luavarset{testsuppdir}{testfiledir .. "/support"}{Directory containing test-specific support files} +\luavarset{texmfdir}{maindir .. "/texmf"}{Directory containing support files in tree form} \luavarseparator \luavarset{builddir} {maindir .. "/build"} {Directory for building and testing} \luavarset{distribdir}{builddir .. "/distrib"}{Directory for generating distribution structure} @@ -229,7 +230,7 @@ % }^^A % } % -% \date{Released 2019-09-18} +% \date{Released 2019-09-25} % % \maketitle % \tableofcontents @@ -387,6 +388,8 @@ % \item any files in the directory \var{testsuppdir}; % \item any files that match \var{checksuppfiles} in the \var{supportdir}. % \end{itemize} +% The \var{texmfdir} is also made available to the tests (if defined and +% non-empty). % This range of possibilities allow sensible defaults but significant flexibility for defining your own test setups. % % Checking can be performed with any or all of the `engines' \texttt{pdftex}, \texttt{xetex}, and \texttt{luatex}. -- cgit v1.2.3