aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Prebuild
diff options
context:
space:
mode:
Diffstat (limited to 'Prebuild')
-rw-r--r--Prebuild/Prebuild.sln26
-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.cs14
-rw-r--r--Prebuild/src/Core/Nodes/ReferenceNode.cs14
-rw-r--r--Prebuild/src/Core/Nodes/ReferencePathNode.cs14
-rw-r--r--Prebuild/src/Prebuild.exe.build36
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
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Global 5Global
6 GlobalSection(SolutionConfigurationPlatforms) = preSolution 6 GlobalSection(SolutionConfigurationPlatforms) = preSolution
7 Debug|Any CPU = Debug|Any CPU 7 Debug|Any CPU = Debug|Any CPU
8 Release|Any CPU = Release|Any CPU 8 Release|Any CPU = Release|Any CPU
9 EndGlobalSection 9 EndGlobalSection
10 GlobalSection(ProjectConfigurationPlatforms) = postSolution 10 GlobalSection(ProjectConfigurationPlatforms) = postSolution
11 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 11 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
12 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 12 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
13 {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 13 {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
14 {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 14 {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
15 EndGlobalSection 15 EndGlobalSection
16 GlobalSection(SolutionProperties) = preSolution 16 GlobalSection(SolutionProperties) = preSolution
17 HideSolutionNode = FALSE 17 HideSolutionNode = FALSE
18 EndGlobalSection 18 EndGlobalSection
19EndGlobal 19EndGlobal
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..5f03c4d 100644
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -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
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/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 @@
14 </resources> 14 </resources>
15 <sources failonempty="true"> 15 <sources failonempty="true">
16 <include name="Prebuild.cs" /> 16 <include name="Prebuild.cs" />
17 <include name="Core/FatalException.cs" />
17 <include name="Core/Kernel.cs" /> 18 <include name="Core/Kernel.cs" />
18 <include name="Core/UnknownLanguageException.cs" /> 19 <include name="Core/UnknownLanguageException.cs" />
19 <include name="Core/WarningException.cs" /> 20 <include name="Core/WarningException.cs" />
20 <include name="Core/FatalException.cs" />
21 <include name="Core/Interfaces/ITarget.cs" />
22 <include name="Core/Interfaces/IDataNode.cs" />
23 <include name="Core/Attributes/OptionNodeAttribute.cs" />
24 <include name="Core/Attributes/DataNodeAttribute.cs" /> 21 <include name="Core/Attributes/DataNodeAttribute.cs" />
22 <include name="Core/Attributes/OptionNodeAttribute.cs" />
25 <include name="Core/Attributes/TargetAttribute.cs" /> 23 <include name="Core/Attributes/TargetAttribute.cs" />
26 <include name="Core/Nodes/ProjectNode.cs" /> 24 <include name="Core/Interfaces/IDataNode.cs" />
25 <include name="Core/Interfaces/ITarget.cs" />
27 <include name="Core/Nodes/ConfigurationNode.cs" /> 26 <include name="Core/Nodes/ConfigurationNode.cs" />
28 <include name="Core/Nodes/DataNode.cs" /> 27 <include name="Core/Nodes/DataNode.cs" />
29 <include name="Core/Nodes/ExcludeNode.cs" /> 28 <include name="Core/Nodes/ExcludeNode.cs" />
30 <include name="Core/Nodes/OptionsNode.cs" /> 29 <include name="Core/Nodes/FileNode.cs" />
31 <include name="Core/Nodes/ReferencePathNode.cs" /> 30 <include name="Core/Nodes/FilesNode.cs" />
32 <include name="Core/Nodes/MatchNode.cs" /> 31 <include name="Core/Nodes/MatchNode.cs" />
33 <include name="Core/Nodes/SolutionNode.cs" /> 32 <include name="Core/Nodes/OptionsNode.cs" />
34 <include name="Core/Nodes/ProcessNode.cs" /> 33 <include name="Core/Nodes/ProcessNode.cs" />
34 <include name="Core/Nodes/ProjectNode.cs" />
35 <include name="Core/Nodes/ReferenceNode.cs" /> 35 <include name="Core/Nodes/ReferenceNode.cs" />
36 <include name="Core/Nodes/FileNode.cs" /> 36 <include name="Core/Nodes/ReferencePathNode.cs" />
37 <include name="Core/Nodes/FilesNode.cs" /> 37 <include name="Core/Nodes/SolutionNode.cs" />
38 <include name="Core/Parse/IfContext.cs" />
39 <include name="Core/Parse/Preprocessor.cs" />
40 <include name="Core/Targets/AutotoolsTarget.cs" />
38 <include name="Core/Targets/DebugTarget.cs" /> 41 <include name="Core/Targets/DebugTarget.cs" />
39 <include name="Core/Targets/MonoDevelopTarget.cs" /> 42 <include name="Core/Targets/MonoDevelopTarget.cs" />
40 <include name="Core/Targets/AutotoolsTarget.cs" /> 43 <include name="Core/Targets/NAntTarget.cs" />
44 <include name="Core/Targets/SharpDevelop2Target.cs" />
41 <include name="Core/Targets/SharpDevelopTarget.cs" /> 45 <include name="Core/Targets/SharpDevelopTarget.cs" />
42 <include name="Core/Targets/VS2002Target.cs" /> 46 <include name="Core/Targets/VS2002Target.cs" />
43 <include name="Core/Targets/VS2003Target.cs" /> 47 <include name="Core/Targets/VS2003Target.cs" />
44 <include name="Core/Targets/SharpDevelop2Target.cs" />
45 <include name="Core/Targets/VS2005Target.cs" /> 48 <include name="Core/Targets/VS2005Target.cs" />
46 <include name="Core/Targets/NAntTarget.cs" />
47 <include name="Core/Parse/IfContext.cs" />
48 <include name="Core/Parse/Preprocessor.cs" />
49 <include name="Core/Utilities/Helper.cs" />
50 <include name="Core/Utilities/Log.cs" />
51 <include name="Core/Utilities/CommandLineCollection.cs" /> 49 <include name="Core/Utilities/CommandLineCollection.cs" />
52 <include name="Core/Utilities/CurrentDirectory.cs" /> 50 <include name="Core/Utilities/CurrentDirectory.cs" />
51 <include name="Core/Utilities/Helper.cs" />
52 <include name="Core/Utilities/Log.cs" />
53 <include name="Properties/AssemblyInfo.cs" /> 53 <include name="Properties/AssemblyInfo.cs" />
54 </sources> 54 </sources>
55 <references basedir="${project::get-base-directory()}"> 55 <references basedir="${project::get-base-directory()}">
@@ -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/" />