Skip to content

Commit

Permalink
Use tree() not filelist() for CTAN/TDS construction
Browse files Browse the repository at this point in the history
This is needed for nested layouts.
  • Loading branch information
josephwright committed Dec 11, 2017
1 parent 176949f commit 9f5f00b
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions l3build.lua
Expand Up @@ -903,8 +903,8 @@ function copytds()
local filenames = { }
for _,i in ipairs(files) do
for _,j in ipairs(i) do
for _,k in ipairs(filelist(source, j)) do
insert(filenames, k)
for file,_ in pairs(tree(source, j)) do
insert(filenames, file)
end
end
end
Expand Down Expand Up @@ -2074,15 +2074,15 @@ function bundlectan()
local excludelist = { }
for _,i in ipairs(exclude) do
for _,j in ipairs(i) do
for _,k in ipairs(filelist(dir, j)) do
excludelist[k] = true
for file,_ in pairs(tree(dir, j)) do
excludelist[file] = true
end
end
end
for _,i in ipairs(include) do
for _,j in ipairs(filelist(dir, i)) do
if not excludelist[j] then
insert(includelist, j)
for file,_ in pairs(tree(dir, i)) do
if not excludelist[file] then
insert(includelist, file)
end
end
end
Expand Down Expand Up @@ -2331,8 +2331,8 @@ function setversion()
local version = options["version"] or -1
for _,dir in pairs({currentdir, sourcefiledir, docfiledir}) do
for _,i in pairs(versionfiles) do
for _,j in pairs(filelist(dir, i)) do
rewrite(dir, j, date, version)
for file,_ in pairs(tree(dir, i)) do
rewrite(dir, file, date, version)
end
end
end
Expand Down

0 comments on commit 9f5f00b

Please sign in to comment.