Merge pull request #673 from Blizzard/token-fix

Add additional tokens to fileconfig and vs2010+.

src/actions/vstudio/vs2010.lua

@@ -31,7 +31,10 @@
 		["file.basename"]               = { absolute = false, token = "%(Filename)" },
 		["file.abspath"]                = { absolute = true,  token = "%(FullPath)" },
 		["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)" },
 	}
 
 

src/base/fileconfig.lua

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