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.

1 files changed, 44 insertions, 12 deletions

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;
 
                                                 }
                                         }