Merged in assarbad/premake-stable/project-basename-mutate (pull request #9)

Allow project names to be mutated

2 files changed, 26 insertions, 6 deletions

diff --git a/src/actions/vstudio/_vstudio.lua b/src/actions/vstudio/_vstudio.lua
index 9b868d3..236d8af 100644
--- a/src/actions/vstudio/_vstudio.lua
+++ b/src/actions/vstudio/_vstudio.lua
@@ -170,15 +170,16 @@
 --
 
 	function vstudio.projectfile(prj)
-		local extension
+		local pattern
 		if prj.language == "C#" then
-			extension = ".csproj"
+			pattern = "%%.csproj"
 		else
-			extension = iif(_ACTION > "vs2008", ".vcxproj", ".vcproj")
+			pattern = iif(_ACTION > "vs2008", "%%.vcxproj", "%%.vcproj")
 		end
 
-		local fname = path.join(prj.location, prj.name)
-		return fname..extension
+		local fname = premake.project.getbasename(prj.name, pattern)
+		fname = path.join(prj.location, fname)
+		return fname
 	end
 	
 
diff --git a/src/base/project.lua b/src/base/project.lua
index 5887a42..9c8b4db 100644
--- a/src/base/project.lua
+++ b/src/base/project.lua
@@ -253,6 +253,25 @@
 
 
 --
+-- Uses a pattern to format the basename of a file (i.e. without path).
+--
+-- @param prjname
+--    A project name (string) to use.
+-- @param pattern
+--    A naming pattern. The sequence "%%" will be replaced by the
+--    project name.
+-- @returns
+--    A filename (basename only) matching the specified pattern, without
+--    path components.
+--
+
+	function premake.project.getbasename(prjname, pattern)
+		return pattern:gsub("%%%%", prjname)
+	end
+
+
+
+--
 -- Uses information from a project (or solution) to format a filename.
 --
 -- @param prj
@@ -266,7 +285,7 @@
 --
 
 	function premake.project.getfilename(prj, pattern)
-		local fname = pattern:gsub("%%%%", prj.name)
+		local fname = premake.project.getbasename(prj.name, pattern)
 		fname = path.join(prj.location, fname)
 		return path.getrelative(os.getcwd(), fname)
 	end