From 79209c429705beb57ad9b787718856ab2c9fd37c Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 17 Mar 2008 20:55:21 +0000 Subject: 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. --- Prebuild/src/Core/Nodes/FileNode.cs | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'Prebuild/src/Core/Nodes/FileNode.cs') 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; + } + } /// /// /// @@ -195,6 +204,19 @@ namespace Prebuild.Core.Nodes } } + /// + /// + /// + /// + /// + 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 ) { -- cgit v1.1