Author: msierad
Date: 2007-01-16 08:45:22 -0500 (Tue, 16 Jan 2007)
New Revision: 71133
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
Log:
2007-01-16 Marek Sieradzki <[EMAIL PROTECTED]>
* BuildItem.cs (SetMetadata): Escape when we get virtual item or item
from XML. (not to escape items that have parents twice).
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs
2007-01-16 13:28:39 UTC (rev 71132)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs
2007-01-16 13:45:22 UTC (rev 71133)
@@ -114,7 +114,7 @@
throw new ArgumentNullException
("destinationItem");
foreach (DictionaryEntry de in unevaluatedMetadata)
- destinationItem.AddMetadata ((string) de.Key,
(string) de.Value, false);
+ destinationItem.AddMetadata ((string) de.Key,
(string) de.Value);
}
[MonoTODO]
@@ -182,29 +182,28 @@
throw new ArgumentException (String.Format
("\"{0}\" is a reserved item meta-data, and cannot be modified or deleted.",
metadataName));
+ if (treatMetadataValueAsLiteral && !HasParent)
+ metadataValue = Utilities.Escape
(metadataValue);
+
if (FromXml) {
XmlElement element = itemElement [metadataName];
if (element == null) {
element =
itemElement.OwnerDocument.CreateElement (metadataName, Project.XmlNamespace);
- // FIXME treat as literal
element.InnerText = metadataValue;
itemElement.AppendChild (element);
} else
element.InnerText = metadataValue;
} else if (HasParent) {
- if (parent_item.child_items.Count == 1)
- parent_item.SetMetadata (metadataName,
metadataValue, treatMetadataValueAsLiteral);
- else {
+ if (parent_item.child_items.Count > 1)
SplitParentItem ();
- parent_item.SetMetadata (metadataName,
metadataValue, treatMetadataValueAsLiteral);
- }
+ parent_item.SetMetadata (metadataName,
metadataValue, treatMetadataValueAsLiteral);
}
DeleteMetadata (metadataName);
- AddMetadata (metadataName, metadataValue,
treatMetadataValueAsLiteral);
+ AddMetadata (metadataName, metadataValue);
}
- void AddMetadata (string name, string value, bool literal)
+ void AddMetadata (string name, string value)
{
if (parent_item_group != null) {
Expression e = new Expression ();
@@ -213,9 +212,6 @@
} else
evaluatedMetadata.Add (name, Utilities.Unescape
(value));
- if (literal)
- unevaluatedMetadata.Add (name, Utilities.Escape
(value));
- else
unevaluatedMetadata.Add (name, value);
}
@@ -237,7 +233,7 @@
}
foreach (XmlElement xe in itemElement.ChildNodes)
- AddMetadata (xe.Name, xe.InnerText, false);
+ AddMetadata (xe.Name, xe.InnerText);
DirectoryScanner directoryScanner;
Expression includeExpr, excludeExpr;
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
2007-01-16 13:28:39 UTC (rev 71132)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
2007-01-16 13:45:22 UTC (rev 71133)
@@ -1,5 +1,10 @@
2007-01-16 Marek Sieradzki <[EMAIL PROTECTED]>
+ * BuildItem.cs (SetMetadata): Escape when we get virtual item or item
+ from XML. (not to escape items that have parents twice).
+
+2007-01-16 Marek Sieradzki <[EMAIL PROTECTED]>
+
* BuildItemGroup.cs (AddNewItem): Add XML and mark project as dirty.
(Project): Renamed to ParentProject.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches