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

Translate rule var paths for Visual Studio projects and make relative to project

Browse Source
This commit is contained in:
Jason Perkins 2015-05-08 16:30:47 -04:00
parent 120bf0ad73
commit 15fd9fd43b
2 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/actions/vstudio/vs2010_vcxproj.lua
View File

@ -516,7 +516,11 @@
local fld = p.rule.getPropertyField(rule, prop) local fld = p.rule.getPropertyField(rule, prop)
local value = cfg[fld.name] local value = cfg[fld.name]
if value ~= nil then if value ~= nil then
value = p.rule.getPropertyString(rule, prop, value) if fld.kind == "path" then
value = path.translate(project.getrelative(cfg.project, value))
else
value = p.rule.getPropertyString(rule, prop, value)
end
if value ~= nil and #value > 0 then if value ~= nil and #value > 0 then
m.element(prop.name, nil, '%s', value) m.element(prop.name, nil, '%s', value)
end end

64
tests/actions/vstudio/vc2010/test_rule_vars.lua
View File

@ -1,7 +1,8 @@
-- --
-- tests/actions/vstudio/vc2010/test_rule_vars.lua -- tests/actions/vstudio/vc2010/test_rule_vars.lua
-- Validate generation of custom rule variables at the project level. -- Validate generation of custom rule variables at the project level.
-- Copyright (c) 2014 Jason Perkins and the Premake project -- Author Jason Perkins
-- Copyright (c) 2014-2015 Jason Perkins and the Premake project
-- --
local suite = test.declare("vstudio_vs2010_rule_vars") local suite = test.declare("vstudio_vs2010_rule_vars")
@ -49,18 +50,6 @@
-- Test setting the various property kinds. -- Test setting the various property kinds.
-- --
function suite.onStringVar()
createVar { name="MyVar", kind="string" }
myRuleVars { MyVar = "hello" }
prepare()
test.capture [[
<MyRule>
<MyVar>hello</MyVar>
</MyRule>
]]
end
function suite.onBooleanVar() function suite.onBooleanVar()
createVar { name="MyVar", kind="boolean" } createVar { name="MyVar", kind="boolean" }
myRuleVars { MyVar = false } myRuleVars { MyVar = false }
@ -73,18 +62,6 @@
end end
function suite.onListVar()
createVar { name="MyVar", kind="list" }
myRuleVars { MyVar = { "a", "b", "c" } }
prepare()
test.capture [[
<MyRule>
<MyVar>a b c</MyVar>
</MyRule>
]]
end
function suite.onEnumVar() function suite.onEnumVar()
createVar { createVar {
name = "MyVar", name = "MyVar",
@ -106,3 +83,40 @@
</MyRule> </MyRule>
]] ]]
end end
function suite.onListVar()
createVar { name="MyVar", kind="list" }
myRuleVars { MyVar = { "a", "b", "c" } }
prepare()
test.capture [[
<MyRule>
<MyVar>a b c</MyVar>
</MyRule>
]]
end
function suite.onPathVar()
createVar { name="MyVar", kind="path" }
myRuleVars { MyVar = "../../path/to/file" }
prepare()
test.capture [[
<MyRule>
<MyVar>..\..\path\to\file</MyVar>
</MyRule>
]]
end
function suite.onStringVar()
createVar { name="MyVar", kind="string" }
myRuleVars { MyVar = "hello" }
prepare()
test.capture [[
<MyRule>
<MyVar>hello</MyVar>
</MyRule>
]]
end