[latex3-commits] [git/l3build] master: Revert "Actually use docfiledir for copying typeset sources" (a071ee0)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/a071ee0f37c722aebee95efe33e46e57bc4f24c5

>---------------------------------------------------------------

commit a071ee0f37c722aebee95efe33e46e57bc4f24c5
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Nov 28 20:08:38 2017 +0000

    Revert "Actually use docfiledir for copying typeset sources"
    
    This reverts commit 574495b937e5871301e3658e68903b02696c51dc.


>---------------------------------------------------------------

a071ee0f37c722aebee95efe33e46e57bc4f24c5
 l3build.lua |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/l3build.lua b/l3build.lua
index 3360422..1ad7076 100644
--- a/l3build.lua
+++ b/l3build.lua
@@ -1912,15 +1912,13 @@ function cmdcheck()
   mkdir(localdir)
   cleandir(testdir)
   depinstall(checkdeps)
-  for _,filetype in pairs(
-    {bibfiles, docfiles, typesetfiles, typesetdemofiles}
-    ) do
-    for _,file in pairs(filetype) do
-      cp(file, docfiledir, typesetdir)
+  for _,i in ipairs({bibfiles, docfiles, sourcefiles, typesetfiles}) do
+    for _,j in ipairs(i) do
+      cp(j, ".", testdir)
     end
   end
-  for _,file in pairs(sourcefiles) do
-    cp(file, maindir, typesetdir)
+  for _,i in ipairs(typesetsuppfiles) do
+    cp(i, supportdir, testdir)
   end
   local engine = gsub(stdengine, "tex$", "latex")
   local localdir = abspath(localdir)
@@ -2074,21 +2072,18 @@ end
 function doc(files)
   -- Set up
   cleandir(typesetdir)
-  for _,filetype in pairs(
-    {bibfiles, docfiles, typesetfiles, typesetdemofiles}
-    ) do
-    for _,file in pairs(filetype) do
-      cp(file, docfiledir, typesetdir)
+  for _,i in ipairs(
+    {bibfiles, docfiles, sourcefiles, typesetfiles, typesetdemofiles}
+  ) do
+    for _,j in ipairs(i) do
+      cp(j, ".", typesetdir)
     end
   end
-  for _,file in pairs(sourcefiles) do
-    cp(file, maindir, typesetdir)
-  end
   for _,i in ipairs(typesetsuppfiles) do
     cp(i, supportdir, typesetdir)
   end
   depinstall(typesetdeps)
-  unpack({sourcefiles, typesetsourcefiles}, {maindir, docfiledir})
+  unpack({sourcefiles, typesetsourcefiles}, {".", docfiledir})
   -- Main loop for doc creation
   local done = {}
   for _, typesetfiles in ipairs({typesetdemofiles, typesetfiles}) do