l3build (27nov19)

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

10 files changed, 34 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md
index b74e6286872..e353de0bedf 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-11-27]
+
+### Changed
+
+- `\ASSERTSTR` no longer needs e-TeX
+
+### Fixed
+
+- Installation of files using the `--full` switch
+
 ## [2019-11-01]
 
 ### Added
@@ -388,7 +398,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-11-01...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2019-11-27...HEAD
+[2019-11-27]: https://github.com/latex3/l3build/compare/2019-11-01...2019-11-27
 [2019-11-01]: https://github.com/latex3/l3build/compare/2019-10-02...2019-11-01
 [2019-10-02]: https://github.com/latex3/l3build/compare/2019-09-30...2019-10-02
 [2019-09-30]: https://github.com/latex3/l3build/compare/2019-09-29...2019-09-30
diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md
index d781a521d02..c2331b6ebea 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-11-01
+Release 2019-11-27
 
 Overview
 --------
diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
index 27c6e3c9186..25e5fb6a4fb 100644
--- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf
+++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1
index aa583fe5994..4b669b2927c 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-11-01"
+.TH l3build 1 "2019-11-27"
 .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 fabbe845e7b..f31c6f34948 100644
--- a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf
diff --git a/Master/texmf-dist/scripts/l3build/l3build-install.lua b/Master/texmf-dist/scripts/l3build/l3build-install.lua
index 77338b67a06..1007d2ed1b4 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-install.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-install.lua
@@ -105,6 +105,10 @@ function uninstall()
 end
 
 function install_files(target,full,dry_run)
+
+  -- Needed so paths are only cleaned out once
+  local cleanpaths = { }
+
   local function install_files(source,dir,files,subdir)
     subdir = subdir or moduledir
     -- For material associated with secondary tools (BibTeX, MakeIndex)
@@ -155,8 +159,12 @@ function install_files(target,full,dry_run)
     if next(filenames) then
       if not dry_run then
         for _,path in pairs(paths) do
-          errorlevel = cleandir(target .. "/" .. path)
-          if errorlevel ~= 0 then return errorlevel end
+          local dir = target .. "/" .. path
+          if not cleanpaths[dir] then
+            errorlevel = cleandir(dir)
+            if errorlevel ~= 0 then return errorlevel end
+          end
+          cleanpaths[dir] = true
         end
       end
       for _,file in ipairs(filenames) do
@@ -164,9 +172,7 @@ function install_files(target,full,dry_run)
           print("- " .. file)
         else
           local path,file = splitpath(file)
-          local installpath = target .. "/" .. path
-          mkdir(installpath)
-          errorlevel = cp(file,sourcepaths[file],installpath)
+          errorlevel = cp(file,sourcepaths[file],target .. "/" .. path)
           if errorlevel ~= 0 then return errorlevel end
         end
       end
diff --git a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
index 668b2d02d0a..9123349ee08 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
@@ -93,7 +93,7 @@ target_list =
       },
     install =
       {
-        desc = "Installs files into the local textmf tree",
+        desc = "Installs files into the local texmf tree",
         func = install
       },
     manifest =
@@ -129,7 +129,7 @@ target_list =
       },
     uninstall =
       {
-        desc = "Uninstalls files from the local textmf tree",
+        desc = "Uninstalls files from the local texmf tree",
         func = uninstall
       },
     unpack=
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 48f3ab99d4f..ebfe0cef55f 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-11-01"
+release_date = "2019-11-27"
 
 -- 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 2f55c5173da..2c98aa47991 100644
--- a/Master/texmf-dist/source/latex/l3build/l3build.dtx
+++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx
@@ -231,7 +231,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2019-11-01}
+% \date{Released 2019-11-27}
 %
 % \maketitle
 % \tableofcontents
@@ -930,7 +930,7 @@
 % \cs{SHOWFILE} (\eTeX{} only) Shows the content of the file given as an
 % argument.
 % \item
-% \cs{ASSERT} and \cs{ASSERTSTR} (\eTeX{} only) Asserts if the full expansion
+% \cs{ASSERT} and \cs{ASSERTSTR} Asserts if the full expansion
 % of the two required arguments are the same: the \cs{ASSERT} function is
 % token-based, the \cs{ASSERTSTR} works on a string basis.
 % \end{itemize}
@@ -2306,8 +2306,8 @@
   \begingroup
     \edef\@tempa{#1}%
     \edef\@tempb{#2}%
-    \edef\@tempa{\detokenize\expandafter{\@tempa}}%
-    \edef\@tempb{\detokenize\expandafter{\@tempb}}%
+    \edef\@tempa{\meaning\@tempa}%
+    \edef\@tempb{\meaning\@tempb}%
     \ifx\@tempa\@tempb
       \TYPE{PASSED}%
     \else
diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
index fc77a4da7df..b589c5fc786 100644
--- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex
+++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex
@@ -189,8 +189,8 @@
   \begingroup
     \edef\@tempa{#1}%
     \edef\@tempb{#2}%
-    \edef\@tempa{\detokenize\expandafter{\@tempa}}%
-    \edef\@tempb{\detokenize\expandafter{\@tempb}}%
+    \edef\@tempa{\meaning\@tempa}%
+    \edef\@tempb{\meaning\@tempb}%
     \ifx\@tempa\@tempb
       \TYPE{PASSED}%
     \else