summaryrefslogtreecommitdiff
path: root/xmake/actions
diff options
context:
space:
mode:
authorruki <[email protected]>2020-09-13 09:44:31 +0800
committerruki <[email protected]>2020-09-13 09:45:16 +0800
commit4ccfb91fcad1422ca5bf0dd9630a69e1e5eddc1d (patch)
treeb9165c50ee968a8cda287a0987e0f97b7445e6f5 /xmake/actions
parent366e7fcdcb21c1e1dc53c8d52176289be93e34b9 (diff)
fix ci and add_configfiles
Diffstat (limited to 'xmake/actions')
-rw-r--r--xmake/actions/config/configfiles.lua7
1 files changed, 6 insertions, 1 deletions
diff --git a/xmake/actions/config/configfiles.lua b/xmake/actions/config/configfiles.lua
index 30e40d1f5..60a8f47d3 100644
--- a/xmake/actions/config/configfiles.lua
+++ b/xmake/actions/config/configfiles.lua
@@ -99,9 +99,11 @@ function _get_builtinvars_global()
, debug = is_mode("debug") and 1 or 0
, os = platform.os()
}
+ local builtinvars_upper = {}
for name, value in pairs(builtinvars) do
- builtinvars[name:upper()] = type(value) == "string" and value:upper() or value
+ builtinvars_upper[name:upper()] = type(value) == "string" and value:upper() or value
end
+ table.join2(builtinvars, builtinvars_upper)
_g.builtinvars_global = builtinvars
end
return builtinvars
@@ -171,6 +173,9 @@ function _generate_configfile(srcfile, dstfile, fileinfo, targets)
end
end
+ print(variables)
+ print("os.arch", os.arch())
+
-- replace all variables
local pattern = fileinfo.pattern or "%${(.-)}"
io.gsub(dstfile_tmp, "(" .. pattern .. ")", function(_, variable)