From 3a20a7b5d1d3a70b203721f240f938fc221de732 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 14 Jun 2007 11:01:38 +0000
Subject: * Applied Prebuild fixes to Sugilite * Rebuilt project files *
 ignored some bins

---
 Prebuild/src/Core/Nodes/ConfigurationNode.cs | 14 ++++++++++++--
 Prebuild/src/Core/Nodes/FilesNode.cs         |  3 ++-
 Prebuild/src/Core/Nodes/ProjectNode.cs       | 28 ++++++++++++++++++++++------
 Prebuild/src/Core/Nodes/ReferenceNode.cs     | 14 ++++++++++++--
 Prebuild/src/Core/Nodes/ReferencePathNode.cs | 14 ++++++++++++--
 Prebuild/src/Core/Nodes/SolutionNode.cs      | 10 +++++++---
 Prebuild/src/Prebuild.csproj                 | 10 +++++-----
 Prebuild/src/Prebuild.exe.build              |  2 +-
 8 files changed, 73 insertions(+), 22 deletions(-)

(limited to 'Prebuild')

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
 	/// 
 	/// </summary>
 	[DataNode("Configuration")]
-	public class ConfigurationNode : DataNode, ICloneable
+	public class ConfigurationNode : DataNode, ICloneable, IComparable
 	{
 		#region Fields
 
@@ -173,5 +173,15 @@ namespace Prebuild.Core.Nodes
 		}
 
 		#endregion
-	}
+
+        #region IComparable Members
+
+        public int CompareTo(object obj)
+        {
+            ConfigurationNode that = (ConfigurationNode) obj;
+            return this.m_Name.CompareTo(that.m_Name);
+        }
+
+        #endregion
+    }
 }
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
 		}
 
 		#endregion
-	}
+
+    }
 }
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
 	/// 
 	/// </summary>
 	[DataNode("Project")]
-	public class ProjectNode : DataNode
+	public class ProjectNode : DataNode, IComparable
 	{
 		#region Fields
 
@@ -290,7 +290,9 @@ namespace Prebuild.Core.Nodes
 		{
 			get
 			{
-				return m_Configurations.Values;
+                ArrayList tmp = new ArrayList( ConfigurationsTable.Values);
+			    tmp.Sort();
+				return tmp;
 			}
 		}
 
@@ -314,8 +316,10 @@ namespace Prebuild.Core.Nodes
 		{
 			get
 			{
-				return m_ReferencePaths;
-			}
+                ArrayList tmp = new ArrayList(m_ReferencePaths);
+                tmp.Sort();
+                return tmp;
+            }
 		}
 
 		/// <summary>
@@ -326,7 +330,9 @@ namespace Prebuild.Core.Nodes
 		{
 			get
 			{
-				return m_References;
+                ArrayList tmp = new ArrayList(m_References);
+                tmp.Sort();
+                return tmp;
 			}
 		}
 
@@ -490,5 +496,15 @@ namespace Prebuild.Core.Nodes
 
 
 		#endregion
-	}
+
+        #region IComparable Members
+
+        public int CompareTo(object obj)
+        {
+            ProjectNode that = (ProjectNode)obj;
+            return this.m_Name.CompareTo(that.m_Name);
+        }
+
+        #endregion
+    }
 }
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
 	/// 
 	/// </summary>
 	[DataNode("Reference")]
-	public class ReferenceNode : DataNode
+	public class ReferenceNode : DataNode, IComparable
 	{
 		#region Fields
 
@@ -139,5 +139,15 @@ namespace Prebuild.Core.Nodes
 		}
 
 		#endregion
-	}
+
+        #region IComparable Members
+
+        public int CompareTo(object obj)
+        {
+            ReferenceNode that = (ReferenceNode)obj;
+            return this.m_Name.CompareTo(that.m_Name);
+        }
+
+        #endregion
+    }
 }
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
 	/// 
 	/// </summary>
 	[DataNode("ReferencePath")]
-	public class ReferencePathNode : DataNode
+	public class ReferencePathNode : DataNode, IComparable
 	{
 		#region Fields
 
@@ -94,5 +94,15 @@ namespace Prebuild.Core.Nodes
 		}
 
 		#endregion
-	}
+
+        #region IComparable Members
+
+        public int CompareTo(object obj)
+        {
+            ReferencePathNode that = (ReferencePathNode)obj;
+            return this.m_Path.CompareTo(that.m_Path);
+        }
+
+        #endregion
+    }
 }
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
 		{
 			get
 			{
-				return m_Configurations.Values;
-			}
+                ArrayList tmp = new ArrayList(ConfigurationsTable.Values);
+                tmp.Sort();
+                return tmp;
+            }
 		}
 
 		/// <summary>
@@ -189,7 +191,9 @@ namespace Prebuild.Core.Nodes
 		{
 			get
 			{
-				return m_Projects.Values;
+                ArrayList tmp = new ArrayList(m_Projects.Values);
+                tmp.Sort();
+                return tmp;
 			}
 		}
 
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 @@
     <ApplicationIcon>App.ico</ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
-    <AssemblyName>prebuild</AssemblyName>
+    <AssemblyName>Prebuild</AssemblyName>
     <AssemblyOriginatorKeyFile>Prebuild.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <DefaultClientScript>JScript</DefaultClientScript>
@@ -60,6 +60,10 @@
     <NoWarn>1595</NoWarn>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System.EnterpriseServices" >
       <HintPath>System.EnterpriseServices.dll</HintPath>
       <Private>False</Private>
@@ -68,10 +72,6 @@
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
   </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 @@
                     <include name="${project::get-base-directory()}" />
                     <include name="${project::get-base-directory()}/${build.dir}" />
                 </lib>
+                <include name="System.dll" />
                 <include name="System.EnterpriseServices.dll" />
                 <include name="System.Xml.dll" />
-                <include name="System.dll" />
             </references>
         </csc>
         <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-- 
cgit v1.1