From f42d1fc825b7b9d22ae05836992531d9abd2a26d Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 27 Mar 2007 21:42:14 +0000
Subject: * revert the revert - begin the beguine

---
 Prebuild/Prebuild.sln                   | 10 +++++-----
 Prebuild/src/Core/Targets/NAntTarget.cs | 28 ++++++++++++++--------------
 Prebuild/src/Prebuild.csproj            |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'Prebuild')

diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 5505224..6dcce98 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}"
 EndProject
 Global
   GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -8,10 +8,10 @@ Global
     Release|Any CPU = Release|Any CPU
   EndGlobalSection
   GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.Build.0 = Release|Any CPU
+    {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Release|Any CPU.Build.0 = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
     HideSolutionNode = FALSE
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs
index bd366dc..0f0deb2 100644
--- a/Prebuild/src/Core/Targets/NAntTarget.cs
+++ b/Prebuild/src/Core/Targets/NAntTarget.cs
@@ -77,16 +77,16 @@ 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 fileRef = FindFileReference(refr.Name, project);
-				string finalPath = Helper.NormalizePath(Helper.MakeFilePath(project.FullPath + "/${build.dir}/", refr.Name, "dll"), '/');
-				ret += finalPath;
-				return ret;
+				ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
+
+                string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/');
+				
+				return finalPath;
 			}
 			else
 			{
@@ -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,8 @@ namespace Prebuild.Core.Targets
 				ss.WriteLine("                </lib>");
 				foreach(ReferenceNode refr in project.References)
 				{
-					ss.WriteLine("                <include name=\"{0}", 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>");
                 
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index eddfe74..34daca9 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -3,7 +3,7 @@
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}</ProjectGuid>
+    <ProjectGuid>{1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ApplicationIcon>App.ico</ApplicationIcon>
-- 
cgit v1.1