diff options
| author | lbsa71 | 2007-03-27 19:47:23 +0000 |
|---|---|---|
| committer | lbsa71 | 2007-03-27 19:47:23 +0000 |
| commit | 002d7dba30d466816b60d70e316636f86724e591 (patch) | |
| tree | ca033d7e7ae0efa506a99a1862e3b7923144df0f /Prebuild/src | |
| parent | * Continued refactoring away OpenSimRoot - now it's down to the final 2. (diff) | |
| download | opensim-SC_OLD-002d7dba30d466816b60d70e316636f86724e591.zip opensim-SC_OLD-002d7dba30d466816b60d70e316636f86724e591.tar.gz opensim-SC_OLD-002d7dba30d466816b60d70e316636f86724e591.tar.bz2 opensim-SC_OLD-002d7dba30d466816b60d70e316636f86724e591.tar.xz | |
* Fixed yet another project ref fuck-up in Prebuild.
Diffstat (limited to 'Prebuild/src')
| -rw-r--r-- | Prebuild/src/Core/Targets/NAntTarget.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs index bd366dc..242bb9c 100644 --- a/Prebuild/src/Core/Targets/NAntTarget.cs +++ b/Prebuild/src/Core/Targets/NAntTarget.cs | |||
| @@ -83,10 +83,10 @@ namespace Prebuild.Core.Targets | |||
| 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) project.ReferencePaths[0]).Path + refr.Name + ".dll", '/'); |
| 88 | ret += finalPath; | 88 | |
| 89 | return ret; | 89 | return finalPath; |
| 90 | } | 90 | } |
| 91 | else | 91 | else |
| 92 | { | 92 | { |
| @@ -316,7 +316,8 @@ namespace Prebuild.Core.Targets | |||
| 316 | ss.WriteLine(" </lib>"); | 316 | ss.WriteLine(" </lib>"); |
| 317 | foreach(ReferenceNode refr in project.References) | 317 | foreach(ReferenceNode refr in project.References) |
| 318 | { | 318 | { |
| 319 | ss.WriteLine(" <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr))+"\" />", '/')); | 319 | string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr)), '/'); |
| 320 | ss.WriteLine(" <include name=\""+ path + "\" />" ); | ||
| 320 | } | 321 | } |
| 321 | ss.WriteLine(" </references>"); | 322 | ss.WriteLine(" </references>"); |
| 322 | 323 | ||