diff options
author | lbsa71 | 2007-03-27 21:42:14 +0000 |
---|---|---|
committer | lbsa71 | 2007-03-27 21:42:14 +0000 |
commit | f42d1fc825b7b9d22ae05836992531d9abd2a26d (patch) | |
tree | c316d0d2ec56a34c6c7f2099977bcc6f14e5eb24 /Prebuild/src/Core/Targets/NAntTarget.cs | |
parent | * Reverting todays work. It was worth a try. (diff) | |
download | opensim-SC_OLD-f42d1fc825b7b9d22ae05836992531d9abd2a26d.zip opensim-SC_OLD-f42d1fc825b7b9d22ae05836992531d9abd2a26d.tar.gz opensim-SC_OLD-f42d1fc825b7b9d22ae05836992531d9abd2a26d.tar.bz2 opensim-SC_OLD-f42d1fc825b7b9d22ae05836992531d9abd2a26d.tar.xz |
* revert the revert - begin the beguine
Diffstat (limited to 'Prebuild/src/Core/Targets/NAntTarget.cs')
-rw-r--r-- | Prebuild/src/Core/Targets/NAntTarget.cs | 28 |
1 files changed, 14 insertions, 14 deletions
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 | |||
77 | return tmpPath; | 77 | return tmpPath; |
78 | } | 78 | } |
79 | 79 | ||
80 | private static string BuildReference(SolutionNode solution, ReferenceNode refr) | 80 | private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr) |
81 | { | 81 | { |
82 | string ret = ""; | 82 | string ret = ""; |
83 | if(solution.ProjectsTable.ContainsKey(refr.Name)) | 83 | if(solution.ProjectsTable.ContainsKey(refr.Name)) |
84 | { | 84 | { |
85 | ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; | 85 | ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; |
86 | string fileRef = FindFileReference(refr.Name, project); | 86 | |
87 | string finalPath = Helper.NormalizePath(Helper.MakeFilePath(project.FullPath + "/${build.dir}/", refr.Name, "dll"), '/'); | 87 | string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/'); |
88 | ret += finalPath; | 88 | |
89 | return ret; | 89 | return finalPath; |
90 | } | 90 | } |
91 | else | 91 | else |
92 | { | 92 | { |
@@ -126,12 +126,11 @@ namespace Prebuild.Core.Targets | |||
126 | string ret = ""; | 126 | string ret = ""; |
127 | if(solution.ProjectsTable.ContainsKey(refr.Name)) | 127 | if(solution.ProjectsTable.ContainsKey(refr.Name)) |
128 | { | 128 | { |
129 | ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; | 129 | ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; |
130 | string fileRef = FindFileReference(refr.Name, project); | 130 | string finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/'); |
131 | string finalPath = Helper.NormalizePath(Helper.MakeReferencePath(project.FullPath + "/${build.dir}/"), '/'); | 131 | |
132 | ret += finalPath; | 132 | return finalPath; |
133 | return ret; | 133 | } |
134 | } | ||
135 | else | 134 | else |
136 | { | 135 | { |
137 | ProjectNode project = (ProjectNode)refr.Parent; | 136 | ProjectNode project = (ProjectNode)refr.Parent; |
@@ -226,7 +225,7 @@ namespace Prebuild.Core.Targets | |||
226 | { | 225 | { |
227 | if (refr.LocalCopy) | 226 | if (refr.LocalCopy) |
228 | { | 227 | { |
229 | ss.WriteLine(" <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr))+"\" />", '/')); | 228 | ss.WriteLine(" <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr))+"\" />", '/')); |
230 | } | 229 | } |
231 | } | 230 | } |
232 | ss.WriteLine(" </fileset>"); | 231 | ss.WriteLine(" </fileset>"); |
@@ -316,7 +315,8 @@ namespace Prebuild.Core.Targets | |||
316 | ss.WriteLine(" </lib>"); | 315 | ss.WriteLine(" </lib>"); |
317 | foreach(ReferenceNode refr in project.References) | 316 | foreach(ReferenceNode refr in project.References) |
318 | { | 317 | { |
319 | ss.WriteLine(" <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr))+"\" />", '/')); | 318 | string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/'); |
319 | ss.WriteLine(" <include name=\""+ path + "\" />" ); | ||
320 | } | 320 | } |
321 | ss.WriteLine(" </references>"); | 321 | ss.WriteLine(" </references>"); |
322 | 322 | ||