From faadfe0b5a2ea55e6dcfcf4d13a6ea93db971dfe Mon Sep 17 00:00:00 2001 From: artemking4 Date: Fri, 2 Sep 2022 22:55:56 +0500 Subject: [PATCH] Fix custom rules not applying under the utility project kind on gmake2 --- modules/gmake2/gmake2_utility.lua | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/gmake2/gmake2_utility.lua b/modules/gmake2/gmake2_utility.lua index cf8fb9ae6f..e676495f6d 100644 --- a/modules/gmake2/gmake2_utility.lua +++ b/modules/gmake2/gmake2_utility.lua @@ -54,8 +54,25 @@ function utility.initialize(prj) + local rules = {} + + local function addRule(extension, rule) + if type(extension) == 'table' then + for _, value in ipairs(extension) do + addRule(value, rule) + end + else + rules[extension] = rule + end + end + + for _, name in ipairs(prj.rules) do + local rule = p.global.getRule(name) + addRule(rule.fileExtension, rule) + end + prj._gmake = prj._gmake or {} - prj._gmake.rules = prj.rules + prj._gmake.rules = rules prj._gmake.filesets = { } end