From 69b3a8a9b84a0fb1918f728e27a92ab52128ae3c Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Wed, 13 Jun 2007 19:58:57 +0000 Subject: * First attempt at fixing differing build files on different .net flavours. * And, as always, some bin ignores --- .../OpenSim.Framework/OpenSim.Framework.dll.build | 40 ++++++------- .../Xml/OpenSim.GenericConfig.Xml.dll.build | 2 +- Common/OpenSim.Servers/OpenSim.Servers.dll.build | 12 ++-- Common/XmlRpcCS/XMLRPC.dll.build | 22 +++---- .../OpenGrid.Config.GridConfigDb4o.dll.build | 8 +-- .../OpenGrid.Framework.Data.DB4o.dll.build | 12 ++-- .../OpenGrid.Framework.Data.MSSQL.dll.build | 6 +- .../OpenGrid.Framework.Data.MySQL.dll.build | 14 ++--- .../OpenGrid.Framework.Data.SQLite.dll.build | 8 +-- .../OpenGrid.Framework.Data.dll.build | 6 +- .../OpenGrid.Framework.Manager.dll.build | 4 +- .../OpenGridServices.AssetServer.exe.build | 12 ++-- .../OpenGridServices.GridServer.exe.build | 16 ++--- .../OpenGridServices.InventoryServer.exe.build | 14 ++--- .../OpenGridServices.UserServer.exe.build | 12 ++-- .../OpenUser.Config.UserConfigDb4o.dll.build | 8 +-- .../ServiceManager/ServiceManager.exe.build | 6 +- .../Local/OpenSim.GridInterfaces.Local.dll.build | 4 +- .../Remote/OpenSim.GridInterfaces.Remote.dll.build | 4 +- .../OpenSim.Physics.BasicPhysicsPlugin.dll.build | 2 +- .../Manager/OpenSim.Physics.Manager.dll.build | 4 +- .../OdePlugin/OpenSim.Physics.OdePlugin.dll.build | 4 +- .../OpenSim.Physics.PhysXPlugin.dll.build | 4 +- .../OpenSim.RegionServer.dll.build | 66 ++++++++++----------- .../OpenSim.Scripting.EmbeddedJVM.dll.build | 22 +++---- ...penSim.Storage.LocalStorageBerkeleyDB.dll.build | 6 +- .../OpenSim.Storage.LocalStorageDb4o.dll.build | 6 +- .../OpenSim.Storage.LocalStorageSQLite.dll.build | 8 +-- .../OpenSim.Terrain.BasicTerrain.dll.build | 4 +- OpenSim/OpenSim/OpenSim.exe.build | 12 ++-- Prebuild/Prebuild.sln | 26 ++++---- Prebuild/src/Core/Nodes/ConfigurationNode.cs | 14 ++++- Prebuild/src/Core/Nodes/FilesNode.cs | 3 +- Prebuild/src/Core/Nodes/ProjectNode.cs | 14 +++-- Prebuild/src/Core/Nodes/ReferenceNode.cs | 14 ++++- Prebuild/src/Core/Nodes/ReferencePathNode.cs | 14 ++++- Prebuild/src/Prebuild.exe.build | 36 +++++------ bin/Prebuild.exe | Bin 176128 -> 176128 bytes 38 files changed, 253 insertions(+), 216 deletions(-) diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build index 7577fd1..4d95c7d 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build @@ -12,50 +12,50 @@ - - - - - - - - + + + - - - - - - + + + + + - + + - + + + + + + - + + - + + - - diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build index 926e72c..075ea7f 100644 --- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build +++ b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build @@ -19,9 +19,9 @@ + - diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build index a2af584..25bcd65 100644 --- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build +++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build @@ -11,26 +11,26 @@ - + - - + + - - + - + + diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build index 8d5efd1..2eabfcd 100644 --- a/Common/XmlRpcCS/XMLRPC.dll.build +++ b/Common/XmlRpcCS/XMLRPC.dll.build @@ -11,24 +11,24 @@ + + + + + + + - - - + + - - - - + + - - - - diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build index cbc8479..075593b 100644 --- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build +++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build @@ -19,13 +19,13 @@ - - - - + + + + diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build index db8662d..d82d751 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build @@ -11,9 +11,9 @@ - - + + @@ -21,12 +21,12 @@ + + + - - - - + diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build index 5b6b75b..577da4b 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build @@ -20,11 +20,11 @@ + + - - - + diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build index 84d3d56..a5f4028 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build @@ -11,11 +11,11 @@ + - - - + + @@ -23,12 +23,12 @@ - - - - + + + + diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build index 8c0f8fe..79b0edf 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build @@ -11,8 +11,8 @@ - + @@ -20,12 +20,12 @@ + + - - - + diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build index c993a8d..7abebeb 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build @@ -12,10 +12,10 @@ - + @@ -25,10 +25,10 @@ + - - + diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build index f8cc80e..9430ab9 100644 --- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build @@ -19,10 +19,10 @@ - + - + diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build index 0da1d34..808f015 100644 --- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build +++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build @@ -11,8 +11,8 @@ - + @@ -20,15 +20,15 @@ - - - + + - - + + + diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build index 9d21edd..60c0f85 100644 --- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build +++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build @@ -20,17 +20,17 @@ - - - - - - + + + + - - + + + + diff --git a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build index c23a862..5e67af1 100644 --- a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build +++ b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build @@ -11,24 +11,24 @@ - + - - - + + + - - - + + + diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build index 5275ef4..68cbef7 100644 --- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build +++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build @@ -20,16 +20,16 @@ - - - + + + - - - + + + diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build index 2833bce..bd5d49f 100644 --- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build +++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build @@ -19,13 +19,13 @@ - - - - + + + + diff --git a/OpenGridServices/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build index 5e1dd72..e0502c6 100644 --- a/OpenGridServices/ServiceManager/ServiceManager.exe.build +++ b/OpenGridServices/ServiceManager/ServiceManager.exe.build @@ -18,12 +18,12 @@ + + + - - - diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build index fc2d94b..c3c4ae4 100644 --- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build +++ b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build @@ -20,12 +20,12 @@ - - + + diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build index daf35c6..860251f 100644 --- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build @@ -20,11 +20,11 @@ - - + + diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build index 5845387..00ca3f9 100644 --- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build +++ b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build @@ -19,9 +19,9 @@ - + diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build index 726444a..fc3e1e6 100644 --- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build @@ -22,11 +22,11 @@ - - + + diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build index a49782f..c93c0c2 100644 --- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build +++ b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build @@ -19,10 +19,10 @@ - - + + diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build index 2ea5534..be7a847 100644 --- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build +++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build @@ -19,10 +19,10 @@ - - + + diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 5f33913..13341b3 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build @@ -11,66 +11,66 @@ - - + + - + + - - - - + + + + + + + + + + + + + + + + + + - - + + - + + - - - - - - - - - - - - - - + + + - - - - - - - - - + + + + diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build index ac4d564..cce2fef 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build @@ -11,26 +11,26 @@ - + + - + - - - - - + + + + + - - + - + @@ -39,9 +39,9 @@ + - diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build index 1c7306a..bc2d8ec 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build @@ -18,14 +18,14 @@ - - - + + + diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index 72aac2a..739b98c 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build @@ -12,22 +12,22 @@ + - - - + + diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build index 4c8917a..bd4c731 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build @@ -19,13 +19,13 @@ - - - - + + + + diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build index 9c80ac7..6526648 100644 --- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build +++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build @@ -19,11 +19,11 @@ + - + - diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build index 4f8ca8a..784c9ca 100644 --- a/OpenSim/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim/OpenSim.exe.build @@ -19,18 +19,18 @@ - - - - + + - - + + + + 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 /// /// [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; + } } /// @@ -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 /// /// [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 /// /// [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 @@ + - - - - + - + + - - + + - + + - - + + + + + - + + - - - - - - + + @@ -57,9 +57,9 @@ + - diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe index 4717d79..f794cfa 100644 Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ -- cgit v1.1