7 files changed, 79 insertions, 42 deletions

diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 449896b..227677f 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}"

 EndProject

 Global

-  GlobalSection(SolutionConfigurationPlatforms) = preSolution

-    Debug|Any CPU = Debug|Any CPU

-    Release|Any CPU = Release|Any CPU

-  EndGlobalSection

-  GlobalSection(ProjectConfigurationPlatforms) = postSolution

-    {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-  EndGlobalSection

-  GlobalSection(SolutionProperties) = preSolution

-    HideSolutionNode = FALSE

-  EndGlobalSection

+        GlobalSection(SolutionConfigurationPlatforms) = preSolution

+                Debug|Any CPU = Debug|Any CPU

+                Release|Any CPU = Release|Any CPU

+        EndGlobalSection

+        GlobalSection(ProjectConfigurationPlatforms) = postSolution

+                {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+        EndGlobalSection

+        GlobalSection(SolutionProperties) = preSolution

+                HideSolutionNode = FALSE

+        EndGlobalSection

 EndGlobal

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..5f03c4d 100644
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -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;

                         }

                 }

 

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/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index f2c8cab..2851125 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
             </resources>

             <sources failonempty="true">

                 <include name="Prebuild.cs" />

+                <include name="Core/FatalException.cs" />

                 <include name="Core/Kernel.cs" />

                 <include name="Core/UnknownLanguageException.cs" />

                 <include name="Core/WarningException.cs" />

-                <include name="Core/FatalException.cs" />

-                <include name="Core/Interfaces/ITarget.cs" />

-                <include name="Core/Interfaces/IDataNode.cs" />

-                <include name="Core/Attributes/OptionNodeAttribute.cs" />

                 <include name="Core/Attributes/DataNodeAttribute.cs" />

+                <include name="Core/Attributes/OptionNodeAttribute.cs" />

                 <include name="Core/Attributes/TargetAttribute.cs" />

-                <include name="Core/Nodes/ProjectNode.cs" />

+                <include name="Core/Interfaces/IDataNode.cs" />

+                <include name="Core/Interfaces/ITarget.cs" />

                 <include name="Core/Nodes/ConfigurationNode.cs" />

                 <include name="Core/Nodes/DataNode.cs" />

                 <include name="Core/Nodes/ExcludeNode.cs" />

-                <include name="Core/Nodes/OptionsNode.cs" />

-                <include name="Core/Nodes/ReferencePathNode.cs" />

+                <include name="Core/Nodes/FileNode.cs" />

+                <include name="Core/Nodes/FilesNode.cs" />

                 <include name="Core/Nodes/MatchNode.cs" />

-                <include name="Core/Nodes/SolutionNode.cs" />

+                <include name="Core/Nodes/OptionsNode.cs" />

                 <include name="Core/Nodes/ProcessNode.cs" />

+                <include name="Core/Nodes/ProjectNode.cs" />

                 <include name="Core/Nodes/ReferenceNode.cs" />

-                <include name="Core/Nodes/FileNode.cs" />

-                <include name="Core/Nodes/FilesNode.cs" />

+                <include name="Core/Nodes/ReferencePathNode.cs" />

+                <include name="Core/Nodes/SolutionNode.cs" />

+                <include name="Core/Parse/IfContext.cs" />

+                <include name="Core/Parse/Preprocessor.cs" />

+                <include name="Core/Targets/AutotoolsTarget.cs" />

                 <include name="Core/Targets/DebugTarget.cs" />

                 <include name="Core/Targets/MonoDevelopTarget.cs" />

-                <include name="Core/Targets/AutotoolsTarget.cs" />

+                <include name="Core/Targets/NAntTarget.cs" />

+                <include name="Core/Targets/SharpDevelop2Target.cs" />

                 <include name="Core/Targets/SharpDevelopTarget.cs" />

                 <include name="Core/Targets/VS2002Target.cs" />

                 <include name="Core/Targets/VS2003Target.cs" />

-                <include name="Core/Targets/SharpDevelop2Target.cs" />

                 <include name="Core/Targets/VS2005Target.cs" />

-                <include name="Core/Targets/NAntTarget.cs" />

-                <include name="Core/Parse/IfContext.cs" />

-                <include name="Core/Parse/Preprocessor.cs" />

-                <include name="Core/Utilities/Helper.cs" />

-                <include name="Core/Utilities/Log.cs" />

                 <include name="Core/Utilities/CommandLineCollection.cs" />

                 <include name="Core/Utilities/CurrentDirectory.cs" />

+                <include name="Core/Utilities/Helper.cs" />

+                <include name="Core/Utilities/Log.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

@@ -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/" />