Merged changes in Prebuild trunk up to r258 into OpenSim's Prebuild.

Hopefully this should make merging upstream easier.
Building with NAnt should still work, but Visual Studio is untested.

14 files changed, 440 insertions, 81 deletions

diff --git a/Prebuild/src/Core/Nodes/AuthorNode.cs b/Prebuild/src/Core/Nodes/AuthorNode.cs
new file mode 100644
index 0000000..03ea934
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/AuthorNode.cs
@@ -0,0 +1,98 @@
+#region BSD License
+/*
+Copyright (c) 2007 C.J. Adams-Collier (cjac@colliertech.org)
+
+Redistribution and use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions 
+  and the following disclaimer. 
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions 
+  and the following disclaimer in the documentation and/or other materials provided with the 
+  distribution. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source $
+ * $Author:  $
+ * $Date:  $
+ * $Revision:  $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+        /// <summary>
+        /// 
+        /// </summary>
+        [DataNode("Author")]
+        public class AuthorNode : DataNode
+        {
+                #region Fields
+
+                private string m_Signature;
+
+                #endregion
+
+                #region Properties
+
+                /// <summary>
+                /// Gets the signature.
+                /// </summary>
+                /// <value>The signature.</value>
+                public string Signature
+                {
+                        get
+                        {
+                                return m_Signature;
+                        }
+                }
+
+                #endregion
+
+                #region Public Methods
+
+                /// <summary>
+                /// Parses the specified node.
+                /// </summary>
+                /// <param name="node">The node.</param>
+                public override void Parse(XmlNode node)
+                {
+                        if( node == null )
+                        {
+                                throw new ArgumentNullException("node");
+                        }
+
+                        m_Signature = Helper.InterpolateForEnvironmentVariables(node.InnerText);
+                        if(m_Signature == null)
+                        {
+                                m_Signature = "";
+                        }
+
+                        m_Signature = m_Signature.Trim();
+                }
+
+                #endregion
+        }
+}
diff --git a/Prebuild/src/Core/Nodes/ConfigurationNode.cs b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
index d2a5d20..828bff6 100644
--- a/Prebuild/src/Core/Nodes/ConfigurationNode.cs
+++ b/Prebuild/src/Core/Nodes/ConfigurationNode.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Date: 2006-01-28 09:49:58 +0900 (Sat, 28 Jan 2006) $
  * $Revision: 71 $
  */
 #endregion
@@ -183,5 +183,5 @@ namespace Prebuild.Core.Nodes
         }
 
         #endregion
-    }
+        }
 }
diff --git a/Prebuild/src/Core/Nodes/DataNode.cs b/Prebuild/src/Core/Nodes/DataNode.cs
index aa05faa..60ed122 100644
--- a/Prebuild/src/Core/Nodes/DataNode.cs
+++ b/Prebuild/src/Core/Nodes/DataNode.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Date: 2006-01-28 09:49:58 +0900 (Sat, 28 Jan 2006) $
  * $Revision: 71 $
  */
 #endregion
diff --git a/Prebuild/src/Core/Nodes/DescriptionNode.cs b/Prebuild/src/Core/Nodes/DescriptionNode.cs
new file mode 100644
index 0000000..cff7afc
--- /dev/null
+++ b/Prebuild/src/Core/Nodes/DescriptionNode.cs
@@ -0,0 +1,98 @@
+#region BSD License
+/*
+Copyright (c) 2007 C.J. Adams-Collier (cjac@colliertech.org)
+
+Redistribution and use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions 
+  and the following disclaimer. 
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions 
+  and the following disclaimer in the documentation and/or other materials provided with the 
+  distribution. 
+* The name of the author may not be used to endorse or promote products derived from this software 
+  without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#endregion
+
+#region CVS Information
+/*
+ * $Source $
+ * $Author:  $
+ * $Date:  $
+ * $Revision:  $
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Xml;
+
+using Prebuild.Core.Attributes;
+using Prebuild.Core.Interfaces;
+using Prebuild.Core.Utilities;
+
+namespace Prebuild.Core.Nodes
+{
+        /// <summary>
+        /// The object representing the /Prebuild/Solution/Project/Description element
+        /// </summary>
+        [DataNode("Description")]
+        public class DescriptionNode : DataNode
+        {
+                #region Fields
+
+                private string m_Value;
+
+                #endregion
+
+                #region Properties
+
+                /// <summary>
+                /// Gets the description Value.
+                /// </summary>
+                /// <value>The description Value.</value>
+                public string Value
+                {
+                        get
+                        {
+                                return m_Value;
+                        }
+                }
+
+                #endregion
+
+                #region Public Methods
+
+                /// <summary>
+                /// Parses the specified node.
+                /// </summary>
+                /// <param name="node">The node.</param>
+                public override void Parse(XmlNode node)
+                {
+                        if( node == null )
+                        {
+                                throw new ArgumentNullException("node");
+                        }
+
+                        m_Value = Helper.InterpolateForEnvironmentVariables(node.InnerText);
+                        if(m_Value == null)
+                        {
+                                m_Value = "";
+                        }
+
+                        m_Value = m_Value.Trim();
+                }
+
+                #endregion
+        }
+}
diff --git a/Prebuild/src/Core/Nodes/ExcludeNode.cs b/Prebuild/src/Core/Nodes/ExcludeNode.cs
index 905626d..afc869d 100644
--- a/Prebuild/src/Core/Nodes/ExcludeNode.cs
+++ b/Prebuild/src/Core/Nodes/ExcludeNode.cs
@@ -26,9 +26,9 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #region CVS Information
 /*
  * $Source$
- * $Author: jendave $
- * $Date: 2006-01-31 16:35:39 +0100 (ti, 31 jan 2006) $
- * $Revision: 74 $
+ * $Author: borrillis $
+ * $Date: 2007-05-25 01:03:16 +0900 (Fri, 25 May 2007) $
+ * $Revision: 243 $
  */
 #endregion
 
@@ -49,7 +49,7 @@ namespace Prebuild.Core.Nodes
         {
                 #region Fields
 
-                private string m_Name = "unknown";
+        private string m_Pattern = "";
 
                 #endregion
 
@@ -63,11 +63,23 @@ namespace Prebuild.Core.Nodes
                 {
                         get
                         {
-                                return m_Name;
+                                return m_Pattern;
                         }
                 }
 
-                #endregion
+        /// <summary>
+        /// Gets the pattern.
+        /// </summary>
+        /// <value>The pattern.</value>
+        public string Pattern
+        {
+            get
+            {
+                return m_Pattern;
+            }
+        }
+
+        #endregion
 
                 #region Public Methods
 
@@ -77,7 +89,8 @@ namespace Prebuild.Core.Nodes
                 /// <param name="node">The node.</param>
                 public override void Parse(XmlNode node)
                 {
-                        m_Name = Helper.AttributeValue(node, "name", m_Name);
+            m_Pattern = Helper.AttributeValue( node, "name", m_Pattern );
+            m_Pattern = Helper.AttributeValue(node, "pattern", m_Pattern );
                 }
 
                 #endregion
diff --git a/Prebuild/src/Core/Nodes/FileNode.cs b/Prebuild/src/Core/Nodes/FileNode.cs
index ab0a2a3..083dba5 100644
--- a/Prebuild/src/Core/Nodes/FileNode.cs
+++ b/Prebuild/src/Core/Nodes/FileNode.cs
@@ -26,9 +26,9 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #region CVS Information
 /*
  * $Source$
- * $Author: jendave $
- * $Date: 2007-01-08 17:55:40 +0100 (må, 08 jan 2007) $
- * $Revision: 197 $
+ * $Author: borrillis $
+ * $Date: 2007-05-25 01:03:16 +0900 (Fri, 25 May 2007) $
+ * $Revision: 243 $
  */
 #endregion
 
@@ -118,6 +118,8 @@ namespace Prebuild.Core.Nodes
                 private SubType m_SubType = SubType.Code;
                 private CopyToOutput m_CopyToOutput = CopyToOutput.Never;
                 private bool m_Link = false;
+                private string m_LinkPath = string.Empty;
+        private bool m_PreservePath = false;
 
 
                 #endregion
@@ -173,6 +175,13 @@ namespace Prebuild.Core.Nodes
                         }
                 }
 
+                public string LinkPath
+                {
+                        get
+                        {
+                                return this.m_LinkPath;
+                        }
+                }
                 /// <summary>
                 /// 
                 /// </summary>
@@ -195,6 +204,19 @@ namespace Prebuild.Core.Nodes
                         }
                 }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        public bool PreservePath
+        {
+            get
+            {
+                return m_PreservePath;
+            }
+        }
+
                 #endregion
 
                 #region Public Methods
@@ -211,7 +233,12 @@ namespace Prebuild.Core.Nodes
                                 Helper.AttributeValue(node, "subType", m_SubType.ToString()));
                         m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName.ToString());
                         this.m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
+                        if ( this.m_Link == true )
+                        {
+                                this.m_LinkPath = Helper.AttributeValue( node, "linkPath", string.Empty );
+                        }
                         this.m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", this.m_CopyToOutput.ToString()));
+            this.m_PreservePath = bool.Parse( Helper.AttributeValue( node, "preservePath", bool.FalseString ) );
 
                         if( node == null )
                         {
diff --git a/Prebuild/src/Core/Nodes/FilesNode.cs b/Prebuild/src/Core/Nodes/FilesNode.cs
index 05b2255..7c1dd19 100644
--- a/Prebuild/src/Core/Nodes/FilesNode.cs
+++ b/Prebuild/src/Core/Nodes/FilesNode.cs
@@ -26,9 +26,9 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #region CVS Information
 /*
  * $Source$
- * $Author: jendave $
- * $Date: 2006-09-20 09:42:51 +0200 (on, 20 sep 2006) $
- * $Revision: 164 $
+ * $Author: borrillis $
+ * $Date: 2007-05-25 01:03:16 +0900 (Fri, 25 May 2007) $
+ * $Revision: 243 $
  */
 #endregion
 
@@ -56,7 +56,8 @@ namespace Prebuild.Core.Nodes
                 private Hashtable m_ResourceNames;
                 private Hashtable m_CopyToOutputs;
                 private Hashtable m_Links;
-
+                private Hashtable m_LinkPaths;
+        private Hashtable m_PreservePaths;
 
                 #endregion
 
@@ -73,7 +74,9 @@ namespace Prebuild.Core.Nodes
                         m_ResourceNames = new Hashtable();
                         m_CopyToOutputs = new Hashtable();
                         m_Links = new Hashtable();
-                }
+                        m_LinkPaths = new Hashtable();
+                        m_PreservePaths = new Hashtable();
+        }
 
                 #endregion
 
@@ -127,6 +130,15 @@ namespace Prebuild.Core.Nodes
                         return (bool) this.m_Links[file];
                 }
 
+                public string GetLinkPath( string file )
+                {
+                        if ( !this.m_LinkPaths.ContainsKey( file ) )
+                        {
+                                return string.Empty;
+                        }
+                        return (string)this.m_LinkPaths[ file ];
+                }
+
                 /// <summary>
                 /// 
                 /// </summary>
@@ -157,6 +169,21 @@ namespace Prebuild.Core.Nodes
                         return (string)m_ResourceNames[file];
                 }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        public bool GetPreservePath( string file )
+        {
+            if ( !m_PreservePaths.ContainsKey( file ) )
+            {
+                return false;
+            }
+
+            return (bool)m_PreservePaths[ file ];
+        }
+
                 /// <summary>
                 /// 
                 /// </summary>
@@ -181,8 +208,10 @@ namespace Prebuild.Core.Nodes
                                                         m_BuildActions[fileNode.Path] = fileNode.BuildAction;
                                                         m_SubTypes[fileNode.Path] = fileNode.SubType;
                                                         m_ResourceNames[fileNode.Path] = fileNode.ResourceName;
-                                                        this.m_Links[fileNode.Path] = fileNode.IsLink;
-                                                        this.m_CopyToOutputs[fileNode.Path] = fileNode.CopyToOutput;
+                            this.m_PreservePaths[ fileNode.Path ] = fileNode.PreservePath;
+                            this.m_Links[ fileNode.Path ] = fileNode.IsLink;
+                                                        this.m_LinkPaths[ fileNode.Path ] = fileNode.LinkPath;
+                                                        this.m_CopyToOutputs[ fileNode.Path ] = fileNode.CopyToOutput;
 
                                                 }
                                         }
@@ -191,14 +220,17 @@ namespace Prebuild.Core.Nodes
                                 {
                                         foreach(string file in ((MatchNode)dataNode).Files)
                                         {
+                        MatchNode matchNode = (MatchNode)dataNode;
                                                 if (!m_Files.Contains(file))
                                                 {
                                                         m_Files.Add(file);
-                                                        m_BuildActions[file] = ((MatchNode)dataNode).BuildAction;
-                                                        m_SubTypes[file] = ((MatchNode)dataNode).SubType;
-                                                        m_ResourceNames[file] = ((MatchNode)dataNode).ResourceName;
-                                                        this.m_Links[file] = ((MatchNode) dataNode).IsLink;
-                                                        this.m_CopyToOutputs[file] = ((MatchNode) dataNode).CopyToOutput;
+                            m_BuildActions[ file ] = matchNode.BuildAction;
+                            m_SubTypes[ file ] = matchNode.SubType;
+                            m_ResourceNames[ file ] = matchNode.ResourceName;
+                            this.m_PreservePaths[ file ] = matchNode.PreservePath;
+                            this.m_Links[ file ] = matchNode.IsLink;
+                                                        this.m_LinkPaths[ file ] = matchNode.LinkPath;
+                                                        this.m_CopyToOutputs[ file ] = matchNode.CopyToOutput;
 
                                                 }
                                         }
diff --git a/Prebuild/src/Core/Nodes/MatchNode.cs b/Prebuild/src/Core/Nodes/MatchNode.cs
index 8d7b467..aeaf3c1 100644
--- a/Prebuild/src/Core/Nodes/MatchNode.cs
+++ b/Prebuild/src/Core/Nodes/MatchNode.cs
@@ -26,9 +26,9 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #region CVS Information
 /*
  * $Source$
- * $Author: jendave $
- * $Date: 2006-09-20 09:42:51 +0200 (on, 20 sep 2006) $
- * $Revision: 164 $
+ * $Author: borrillis $
+ * $Date: 2007-05-25 01:03:16 +0900 (Fri, 25 May 2007) $
+ * $Revision: 243 $
  */
 #endregion
 
@@ -41,6 +41,7 @@ using System.Xml;
 using Prebuild.Core.Attributes;
 using Prebuild.Core.Interfaces;
 using Prebuild.Core.Utilities;
+using System.Collections;
 
 namespace Prebuild.Core.Nodes
 {
@@ -59,7 +60,9 @@ namespace Prebuild.Core.Nodes
                 string m_ResourceName = "";
                 private CopyToOutput m_CopyToOutput;
                 private bool m_Link;
-
+                private string m_LinkPath;
+        private bool m_PreservePath;
+        private ArrayList m_Exclusions;
 
                 #endregion
 
@@ -71,6 +74,7 @@ namespace Prebuild.Core.Nodes
                 public MatchNode()
                 {
                         m_Files = new StringCollection();
+            m_Exclusions = new ArrayList();
                 }
 
                 #endregion
@@ -126,6 +130,13 @@ namespace Prebuild.Core.Nodes
                         }
                 }
 
+                public string LinkPath
+                {
+                        get
+                        {
+                                return this.m_LinkPath;
+                        }
+                }
                 /// <summary>
                 /// 
                 /// </summary>
@@ -137,6 +148,13 @@ namespace Prebuild.Core.Nodes
                         }
                 }
 
+        public bool PreservePath
+        {
+            get
+            {
+                return m_PreservePath;
+            }
+        }
 
                 #endregion
 
@@ -149,8 +167,10 @@ namespace Prebuild.Core.Nodes
                 /// <param name="pattern">The pattern.</param>
                 /// <param name="recurse">if set to <c>true</c> [recurse].</param>
                 /// <param name="useRegex">if set to <c>true</c> [use regex].</param>
-                private void RecurseDirectories(string path, string pattern, bool recurse, bool useRegex)
+                private void RecurseDirectories(string path, string pattern, bool recurse, bool useRegex, ArrayList exclusions)
                 {
+                        Match match;
+            Boolean excludeFile;
                         try
                         {
                                 string[] files;
@@ -163,6 +183,7 @@ namespace Prebuild.Core.Nodes
                                                 string fileTemp;
                                                 foreach (string file in files)
                                                 {
+                            excludeFile = false;
                                                         if (file.Substring(0,2) == "./" || file.Substring(0,2) == ".\\")
                                                         {
                                                                 fileTemp = file.Substring(2);
@@ -171,8 +192,20 @@ namespace Prebuild.Core.Nodes
                                                         {
                                                                 fileTemp = file;
                                                         }
-                                                        
-                                                        m_Files.Add(fileTemp);
+
+                            // Check all excludions and set flag if there are any hits.
+                            foreach ( ExcludeNode exclude in exclusions )
+                            {
+                                Regex exRegEx = new Regex( exclude.Pattern );
+                                match = exRegEx.Match( file );
+                                excludeFile |= match.Success;
+                            }
+
+                            if ( !excludeFile )
+                            {
+                                m_Files.Add( fileTemp );
+                            }
+
                                                 }
                                         }
                                         else
@@ -182,14 +215,26 @@ namespace Prebuild.Core.Nodes
                                 }
                                 else
                                 {
-                                        Match match;
                                         files = Directory.GetFiles(path);
                                         foreach(string file in files)
                                         {
+                        excludeFile = false;
+
                                                 match = m_Regex.Match(file);
                                                 if(match.Success)
                                                 {
-                                                        m_Files.Add(file);
+                            // Check all excludions and set flag if there are any hits.
+                            foreach ( ExcludeNode exclude in exclusions )
+                            {
+                                Regex exRegEx = new Regex( exclude.Pattern );
+                                match = exRegEx.Match( file );
+                                excludeFile |= !match.Success;
+                            }
+
+                            if ( !excludeFile )
+                            {
+                                m_Files.Add( file );
+                            }
                                                 }
                                         }
                                 }
@@ -201,7 +246,7 @@ namespace Prebuild.Core.Nodes
                                         {
                                                 foreach(string str in dirs)
                                                 {
-                                                        RecurseDirectories(Helper.NormalizePath(str), pattern, recurse, useRegex);
+                                                        RecurseDirectories(Helper.NormalizePath(str), pattern, recurse, useRegex, exclusions);
                                                 }
                                         }
                                 }
@@ -241,6 +286,11 @@ namespace Prebuild.Core.Nodes
                         m_ResourceName = Helper.AttributeValue(node, "resourceName", m_ResourceName.ToString());
                         this.m_CopyToOutput = (CopyToOutput) Enum.Parse(typeof(CopyToOutput), Helper.AttributeValue(node, "copyToOutput", this.m_CopyToOutput.ToString()));
                         this.m_Link = bool.Parse(Helper.AttributeValue(node, "link", bool.FalseString));
+                        if ( this.m_Link == true )
+                        {
+                                this.m_LinkPath = Helper.AttributeValue( node, "linkPath", string.Empty );
+                        }
+            this.m_PreservePath = bool.Parse( Helper.AttributeValue( node, "preservePath", bool.FalseString ) );
 
 
                         if(path != null && path.Length == 0)
@@ -272,7 +322,6 @@ namespace Prebuild.Core.Nodes
                                 throw new WarningException("Could not compile regex pattern: {0}", ex.Message);
                         }
 
-                        RecurseDirectories(path, pattern, recurse, useRegex);
 
                         foreach(XmlNode child in node.ChildNodes)
                         {
@@ -280,13 +329,12 @@ namespace Prebuild.Core.Nodes
                                 if(dataNode is ExcludeNode)
                                 {
                                         ExcludeNode excludeNode = (ExcludeNode)dataNode;
-                                        if (m_Files.Contains(Helper.NormalizePath(excludeNode.Name)))
-                                        {
-                                                m_Files.Remove(Helper.NormalizePath(excludeNode.Name));
-                                        }
+                    m_Exclusions.Add( dataNode );
                                 }
                         }
 
+            RecurseDirectories( path, pattern, recurse, useRegex, m_Exclusions );
+
                         if(m_Files.Count < 1)
                         {
                                 throw new WarningException("Match returned no files: {0}{1}", Helper.EndPath(path), pattern);
diff --git a/Prebuild/src/Core/Nodes/OptionsNode.cs b/Prebuild/src/Core/Nodes/OptionsNode.cs
index b7a784d..651c339 100644
--- a/Prebuild/src/Core/Nodes/OptionsNode.cs
+++ b/Prebuild/src/Core/Nodes/OptionsNode.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2007-01-08 17:55:40 +0100 (må, 08 jan 2007) $
+ * $Date: 2007-01-09 01:55:40 +0900 (Tue, 09 Jan 2007) $
  * $Revision: 197 $
  */
 #endregion
diff --git a/Prebuild/src/Core/Nodes/ProcessNode.cs b/Prebuild/src/Core/Nodes/ProcessNode.cs
index 5f3dbe6..2d2162c 100644
--- a/Prebuild/src/Core/Nodes/ProcessNode.cs
+++ b/Prebuild/src/Core/Nodes/ProcessNode.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Date: 2006-01-28 09:49:58 +0900 (Sat, 28 Jan 2006) $
  * $Revision: 71 $
  */
 #endregion
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
index bddaace..e98ab5f 100644
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -27,8 +27,8 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2006-11-11 05:43:20 +0100 (lö, 11 nov 2006) $
- * $Revision: 192 $
+ * $Date: 2007-05-26 06:58:26 +0900 (Sat, 26 May 2007) $
+ * $Revision: 244 $
  */
 #endregion
 
@@ -44,20 +44,20 @@ using Prebuild.Core.Utilities;
 namespace Prebuild.Core.Nodes
 {
         /// <summary>
-        /// 
+        /// A set of values that the Project's type can be
         /// </summary>
         public enum ProjectType
         {
                 /// <summary>
-                /// 
+                /// The project is a console executable
                 /// </summary>
                 Exe,
                 /// <summary>
-                /// 
+                /// The project is a windows executable
                 /// </summary>
                 WinExe,
                 /// <summary>
-                /// 
+                /// The project is a library
                 /// </summary>
                 Library
         }
@@ -78,7 +78,7 @@ namespace Prebuild.Core.Nodes
         }
 
         /// <summary>
-        /// 
+        /// The Node object representing /Prebuild/Solution/Project elements
         /// </summary>
         [DataNode("Project")]
         public class ProjectNode : DataNode, IComparable
@@ -90,6 +90,7 @@ namespace Prebuild.Core.Nodes
                 private string m_FullPath = "";
                 private string m_AssemblyName;
                 private string m_AppIcon = "";
+        private string m_ConfigFile = "";
                 private string m_DesignerFolder = "";
                 private string m_Language = "C#";
                 private ProjectType m_Type = ProjectType.Exe;
@@ -97,11 +98,13 @@ namespace Prebuild.Core.Nodes
                 private string m_StartupObject = "";
                 private string m_RootNamespace;
                 private string m_FilterGroups = "";
+                private string m_Version = "";
                 private Guid m_Guid;
 
                 private Hashtable m_Configurations;
                 private ArrayList m_ReferencePaths;
                 private ArrayList m_References;
+                private ArrayList m_Authors;
                 private FilesNode m_Files;
 
                 #endregion
@@ -116,6 +119,7 @@ namespace Prebuild.Core.Nodes
                         m_Configurations = new Hashtable();
                         m_ReferencePaths = new ArrayList();
                         m_References = new ArrayList();
+                        m_Authors = new ArrayList();
                 }
 
                 #endregion
@@ -159,6 +163,18 @@ namespace Prebuild.Core.Nodes
                 }
 
                 /// <summary>
+                /// Gets the project's version
+                /// </summary>
+                /// <value>The project's version.</value>
+                public string Version 
+                { 
+                        get 
+                        { 
+                                return m_Version; 
+                        } 
+                }               
+
+                /// <summary>
                 /// Gets the full path.
                 /// </summary>
                 /// <value>The full path.</value>
@@ -194,6 +210,18 @@ namespace Prebuild.Core.Nodes
                         }
                 }
 
+        /// <summary>
+        /// Gets the app icon.
+        /// </summary>
+        /// <value>The app icon.</value>
+        public string ConfigFile
+        {
+            get
+            {
+                return m_ConfigFile;
+            }
+        }
+
                 /// <summary>
                 /// 
                 /// </summary>
@@ -290,9 +318,9 @@ namespace Prebuild.Core.Nodes
                 {
                         get
                         {
-                ArrayList tmp = new ArrayList( ConfigurationsTable.Values);
-                            tmp.Sort();
-                                return tmp;
+                ArrayList tmp = new ArrayList(ConfigurationsTable.Values);
+                tmp.Sort();
+                return tmp;
                         }
                 }
 
@@ -319,7 +347,7 @@ namespace Prebuild.Core.Nodes
                 ArrayList tmp = new ArrayList(m_ReferencePaths);
                 tmp.Sort();
                 return tmp;
-            }
+                        }
                 }
 
                 /// <summary>
@@ -335,6 +363,18 @@ namespace Prebuild.Core.Nodes
                 return tmp;
                         }
                 }
+                
+                /// <summary>
+                /// Gets the Authors list.
+                /// </summary>
+                /// <value>The list of the project's authors.</value>
+                public ArrayList Authors
+                {
+                        get
+                        {
+                                return m_Authors;
+                        }
+                }
 
                 /// <summary>
                 /// Gets the files.
@@ -422,7 +462,9 @@ namespace Prebuild.Core.Nodes
                         m_Name = Helper.AttributeValue(node, "name", m_Name);
                         m_Path = Helper.AttributeValue(node, "path", m_Path);
                         m_FilterGroups = Helper.AttributeValue(node, "filterGroups", m_FilterGroups);
+                        m_Version = Helper.AttributeValue(node, "version", m_Version);
                         m_AppIcon = Helper.AttributeValue(node, "icon", m_AppIcon);
+            m_ConfigFile = Helper.AttributeValue(node, "configFile", m_ConfigFile);
                         m_DesignerFolder = Helper.AttributeValue(node, "designerFolder", m_DesignerFolder);
                         m_AssemblyName = Helper.AttributeValue(node, "assemblyName", m_AssemblyName);
                         m_Language = Helper.AttributeValue(node, "language", m_Language);
@@ -430,13 +472,11 @@ namespace Prebuild.Core.Nodes
                         m_Runtime = (ClrRuntime)Helper.EnumAttributeValue(node, "runtime", typeof(ClrRuntime), m_Runtime);
                         m_StartupObject = Helper.AttributeValue(node, "startupObject", m_StartupObject);
                         m_RootNamespace = Helper.AttributeValue(node, "rootNamespace", m_RootNamespace);
-                    
+            m_GenerateAssemblyInfoFile = Helper.ParseBoolean(node, "generateAssemblyInfoFile", false);
+
             int hash = m_Name.GetHashCode();
+                        m_Guid = new Guid(hash, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
-                    m_Guid = new Guid( hash, 0, 0, 0, 0, 0, 0,0,0,0,0 );
-                    
-            m_GenerateAssemblyInfoFile = Helper.ParseBoolean(node, "generateAssemblyInfoFile", false);
-            
                         if(m_AssemblyName == null || m_AssemblyName.Length < 1)
                         {
                                 m_AssemblyName = m_Name;
@@ -482,6 +522,10 @@ namespace Prebuild.Core.Nodes
                                         {
                                                 m_References.Add(dataNode);
                                         }
+                                        else if(dataNode is AuthorNode)
+                                        {
+                                                m_Authors.Add(dataNode);
+                                        }
                                         else if(dataNode is FilesNode)
                                         {
                                                 m_Files = (FilesNode)dataNode;
@@ -494,7 +538,6 @@ namespace Prebuild.Core.Nodes
                         }
                 }
 
-
                 #endregion
 
         #region IComparable Members
@@ -506,5 +549,5 @@ namespace Prebuild.Core.Nodes
         }
 
         #endregion
-    }
+        }
 }
diff --git a/Prebuild/src/Core/Nodes/ReferenceNode.cs b/Prebuild/src/Core/Nodes/ReferenceNode.cs
index 4b8262e..df0c2e4 100644
--- a/Prebuild/src/Core/Nodes/ReferenceNode.cs
+++ b/Prebuild/src/Core/Nodes/ReferenceNode.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2006-07-25 18:56:49 +0200 (ti, 25 jul 2006) $
+ * $Date: 2006-07-26 01:56:49 +0900 (Wed, 26 Jul 2006) $
  * $Revision: 132 $
  */
 #endregion
@@ -149,5 +149,5 @@ namespace Prebuild.Core.Nodes
         }
 
         #endregion
-    }
+        }
 }
diff --git a/Prebuild/src/Core/Nodes/ReferencePathNode.cs b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
index 4c981e7..d4042ef 100644
--- a/Prebuild/src/Core/Nodes/ReferencePathNode.cs
+++ b/Prebuild/src/Core/Nodes/ReferencePathNode.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $
+ * $Date: 2006-01-28 09:49:58 +0900 (Sat, 28 Jan 2006) $
  * $Revision: 71 $
  */
 #endregion
@@ -104,5 +104,5 @@ namespace Prebuild.Core.Nodes
         }
 
         #endregion
-    }
+        }
 }
diff --git a/Prebuild/src/Core/Nodes/SolutionNode.cs b/Prebuild/src/Core/Nodes/SolutionNode.cs
index 3ea53a4..9473fe6 100644
--- a/Prebuild/src/Core/Nodes/SolutionNode.cs
+++ b/Prebuild/src/Core/Nodes/SolutionNode.cs
@@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 /*
  * $Source$
  * $Author: jendave $
- * $Date: 2006-02-28 17:15:42 +0100 (ti, 28 feb 2006) $
+ * $Date: 2006-03-01 01:15:42 +0900 (Wed, 01 Mar 2006) $
  * $Revision: 92 $
  */
 #endregion
@@ -53,11 +53,11 @@ namespace Prebuild.Core.Nodes
                 #region Fields
         
                 private string m_Name = "unknown";
-                private string m_Version = "1.0.0";
                 private string m_Path = "";
                 private string m_FullPath = "";
                 private string m_ActiveConfig = "Debug";
-        
+        private string m_Version = "1.0.0";
+
                 private OptionsNode m_Options;
                 private FilesNode m_Files;
                 private Hashtable m_Configurations;
@@ -111,18 +111,6 @@ namespace Prebuild.Core.Nodes
                 }
 
                 /// <summary>
-                /// Gets the version.
-                /// </summary>
-                /// <value>The version.</value>
-                public string Version 
-                {
-                        get 
-                        {
-                                return m_Version;
-                        }
-                }
-
-                /// <summary>
                 /// Gets the path.
                 /// </summary>
                 /// <value>The path.</value>
@@ -147,6 +135,18 @@ namespace Prebuild.Core.Nodes
                 }
 
                 /// <summary>
+                /// Gets the version.
+                /// </summary>
+                /// <value>The version.</value>
+                public string Version 
+                {
+                        get 
+                        {
+                                return m_Version;
+                        }
+                }
+
+                /// <summary>
                 /// Gets the options.
                 /// </summary>
                 /// <value>The options.</value>
@@ -181,7 +181,7 @@ namespace Prebuild.Core.Nodes
                 ArrayList tmp = new ArrayList(ConfigurationsTable.Values);
                 tmp.Sort();
                 return tmp;
-            }
+                        }
                 }
 
                 /// <summary>
@@ -245,9 +245,9 @@ namespace Prebuild.Core.Nodes
                 public override void Parse(XmlNode node)
                 {
                         m_Name = Helper.AttributeValue(node, "name", m_Name);
-                        m_Version = Helper.AttributeValue(node, "version", m_Version);
                         m_ActiveConfig = Helper.AttributeValue(node, "activeConfig", m_ActiveConfig);
                         m_Path = Helper.AttributeValue(node, "path", m_Path);
+                        m_Version = Helper.AttributeValue(node, "version", m_Version);
 
                         m_FullPath = m_Path;
                         try