aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Prebuild
diff options
context:
space:
mode:
authorlbsa712007-03-27 21:42:14 +0000
committerlbsa712007-03-27 21:42:14 +0000
commitf42d1fc825b7b9d22ae05836992531d9abd2a26d (patch)
treec316d0d2ec56a34c6c7f2099977bcc6f14e5eb24 /Prebuild
parent* Reverting todays work. It was worth a try. (diff)
downloadopensim-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')
-rw-r--r--Prebuild/Prebuild.sln10
-rw-r--r--Prebuild/src/Core/Targets/NAntTarget.cs28
-rw-r--r--Prebuild/src/Prebuild.csproj2
3 files changed, 20 insertions, 20 deletions
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 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}"
4EndProject 4EndProject
5Global 5Global
6 GlobalSection(SolutionConfigurationPlatforms) = preSolution 6 GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -8,10 +8,10 @@ Global
8 Release|Any CPU = Release|Any CPU 8 Release|Any CPU = Release|Any CPU
9 EndGlobalSection 9 EndGlobalSection
10 GlobalSection(ProjectConfigurationPlatforms) = postSolution 10 GlobalSection(ProjectConfigurationPlatforms) = postSolution
11 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 11 {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
12 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.Build.0 = Debug|Any CPU 12 {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
13 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.ActiveCfg = Release|Any CPU 13 {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
14 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.Build.0 = Release|Any CPU 14 {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Release|Any CPU.Build.0 = Release|Any CPU
15 EndGlobalSection 15 EndGlobalSection
16 GlobalSection(SolutionProperties) = preSolution 16 GlobalSection(SolutionProperties) = preSolution
17 HideSolutionNode = FALSE 17 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
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
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 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}</ProjectGuid> 6 <ProjectGuid>{1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon>App.ico</ApplicationIcon> 9 <ApplicationIcon>App.ico</ApplicationIcon>