aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Prebuild/src
diff options
context:
space:
mode:
authorlbsa712007-06-14 11:01:38 +0000
committerlbsa712007-06-14 11:01:38 +0000
commit3a20a7b5d1d3a70b203721f240f938fc221de732 (patch)
tree7a4a657d346aa47558d41b8e2ef4bfae98229885 /Prebuild/src
parentCommented out the Scene.Backup method for now as there isn't really anything ... (diff)
downloadopensim-SC_OLD-3a20a7b5d1d3a70b203721f240f938fc221de732.zip
opensim-SC_OLD-3a20a7b5d1d3a70b203721f240f938fc221de732.tar.gz
opensim-SC_OLD-3a20a7b5d1d3a70b203721f240f938fc221de732.tar.bz2
opensim-SC_OLD-3a20a7b5d1d3a70b203721f240f938fc221de732.tar.xz
* Applied Prebuild fixes to Sugilite
* Rebuilt project files * ignored some bins
Diffstat (limited to 'Prebuild/src')
-rw-r--r--Prebuild/src/Core/Nodes/ConfigurationNode.cs14
-rw-r--r--Prebuild/src/Core/Nodes/FilesNode.cs3
-rw-r--r--Prebuild/src/Core/Nodes/ProjectNode.cs28
-rw-r--r--Prebuild/src/Core/Nodes/ReferenceNode.cs14
-rw-r--r--Prebuild/src/Core/Nodes/ReferencePathNode.cs14
-rw-r--r--Prebuild/src/Core/Nodes/SolutionNode.cs10
-rw-r--r--Prebuild/src/Prebuild.csproj10
-rw-r--r--Prebuild/src/Prebuild.exe.build2
8 files changed, 73 insertions, 22 deletions
diff --git a/Prebuild/src/Core/Nodes/ConfigurationNode.cs b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
index e1488a7..390794f 100644
--- a/Prebuild/src/Core/Nodes/ConfigurationNode.cs
+++ b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
@@ -45,7 +45,7 @@ namespace Prebuild.Core.Nodes
45 /// 45 ///
46 /// </summary> 46 /// </summary>
47 [DataNode("Configuration")] 47 [DataNode("Configuration")]
48 public class ConfigurationNode : DataNode, ICloneable 48 public class ConfigurationNode : DataNode, ICloneable, IComparable
49 { 49 {
50 #region Fields 50 #region Fields
51 51
@@ -173,5 +173,15 @@ namespace Prebuild.Core.Nodes
173 } 173 }
174 174
175 #endregion 175 #endregion
176 } 176
177 #region IComparable Members
178
179 public int CompareTo(object obj)
180 {
181 ConfigurationNode that = (ConfigurationNode) obj;
182 return this.m_Name.CompareTo(that.m_Name);
183 }
184
185 #endregion
186 }
177} 187}
diff --git a/Prebuild/src/Core/Nodes/FilesNode.cs b/Prebuild/src/Core/Nodes/FilesNode.cs
index 442a45f..d31307b 100644
--- a/Prebuild/src/Core/Nodes/FilesNode.cs
+++ b/Prebuild/src/Core/Nodes/FilesNode.cs
@@ -218,5 +218,6 @@ namespace Prebuild.Core.Nodes
218 } 218 }
219 219
220 #endregion 220 #endregion
221 } 221
222 }
222} 223}
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
index 84d9f5d..c56dacc 100644
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -81,7 +81,7 @@ namespace Prebuild.Core.Nodes
81 /// 81 ///
82 /// </summary> 82 /// </summary>
83 [DataNode("Project")] 83 [DataNode("Project")]
84 public class ProjectNode : DataNode 84 public class ProjectNode : DataNode, IComparable
85 { 85 {
86 #region Fields 86 #region Fields
87 87
@@ -290,7 +290,9 @@ namespace Prebuild.Core.Nodes
290 { 290 {
291 get 291 get
292 { 292 {
293 return m_Configurations.Values; 293 ArrayList tmp = new ArrayList( ConfigurationsTable.Values);
294 tmp.Sort();
295 return tmp;
294 } 296 }
295 } 297 }
296 298
@@ -314,8 +316,10 @@ namespace Prebuild.Core.Nodes
314 { 316 {
315 get 317 get
316 { 318 {
317 return m_ReferencePaths; 319 ArrayList tmp = new ArrayList(m_ReferencePaths);
318 } 320 tmp.Sort();
321 return tmp;
322 }
319 } 323 }
320 324
321 /// <summary> 325 /// <summary>
@@ -326,7 +330,9 @@ namespace Prebuild.Core.Nodes
326 { 330 {
327 get 331 get
328 { 332 {
329 return m_References; 333 ArrayList tmp = new ArrayList(m_References);
334 tmp.Sort();
335 return tmp;
330 } 336 }
331 } 337 }
332 338
@@ -490,5 +496,15 @@ namespace Prebuild.Core.Nodes
490 496
491 497
492 #endregion 498 #endregion
493 } 499
500 #region IComparable Members
501
502 public int CompareTo(object obj)
503 {
504 ProjectNode that = (ProjectNode)obj;
505 return this.m_Name.CompareTo(that.m_Name);
506 }
507
508 #endregion
509 }
494} 510}
diff --git a/Prebuild/src/Core/Nodes/ReferenceNode.cs b/Prebuild/src/Core/Nodes/ReferenceNode.cs
index beb50dc..a2880c0 100644
--- a/Prebuild/src/Core/Nodes/ReferenceNode.cs
+++ b/Prebuild/src/Core/Nodes/ReferenceNode.cs
@@ -45,7 +45,7 @@ namespace Prebuild.Core.Nodes
45 /// 45 ///
46 /// </summary> 46 /// </summary>
47 [DataNode("Reference")] 47 [DataNode("Reference")]
48 public class ReferenceNode : DataNode 48 public class ReferenceNode : DataNode, IComparable
49 { 49 {
50 #region Fields 50 #region Fields
51 51
@@ -139,5 +139,15 @@ namespace Prebuild.Core.Nodes
139 } 139 }
140 140
141 #endregion 141 #endregion
142 } 142
143 #region IComparable Members
144
145 public int CompareTo(object obj)
146 {
147 ReferenceNode that = (ReferenceNode)obj;
148 return this.m_Name.CompareTo(that.m_Name);
149 }
150
151 #endregion
152 }
143} 153}
diff --git a/Prebuild/src/Core/Nodes/ReferencePathNode.cs b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
index 5d98dda..0563c1b 100644
--- a/Prebuild/src/Core/Nodes/ReferencePathNode.cs
+++ b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
@@ -47,7 +47,7 @@ namespace Prebuild.Core.Nodes
47 /// 47 ///
48 /// </summary> 48 /// </summary>
49 [DataNode("ReferencePath")] 49 [DataNode("ReferencePath")]
50 public class ReferencePathNode : DataNode 50 public class ReferencePathNode : DataNode, IComparable
51 { 51 {
52 #region Fields 52 #region Fields
53 53
@@ -94,5 +94,15 @@ namespace Prebuild.Core.Nodes
94 } 94 }
95 95
96 #endregion 96 #endregion
97 } 97
98 #region IComparable Members
99
100 public int CompareTo(object obj)
101 {
102 ReferencePathNode that = (ReferencePathNode)obj;
103 return this.m_Path.CompareTo(that.m_Path);
104 }
105
106 #endregion
107 }
98} 108}
diff --git a/Prebuild/src/Core/Nodes/SolutionNode.cs b/Prebuild/src/Core/Nodes/SolutionNode.cs
index 0121075..c777fa4 100644
--- a/Prebuild/src/Core/Nodes/SolutionNode.cs
+++ b/Prebuild/src/Core/Nodes/SolutionNode.cs
@@ -165,8 +165,10 @@ namespace Prebuild.Core.Nodes
165 { 165 {
166 get 166 get
167 { 167 {
168 return m_Configurations.Values; 168 ArrayList tmp = new ArrayList(ConfigurationsTable.Values);
169 } 169 tmp.Sort();
170 return tmp;
171 }
170 } 172 }
171 173
172 /// <summary> 174 /// <summary>
@@ -189,7 +191,9 @@ namespace Prebuild.Core.Nodes
189 { 191 {
190 get 192 get
191 { 193 {
192 return m_Projects.Values; 194 ArrayList tmp = new ArrayList(m_Projects.Values);
195 tmp.Sort();
196 return tmp;
193 } 197 }
194 } 198 }
195 199
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index 55efffa..c8b859c 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -9,7 +9,7 @@
9 <ApplicationIcon>App.ico</ApplicationIcon> 9 <ApplicationIcon>App.ico</ApplicationIcon>
10 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
12 <AssemblyName>prebuild</AssemblyName> 12 <AssemblyName>Prebuild</AssemblyName>
13 <AssemblyOriginatorKeyFile>Prebuild.snk</AssemblyOriginatorKeyFile> 13 <AssemblyOriginatorKeyFile>Prebuild.snk</AssemblyOriginatorKeyFile>
14 <SignAssembly>true</SignAssembly> 14 <SignAssembly>true</SignAssembly>
15 <DefaultClientScript>JScript</DefaultClientScript> 15 <DefaultClientScript>JScript</DefaultClientScript>
@@ -60,6 +60,10 @@
60 <NoWarn>1595</NoWarn> 60 <NoWarn>1595</NoWarn>
61 </PropertyGroup> 61 </PropertyGroup>
62 <ItemGroup> 62 <ItemGroup>
63 <Reference Include="System" >
64 <HintPath>System.dll</HintPath>
65 <Private>False</Private>
66 </Reference>
63 <Reference Include="System.EnterpriseServices" > 67 <Reference Include="System.EnterpriseServices" >
64 <HintPath>System.EnterpriseServices.dll</HintPath> 68 <HintPath>System.EnterpriseServices.dll</HintPath>
65 <Private>False</Private> 69 <Private>False</Private>
@@ -68,10 +72,6 @@
68 <HintPath>System.Xml.dll</HintPath> 72 <HintPath>System.Xml.dll</HintPath>
69 <Private>False</Private> 73 <Private>False</Private>
70 </Reference> 74 </Reference>
71 <Reference Include="System" >
72 <HintPath>System.dll</HintPath>
73 <Private>False</Private>
74 </Reference>
75 </ItemGroup> 75 </ItemGroup>
76 <ItemGroup> 76 <ItemGroup>
77 </ItemGroup> 77 </ItemGroup>
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 43f5516..2851125 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -57,9 +57,9 @@
57 <include name="${project::get-base-directory()}" /> 57 <include name="${project::get-base-directory()}" />
58 <include name="${project::get-base-directory()}/${build.dir}" /> 58 <include name="${project::get-base-directory()}/${build.dir}" />
59 </lib> 59 </lib>
60 <include name="System.dll" />
60 <include name="System.EnterpriseServices.dll" /> 61 <include name="System.EnterpriseServices.dll" />
61 <include name="System.Xml.dll" /> 62 <include name="System.Xml.dll" />
62 <include name="System.dll" />
63 </references> 63 </references>
64 </csc> 64 </csc>
65 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 65 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />