From 7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 27 Mar 2007 20:45:04 +0000
Subject: * Reverting todays work. It was worth a try.
---
Prebuild/Prebuild.sln | 10 +++++-----
Prebuild/src/Core/Targets/NAntTarget.cs | 28 ++++++++++++++--------------
Prebuild/src/Prebuild.csproj | 21 +++++++++------------
3 files changed, 28 insertions(+), 31 deletions(-)
(limited to 'Prebuild')
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 0f35f18..5505224 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", "{90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -8,10 +8,10 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs
index 0f0deb2..bd366dc 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, ProjectNode currentProject, ReferenceNode refr)
+ private static string BuildReference(SolutionNode solution, ReferenceNode refr)
{
string ret = "";
if(solution.ProjectsTable.ContainsKey(refr.Name))
{
- ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
-
- string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/');
-
- return finalPath;
+ 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;
}
else
{
@@ -126,11 +126,12 @@ namespace Prebuild.Core.Targets
string ret = "";
if(solution.ProjectsTable.ContainsKey(refr.Name))
{
- ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
- string finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/');
-
- return finalPath;
- }
+ 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;
+ }
else
{
ProjectNode project = (ProjectNode)refr.Parent;
@@ -225,7 +226,7 @@ namespace Prebuild.Core.Targets
{
if (refr.LocalCopy)
{
- ss.WriteLine(" ", '/'));
+ ss.WriteLine(" ", '/'));
}
}
ss.WriteLine(" ");
@@ -315,8 +316,7 @@ namespace Prebuild.Core.Targets
ss.WriteLine(" ");
foreach(ReferenceNode refr in project.References)
{
- string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/');
- ss.WriteLine(" " );
+ ss.WriteLine(" ", '/'));
}
ss.WriteLine(" ");
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index 3727947..eddfe74 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -1,9 +1,9 @@
-
+
Local
8.0.50727
2.0
- {6A56621D-A328-4E23-96E3-0514A3817BAF}
+ {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}
Debug
AnyCPU
App.ico
@@ -17,8 +17,7 @@
IE50
false
Exe
-
-
+
Prebuild
Prebuild.Prebuild
@@ -31,8 +30,7 @@
DEBUG;TRACE
-
-
+
True
4096
False
@@ -50,8 +48,7 @@
TRACE
-
-
+
False
4096
True
@@ -63,15 +60,15 @@
1595
-
+
System.EnterpriseServices.dll
False
-
+
System.Xml.dll
False
-
+
System.dll
False
@@ -205,4 +202,4 @@
-
\ No newline at end of file
+
--
cgit v1.1