AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #62 from Blizzard/tokens-in-vpaths

Browse Source 
allow tokens in vpaths
This commit is contained in:
starkos 2015-05-17 12:02:47 -04:00
commit fac7f87431
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_premake_init.lua
View File

@ -946,6 +946,8 @@
name = "vpaths", name = "vpaths",
scope = "project", scope = "project",
kind = "list:keyed:list:path", kind = "list:keyed:list:path",
tokens = true,
pathVars = true,
} }
api.register { api.register {

23
src/base/api.lua
View File

@ -743,15 +743,17 @@
premake.field.kind("directory", { premake.field.kind("directory", {
paths = true, paths = true,
store = function(field, current, value, processor) store = function(field, current, value, processor)
if value:find("*") then if string.sub(value, 1, 2) == "%{" then
return value
elseif value:find("*") then
value = os.matchdirs(value) value = os.matchdirs(value)
for i, file in ipairs(value) do for i, file in ipairs(value) do
value[i] = path.getabsolute(value[i]) value[i] = path.getabsolute(value[i])
end end
return value
else else
value = path.getabsolute(value) return path.getabsolute(value)
end end
return value
end, end,
remove = function(field, current, value, processor) remove = function(field, current, value, processor)
return path.getabsolute(value) return path.getabsolute(value)
@ -771,15 +773,17 @@
premake.field.kind("file", { premake.field.kind("file", {
paths = true, paths = true,
store = function(field, current, value, processor) store = function(field, current, value, processor)
if value:find("*") then if string.sub(value, 1, 2) == "%{" then
return value
elseif value:find("*") then
value = os.matchfiles(value) value = os.matchfiles(value)
for i, file in ipairs(value) do for i, file in ipairs(value) do
value[i] = path.getabsolute(value[i]) value[i] = path.getabsolute(value[i])
end end
return value
else else
value = path.getabsolute(value) return path.getabsolute(value)
end end
return value
end, end,
remove = function(field, current, value, processor) remove = function(field, current, value, processor)
return path.getabsolute(value) return path.getabsolute(value)
@ -968,7 +972,9 @@
paths = true, paths = true,
store = function(field, current, value, processor) store = function(field, current, value, processor)
if type(value) == "string" and value:find('/', nil, true) then if type(value) == "string" and value:find('/', nil, true) then
value = path.getabsolute(value) if string.sub(value, 1, 2) ~= "%{" then
value = path.getabsolute(value)
end
end end
return value return value
end, end,
@ -1005,6 +1011,9 @@
premake.field.kind("path", { premake.field.kind("path", {
paths = true, paths = true,
store = function(field, current, value, processor) store = function(field, current, value, processor)
if string.sub(value, 1, 2) == "%{" then
return value
end
return path.getabsolute(value) return path.getabsolute(value)
end, end,
compare = function(field, a, b, processor) compare = function(field, a, b, processor)