[latex3-commits] [git/l3build] revert-36-sourcefiledir: Revert "'Activate' sourcefiledir" (c3724d6)

[GitHub]

Repository : https://github.com/latex3/l3build
On branch  : revert-36-sourcefiledir
Link       : https://github.com/latex3/l3build/commit/c3724d61c6281ab47a70faf683e3bd6754b99b99

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

commit c3724d61c6281ab47a70faf683e3bd6754b99b99
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Nov 28 19:41:40 2017 +0000

    Revert "'Activate' sourcefiledir"
    
    This reverts commit a708dc64432045df7694bf55ac3dfffdd5c53303.


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

c3724d61c6281ab47a70faf683e3bd6754b99b99
 l3build.lua |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/l3build.lua b/l3build.lua
index bbc3594..62a20bd 100644
--- a/l3build.lua
+++ b/l3build.lua
@@ -872,11 +872,10 @@ function copyctan()
       cp(file, docfiledir, ctandir .. "/" .. ctanpkg)
     end
   end
-  for _,file in pairs(sourcefiles) do
-    cp(file, sourcefiledir, ctandir .. "/" .. ctanpkg)
-  end
-  for _,file in pairs(textfiles) do
-    cp(file, maindir, ctandir .. "/" .. ctanpkg)
+  for _,filetype in pairs({sourcefiles, textfiles}) do
+    for _,file in pairs(filetype) do
+      cp(file, maindir, ctandir .. "/" .. ctanpkg)
+    end
   end
 end
 
@@ -922,7 +921,7 @@ function copytds()
   )
   install(unpackdir, "makeindex", {makeindexfiles}, true)
   install(unpackdir, "bibtex/bst", {bstfiles}, true)
-  install(sourcefiledir, "source", {sourcelist})
+  install(maindir, "source", {sourcelist})
   install(unpackdir, "tex", {installfiles})
 end
 
@@ -1925,7 +1924,7 @@ function cmdcheck()
     end
   end
   for _,file in pairs(sourcefiles) do
-    cp(file, sourcefiledir, typesetdir)
+    cp(file, maindir, typesetdir)
   end
   local engine = gsub(stdengine, "tex$", "latex")
   local localdir = abspath(localdir)
@@ -2087,13 +2086,13 @@ function doc(files)
     end
   end
   for _,file in pairs(sourcefiles) do
-    cp(file, sourcefiledir, typesetdir)
+    cp(file, maindir, typesetdir)
   end
   for _,i in ipairs(typesetsuppfiles) do
     cp(i, supportdir, typesetdir)
   end
   depinstall(typesetdeps)
-  unpack({sourcefiles, typesetsourcefiles}, {sourcefiledir, docfiledir})
+  unpack({sourcefiles, typesetsourcefiles}, {maindir, docfiledir})
   -- Main loop for doc creation
   local done = {}
   for _, typesetfiles in ipairs({typesetdemofiles, typesetfiles}) do