aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Prebuild
diff options
context:
space:
mode:
authorlbsa712007-03-27 20:45:04 +0000
committerlbsa712007-03-27 20:45:04 +0000
commit7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8 (patch)
treed8dc563b7fef4ce9dcc34fbcc31c3fcc7d99d49f /Prebuild
parent* Config should be loaded before login server startup... (diff)
downloadopensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.zip
opensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.gz
opensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.bz2
opensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.xz
* Reverting todays work. It was worth a try.
Diffstat (limited to '')
-rw-r--r--Prebuild/Prebuild.sln10
-rw-r--r--Prebuild/src/Core/Targets/NAntTarget.cs28
-rw-r--r--Prebuild/src/Prebuild.csproj21
3 files changed, 28 insertions, 31 deletions
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 @@
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", "{90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}"
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 {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 11 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
12 {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.Build.0 = Debug|Any CPU 12 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
13 {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.ActiveCfg = Release|Any CPU 13 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
14 {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.Build.0 = Release|Any CPU 14 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.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 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
77 return tmpPath; 77 return tmpPath;
78 } 78 }
79 79
80 private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr) 80 private static string BuildReference(SolutionNode solution, 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 86 string fileRef = FindFileReference(refr.Name, project);
87 string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/'); 87 string finalPath = Helper.NormalizePath(Helper.MakeFilePath(project.FullPath + "/${build.dir}/", refr.Name, "dll"), '/');
88 88 ret += finalPath;
89 return finalPath; 89 return ret;
90 } 90 }
91 else 91 else
92 { 92 {
@@ -126,11 +126,12 @@ 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 finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/'); 130 string fileRef = FindFileReference(refr.Name, project);
131 131 string finalPath = Helper.NormalizePath(Helper.MakeReferencePath(project.FullPath + "/${build.dir}/"), '/');
132 return finalPath; 132 ret += finalPath;
133 } 133 return ret;
134 }
134 else 135 else
135 { 136 {
136 ProjectNode project = (ProjectNode)refr.Parent; 137 ProjectNode project = (ProjectNode)refr.Parent;
@@ -225,7 +226,7 @@ namespace Prebuild.Core.Targets
225 { 226 {
226 if (refr.LocalCopy) 227 if (refr.LocalCopy)
227 { 228 {
228 ss.WriteLine(" <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr))+"\" />", '/')); 229 ss.WriteLine(" <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr))+"\" />", '/'));
229 } 230 }
230 } 231 }
231 ss.WriteLine(" </fileset>"); 232 ss.WriteLine(" </fileset>");
@@ -315,8 +316,7 @@ namespace Prebuild.Core.Targets
315 ss.WriteLine(" </lib>"); 316 ss.WriteLine(" </lib>");
316 foreach(ReferenceNode refr in project.References) 317 foreach(ReferenceNode refr in project.References)
317 { 318 {
318 string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/'); 319 ss.WriteLine(" <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, 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 3727947..eddfe74 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -1,9 +1,9 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
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>{6A56621D-A328-4E23-96E3-0514A3817BAF}</ProjectGuid> 6 <ProjectGuid>{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}</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>
@@ -17,8 +17,7 @@
17 <DefaultTargetSchema>IE50</DefaultTargetSchema> 17 <DefaultTargetSchema>IE50</DefaultTargetSchema>
18 <DelaySign>false</DelaySign> 18 <DelaySign>false</DelaySign>
19 <OutputType>Exe</OutputType> 19 <OutputType>Exe</OutputType>
20 <AppDesignerFolder> 20 <AppDesignerFolder></AppDesignerFolder>
21 </AppDesignerFolder>
22 <RootNamespace>Prebuild</RootNamespace> 21 <RootNamespace>Prebuild</RootNamespace>
23 <StartupObject>Prebuild.Prebuild</StartupObject> 22 <StartupObject>Prebuild.Prebuild</StartupObject>
24 <FileUpgradeFlags> 23 <FileUpgradeFlags>
@@ -31,8 +30,7 @@
31 <ConfigurationOverrideFile> 30 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 31 </ConfigurationOverrideFile>
33 <DefineConstants>DEBUG;TRACE</DefineConstants> 32 <DefineConstants>DEBUG;TRACE</DefineConstants>
34 <DocumentationFile> 33 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 34 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 35 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 36 <Optimize>False</Optimize>
@@ -50,8 +48,7 @@
50 <ConfigurationOverrideFile> 48 <ConfigurationOverrideFile>
51 </ConfigurationOverrideFile> 49 </ConfigurationOverrideFile>
52 <DefineConstants>TRACE</DefineConstants> 50 <DefineConstants>TRACE</DefineConstants>
53 <DocumentationFile> 51 <DocumentationFile></DocumentationFile>
54 </DocumentationFile>
55 <DebugSymbols>False</DebugSymbols> 52 <DebugSymbols>False</DebugSymbols>
56 <FileAlignment>4096</FileAlignment> 53 <FileAlignment>4096</FileAlignment>
57 <Optimize>True</Optimize> 54 <Optimize>True</Optimize>
@@ -63,15 +60,15 @@
63 <NoWarn>1595</NoWarn> 60 <NoWarn>1595</NoWarn>
64 </PropertyGroup> 61 </PropertyGroup>
65 <ItemGroup> 62 <ItemGroup>
66 <Reference Include="System.EnterpriseServices"> 63 <Reference Include="System.EnterpriseServices" >
67 <HintPath>System.EnterpriseServices.dll</HintPath> 64 <HintPath>System.EnterpriseServices.dll</HintPath>
68 <Private>False</Private> 65 <Private>False</Private>
69 </Reference> 66 </Reference>
70 <Reference Include="System.Xml"> 67 <Reference Include="System.Xml" >
71 <HintPath>System.Xml.dll</HintPath> 68 <HintPath>System.Xml.dll</HintPath>
72 <Private>False</Private> 69 <Private>False</Private>
73 </Reference> 70 </Reference>
74 <Reference Include="System"> 71 <Reference Include="System" >
75 <HintPath>System.dll</HintPath> 72 <HintPath>System.dll</HintPath>
76 <Private>False</Private> 73 <Private>False</Private>
77 </Reference> 74 </Reference>
@@ -205,4 +202,4 @@
205 <PostBuildEvent> 202 <PostBuildEvent>
206 </PostBuildEvent> 203 </PostBuildEvent>
207 </PropertyGroup> 204 </PropertyGroup>
208</Project> \ No newline at end of file 205</Project>