From ccbdc2aae45a9f819daeca631b6b8e4e9ee4d483 Mon Sep 17 00:00:00 2001 From: Jason Jurecka Date: Fri, 22 Jun 2018 19:16:48 -0700 Subject: [PATCH] Swap order of applying project specific config the config needs to be resolved based on the isolated config|platform pair The issue this is solving is that anything that changes "system" as part of the config|platform pair would not be applied to resolve of per file config due to prj.system being a table that contains the current os system and when the order of application was in the original order the project pair settings would be overriden by the generic prj settings which are set as defaults in other locations --- src/base/fileconfig.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/base/fileconfig.lua b/src/base/fileconfig.lua index 43896585..b9826f3f 100644 --- a/src/base/fileconfig.lua +++ b/src/base/fileconfig.lua @@ -100,8 +100,8 @@ local environ = {} local fsub = context.new(prj, environ) - context.copyFilters(fsub, cfg) - context.mergeFilters(fsub, fcfg) + context.copyFilters(fsub, fcfg) + context.mergeFilters(fsub, cfg) fcfg.configs[cfg] = fsub