From 81f01a12960a5004cde8321794c002e1ad9522b3 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 27 Mar 2007 20:19:35 +0000
Subject: * vaseline + duct-tape.

---
 Prebuild/src/Core/Targets/NAntTarget.cs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'Prebuild/src/Core/Targets/NAntTarget.cs')

diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs
index 242bb9c..0f0deb2 100644
--- a/Prebuild/src/Core/Targets/NAntTarget.cs
+++ b/Prebuild/src/Core/Targets/NAntTarget.cs
@@ -77,14 +77,14 @@ namespace Prebuild.Core.Targets
 			return tmpPath;
 		}
 
-		private static string BuildReference(SolutionNode solution, ReferenceNode refr)
+		private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr)
 		{
 			string ret = "";
 			if(solution.ProjectsTable.ContainsKey(refr.Name))
 			{
-				ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];				
-				
-				string finalPath = Helper.NormalizePath( ((ReferencePathNode) project.ReferencePaths[0]).Path + refr.Name + ".dll", '/');
+				ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
+
+                string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/');
 				
 				return finalPath;
 			}
@@ -126,12 +126,11 @@ namespace Prebuild.Core.Targets
 			string ret = "";
 			if(solution.ProjectsTable.ContainsKey(refr.Name))
 			{
-				ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];				
-				string fileRef = FindFileReference(refr.Name, project);
-				string finalPath = Helper.NormalizePath(Helper.MakeReferencePath(project.FullPath + "/${build.dir}/"), '/');
-				ret += finalPath;
-				return ret;
-			}
+				ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
+                string finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/');
+
+                return finalPath;
+            }
 			else
 			{
 				ProjectNode project = (ProjectNode)refr.Parent;
@@ -226,7 +225,7 @@ namespace Prebuild.Core.Targets
 				{
 					if (refr.LocalCopy)
 					{
-						ss.WriteLine("                <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr))+"\" />", '/'));
+						ss.WriteLine("                <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr))+"\" />", '/'));
 					}
 				}
 				ss.WriteLine("            </fileset>");
@@ -316,7 +315,7 @@ namespace Prebuild.Core.Targets
 				ss.WriteLine("                </lib>");
 				foreach(ReferenceNode refr in project.References)
 				{
-				    string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr)), '/');
+				    string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/');
 					ss.WriteLine("                <include name=\""+ path + "\" />" );
 				}
 				ss.WriteLine("            </references>");
-- 
cgit v1.1