* Changed some more sort order issues

* Updated vs2005 files as well
author: lbsa71 2007-06-13 21:06:39 +0000
committer: lbsa71 2007-06-13 21:06:39 +0000
commit: 1876c70ebdc2b620797318a56fb4c2ea03fbef17 (patch)
tree: d1cdee5f1ddb4751b6cb41b97bb847ba337ad4c0 /Prebuild/src
parent: * First attempt at fixing differing build files on different .net flavours. (diff)
download: opensim-SC_OLD-1876c70ebdc2b620797318a56fb4c2ea03fbef17.zip
opensim-SC_OLD-1876c70ebdc2b620797318a56fb4c2ea03fbef17.tar.gz
opensim-SC_OLD-1876c70ebdc2b620797318a56fb4c2ea03fbef17.tar.bz2
opensim-SC_OLD-1876c70ebdc2b620797318a56fb4c2ea03fbef17.tar.xz
3 files changed, 52 insertions, 38 deletions
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
index 5f03c4d..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
@@ -496,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/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 df6b4f4..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>
@@ -83,6 +83,9 @@
    <Compile Include="Prebuild.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="Core\FatalException.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="Core\Kernel.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -92,25 +95,19 @@
    <Compile Include="Core\WarningException.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\FatalException.cs">
+    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Interfaces\ITarget.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\Interfaces\IDataNode.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Attributes\DataNodeAttribute.cs">
+    <Compile Include="Core\Attributes\TargetAttribute.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Attributes\TargetAttribute.cs">
+    <Compile Include="Core\Interfaces\IDataNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\ProjectNode.cs">
+    <Compile Include="Core\Interfaces\ITarget.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -122,73 +119,76 @@
    <Compile Include="Core\Nodes\ExcludeNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\OptionsNode.cs">
+    <Compile Include="Core\Nodes\FileNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\ReferencePathNode.cs">
+    <Compile Include="Core\Nodes\FilesNode.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Nodes\MatchNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\SolutionNode.cs">
+    <Compile Include="Core\Nodes\OptionsNode.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Nodes\ProcessNode.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="Core\Nodes\ProjectNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="Core\Nodes\ReferenceNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\FileNode.cs">
+    <Compile Include="Core\Nodes\ReferencePathNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Nodes\FilesNode.cs">
+    <Compile Include="Core\Nodes\SolutionNode.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\DebugTarget.cs">
+    <Compile Include="Core\Parse\IfContext.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
+    <Compile Include="Core\Parse\Preprocessor.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Targets\AutotoolsTarget.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
+    <Compile Include="Core\Targets\DebugTarget.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\VS2002Target.cs">
+    <Compile Include="Core\Targets\MonoDevelopTarget.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\VS2003Target.cs">
+    <Compile Include="Core\Targets\NAntTarget.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Core\Targets\SharpDevelop2Target.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\VS2005Target.cs">
+    <Compile Include="Core\Targets\SharpDevelopTarget.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Targets\NAntTarget.cs">
+    <Compile Include="Core\Targets\VS2002Target.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Parse\IfContext.cs">
+    <Compile Include="Core\Targets\VS2003Target.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Parse\Preprocessor.cs">
+    <Compile Include="Core\Targets\VS2005Target.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Utilities\Helper.cs">
+    <Compile Include="Core\Utilities\CommandLineCollection.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Utilities\Log.cs">
+    <Compile Include="Core\Utilities\CurrentDirectory.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Utilities\CommandLineCollection.cs">
+    <Compile Include="Core\Utilities\Helper.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Core\Utilities\CurrentDirectory.cs">
+    <Compile Include="Core\Utilities\Log.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
author	lbsa71	2007-06-13 21:06:39 +0000
committer	lbsa71	2007-06-13 21:06:39 +0000
commit	1876c70ebdc2b620797318a56fb4c2ea03fbef17 (patch)
tree	d1cdee5f1ddb4751b6cb41b97bb847ba337ad4c0 /Prebuild/src
parent	* First attempt at fixing differing build files on different .net flavours. (diff)
download	opensim-SC_OLD-1876c70ebdc2b620797318a56fb4c2ea03fbef17.zip opensim-SC_OLD-1876c70ebdc2b620797318a56fb4c2ea03fbef17.tar.gz opensim-SC_OLD-1876c70ebdc2b620797318a56fb4c2ea03fbef17.tar.bz2 opensim-SC_OLD-1876c70ebdc2b620797318a56fb4c2ea03fbef17.tar.xz

diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs index 5f03c4d..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
@@ -496,5 +496,15 @@ namespace Prebuild.Core.Nodes
496		496
497		497
498	#endregion	498	#endregion
499	}	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	}
500	}	510	}


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 df6b4f4..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>
@@ -83,6 +83,9 @@
83	<Compile Include="Prebuild.cs">	83	<Compile Include="Prebuild.cs">
84	<SubType>Code</SubType>	84	<SubType>Code</SubType>
85	</Compile>	85	</Compile>
		86	<Compile Include="Core\FatalException.cs">
		87	<SubType>Code</SubType>
		88	</Compile>
86	<Compile Include="Core\Kernel.cs">	89	<Compile Include="Core\Kernel.cs">
87	<SubType>Code</SubType>	90	<SubType>Code</SubType>
88	</Compile>	91	</Compile>
@@ -92,25 +95,19 @@
92	<Compile Include="Core\WarningException.cs">	95	<Compile Include="Core\WarningException.cs">
93	<SubType>Code</SubType>	96	<SubType>Code</SubType>
94	</Compile>	97	</Compile>
95	<Compile Include="Core\FatalException.cs">	98	<Compile Include="Core\Attributes\DataNodeAttribute.cs">
96	<SubType>Code</SubType>
97	</Compile>
98	<Compile Include="Core\Interfaces\ITarget.cs">
99	<SubType>Code</SubType>
100	</Compile>
101	<Compile Include="Core\Interfaces\IDataNode.cs">
102	<SubType>Code</SubType>	99	<SubType>Code</SubType>
103	</Compile>	100	</Compile>
104	<Compile Include="Core\Attributes\OptionNodeAttribute.cs">	101	<Compile Include="Core\Attributes\OptionNodeAttribute.cs">
105	<SubType>Code</SubType>	102	<SubType>Code</SubType>
106	</Compile>	103	</Compile>
107	<Compile Include="Core\Attributes\DataNodeAttribute.cs">	104	<Compile Include="Core\Attributes\TargetAttribute.cs">
108	<SubType>Code</SubType>	105	<SubType>Code</SubType>
109	</Compile>	106	</Compile>
110	<Compile Include="Core\Attributes\TargetAttribute.cs">	107	<Compile Include="Core\Interfaces\IDataNode.cs">
111	<SubType>Code</SubType>	108	<SubType>Code</SubType>
112	</Compile>	109	</Compile>
113	<Compile Include="Core\Nodes\ProjectNode.cs">	110	<Compile Include="Core\Interfaces\ITarget.cs">
114	<SubType>Code</SubType>	111	<SubType>Code</SubType>
115	</Compile>	112	</Compile>
116	<Compile Include="Core\Nodes\ConfigurationNode.cs">	113	<Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -122,73 +119,76 @@
122	<Compile Include="Core\Nodes\ExcludeNode.cs">	119	<Compile Include="Core\Nodes\ExcludeNode.cs">
123	<SubType>Code</SubType>	120	<SubType>Code</SubType>
124	</Compile>	121	</Compile>
125	<Compile Include="Core\Nodes\OptionsNode.cs">	122	<Compile Include="Core\Nodes\FileNode.cs">
126	<SubType>Code</SubType>	123	<SubType>Code</SubType>
127	</Compile>	124	</Compile>
128	<Compile Include="Core\Nodes\ReferencePathNode.cs">	125	<Compile Include="Core\Nodes\FilesNode.cs">
129	<SubType>Code</SubType>	126	<SubType>Code</SubType>
130	</Compile>	127	</Compile>
131	<Compile Include="Core\Nodes\MatchNode.cs">	128	<Compile Include="Core\Nodes\MatchNode.cs">
132	<SubType>Code</SubType>	129	<SubType>Code</SubType>
133	</Compile>	130	</Compile>
134	<Compile Include="Core\Nodes\SolutionNode.cs">	131	<Compile Include="Core\Nodes\OptionsNode.cs">
135	<SubType>Code</SubType>	132	<SubType>Code</SubType>
136	</Compile>	133	</Compile>
137	<Compile Include="Core\Nodes\ProcessNode.cs">	134	<Compile Include="Core\Nodes\ProcessNode.cs">
138	<SubType>Code</SubType>	135	<SubType>Code</SubType>
139	</Compile>	136	</Compile>
		137	<Compile Include="Core\Nodes\ProjectNode.cs">
		138	<SubType>Code</SubType>
		139	</Compile>
140	<Compile Include="Core\Nodes\ReferenceNode.cs">	140	<Compile Include="Core\Nodes\ReferenceNode.cs">
141	<SubType>Code</SubType>	141	<SubType>Code</SubType>
142	</Compile>	142	</Compile>
143	<Compile Include="Core\Nodes\FileNode.cs">	143	<Compile Include="Core\Nodes\ReferencePathNode.cs">
144	<SubType>Code</SubType>	144	<SubType>Code</SubType>
145	</Compile>	145	</Compile>
146	<Compile Include="Core\Nodes\FilesNode.cs">	146	<Compile Include="Core\Nodes\SolutionNode.cs">
147	<SubType>Code</SubType>	147	<SubType>Code</SubType>
148	</Compile>	148	</Compile>
149	<Compile Include="Core\Targets\DebugTarget.cs">	149	<Compile Include="Core\Parse\IfContext.cs">
150	<SubType>Code</SubType>	150	<SubType>Code</SubType>
151	</Compile>	151	</Compile>
152	<Compile Include="Core\Targets\MonoDevelopTarget.cs">	152	<Compile Include="Core\Parse\Preprocessor.cs">
153	<SubType>Code</SubType>	153	<SubType>Code</SubType>
154	</Compile>	154	</Compile>
155	<Compile Include="Core\Targets\AutotoolsTarget.cs">	155	<Compile Include="Core\Targets\AutotoolsTarget.cs">
156	<SubType>Code</SubType>	156	<SubType>Code</SubType>
157	</Compile>	157	</Compile>
158	<Compile Include="Core\Targets\SharpDevelopTarget.cs">	158	<Compile Include="Core\Targets\DebugTarget.cs">
159	<SubType>Code</SubType>	159	<SubType>Code</SubType>
160	</Compile>	160	</Compile>
161	<Compile Include="Core\Targets\VS2002Target.cs">	161	<Compile Include="Core\Targets\MonoDevelopTarget.cs">
162	<SubType>Code</SubType>	162	<SubType>Code</SubType>
163	</Compile>	163	</Compile>
164	<Compile Include="Core\Targets\VS2003Target.cs">	164	<Compile Include="Core\Targets\NAntTarget.cs">
165	<SubType>Code</SubType>	165	<SubType>Code</SubType>
166	</Compile>	166	</Compile>
167	<Compile Include="Core\Targets\SharpDevelop2Target.cs">	167	<Compile Include="Core\Targets\SharpDevelop2Target.cs">
168	<SubType>Code</SubType>	168	<SubType>Code</SubType>
169	</Compile>	169	</Compile>
170	<Compile Include="Core\Targets\VS2005Target.cs">	170	<Compile Include="Core\Targets\SharpDevelopTarget.cs">
171	<SubType>Code</SubType>	171	<SubType>Code</SubType>
172	</Compile>	172	</Compile>
173	<Compile Include="Core\Targets\NAntTarget.cs">	173	<Compile Include="Core\Targets\VS2002Target.cs">
174	<SubType>Code</SubType>	174	<SubType>Code</SubType>
175	</Compile>	175	</Compile>
176	<Compile Include="Core\Parse\IfContext.cs">	176	<Compile Include="Core\Targets\VS2003Target.cs">
177	<SubType>Code</SubType>	177	<SubType>Code</SubType>
178	</Compile>	178	</Compile>
179	<Compile Include="Core\Parse\Preprocessor.cs">	179	<Compile Include="Core\Targets\VS2005Target.cs">
180	<SubType>Code</SubType>	180	<SubType>Code</SubType>
181	</Compile>	181	</Compile>
182	<Compile Include="Core\Utilities\Helper.cs">	182	<Compile Include="Core\Utilities\CommandLineCollection.cs">
183	<SubType>Code</SubType>	183	<SubType>Code</SubType>
184	</Compile>	184	</Compile>
185	<Compile Include="Core\Utilities\Log.cs">	185	<Compile Include="Core\Utilities\CurrentDirectory.cs">
186	<SubType>Code</SubType>	186	<SubType>Code</SubType>
187	</Compile>	187	</Compile>
188	<Compile Include="Core\Utilities\CommandLineCollection.cs">	188	<Compile Include="Core\Utilities\Helper.cs">
189	<SubType>Code</SubType>	189	<SubType>Code</SubType>
190	</Compile>	190	</Compile>
191	<Compile Include="Core\Utilities\CurrentDirectory.cs">	191	<Compile Include="Core\Utilities\Log.cs">
192	<SubType>Code</SubType>	192	<SubType>Code</SubType>
193	</Compile>	193	</Compile>
194	<Compile Include="Properties\AssemblyInfo.cs">	194	<Compile Include="Properties\AssemblyInfo.cs">