From 08823a172c8174154c702e334c5658e7510646ee Mon Sep 17 00:00:00 2001 From: David Given Date: Sun, 21 Aug 2016 21:55:21 +0200 Subject: [PATCH] filenamesof() an installable now returns all installed files, not just the ones at the top level (necessary to make a lot of the dependency stuff work when using tools which depend on installables). --- first/ackbuilder.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/first/ackbuilder.lua b/first/ackbuilder.lua index 4b3e1bc6a..25bfd02c0 100644 --- a/first/ackbuilder.lua +++ b/first/ackbuilder.lua @@ -723,6 +723,7 @@ definerule("installable", local deps = {} local commands = {} local srcs = {} + local outs = {} local dests = {} for dest, src in pairs(e.map) do if src.is.installable then @@ -730,6 +731,7 @@ definerule("installable", error("can't specify a destination filename when installing an installable") end deps[#deps+1] = src.fullname + outs = concat(outs, filenamesof(src)) elseif (type(dest) == "number") then error("only references to other installables can be missing a destination") else @@ -740,6 +742,7 @@ definerule("installable", deps[#deps+1] = f dests[#dests+1] = dest + outs[#outs+1] = dest commands[#commands+1] = "cp "..f[1].." "..dest end end @@ -752,7 +755,7 @@ definerule("installable", emitter:endrule() return { - outs = dests + outs = outs } end )