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

Merge pull request #673 from Blizzard/token-fix

Browse Source 
Add additional tokens to fileconfig and vs2010+.
This commit is contained in:
Tom van Dijck 2017-01-20 09:32:20 -08:00 committed by GitHub
commit 1b776d8f6b
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/actions/vstudio/vs2010.lua
View File

@ -31,7 +31,10 @@
["file.basename"] = { absolute = false, token = "%(Filename)" }, ["file.basename"] = { absolute = false, token = "%(Filename)" },
["file.abspath"] = { absolute = true, token = "%(FullPath)" }, ["file.abspath"] = { absolute = true, token = "%(FullPath)" },
["file.relpath"] = { absolute = false, token = "%(Identity)" }, ["file.relpath"] = { absolute = false, token = "%(Identity)" },
["file.path"] = { absolute = true, token = "%(Identity)" }, ["file.path"] = { absolute = false, token = "%(Identity)" },
["file.directory"] = { absolute = true, token = "%(RootDir)%(Directory)" },
["file.reldirectory"] = { absolute = false, token = "%(RelativeDir)" },
["file.extension"] = { absolute = false, token = "%(Extension)" },
} }

9
src/base/fileconfig.lua
View File

@ -243,7 +243,6 @@
return context.__mt.__index(fsub, key) return context.__mt.__index(fsub, key)
end end
-- --
-- And here are the path building functions. -- And here are the path building functions.
-- --
@ -257,6 +256,9 @@
return path.getdirectory(fcfg.abspath) return path.getdirectory(fcfg.abspath)
end end
function fcfg_mt.reldirectory(fcfg)
return path.getdirectory(fcfg.relpath)
end
function fcfg_mt.name(fcfg) function fcfg_mt.name(fcfg)
return path.getname(fcfg.abspath) return path.getname(fcfg.abspath)
@ -286,3 +288,8 @@
-- This only gets called if no explicit virtual path was set -- This only gets called if no explicit virtual path was set
return fcfg.relpath return fcfg.relpath
end end
function fcfg_mt.extension(fcfg)
return path.getextension(fcfg.abspath)
end