Fix #312 - Complex project templates are not correctly built.

Author: mrward

src/Main/SharpDevelop/Templates/Project/ProjectDescriptor.cs

@@ -59,6 +59,7 @@ public ProjectProperty(string name, string value, string configuration, string p
 
 		string name;
 		string defaultPlatform;
+		string relativePath;
 
 		/// <summary>
 		/// The language of the project.
@@ -92,6 +93,9 @@ public ProjectDescriptor(XmlElement element, IReadOnlyFileSystem fileSystem)
 			} else {
 				name = "${ProjectName}";
 			}
+			if (element.HasAttribute("directory")) {
+				relativePath = element.GetAttribute("directory");
+			}
 			languageName = element.GetAttribute("language");
 			if (string.IsNullOrEmpty(languageName)) {
 				ProjectTemplateImpl.WarnAttributeMissing(element, "language");
@@ -301,7 +305,7 @@ public bool CreateProject(ProjectTemplateResult templateResults, string defaultL
 					return false;
 				}
 
-				DirectoryName projectBasePath = projectCreateOptions.ProjectBasePath;
+				DirectoryName projectBasePath = GetProjectBasePath(projectCreateOptions);
 				string newProjectName = StringParser.Parse(name, new StringTagPair("ProjectName", projectCreateOptions.ProjectName));
 				Directory.CreateDirectory(projectBasePath);
 				FileName projectLocation = projectBasePath.CombineFile(newProjectName + descriptor.ProjectFileExtension);
@@ -546,6 +550,15 @@ public bool CreateProject(ProjectTemplateResult templateResults, string defaultL
 			}
 		}
 
+		DirectoryName GetProjectBasePath(ProjectTemplateOptions projectCreateOptions)
+		{
+			if (String.IsNullOrEmpty(relativePath)) {
+				return projectCreateOptions.ProjectBasePath;
+			}
+			string relativeBasePath = StringParser.Parse(relativePath, new StringTagPair("ProjectName", projectCreateOptions.ProjectName));
+			return projectCreateOptions.ProjectBasePath.CombineDirectory(relativeBasePath);
+		}
+		
 		void RunPreCreateActions(ProjectCreateInformation projectCreateInformation)
 		{
 			foreach (var action in preCreateActions) {