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

allow tokens in vpaths

src/_premake_init.lua

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

src/base/api.lua

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