Author: msierad
Date: 2006-10-06 05:13:14 -0400 (Fri, 06 Oct 2006)
New Revision: 66335
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionTokenizer.cs
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngine.cs
Log:
2006-10-06 Marek Sieradzki <[EMAIL PROTECTED]>
* Target.cs: Reformatted.
* TaskEngine.cs: Removed redundant code.
* BuildPropertyGroup.cs: Fixed Clear () and AddNewProperty ().
* Engine.cs: Made BuildProjectFile () load project file if it's not
loaded yet.
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
2006-10-06 08:57:12 UTC (rev 66334)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs
2006-10-06 09:13:14 UTC (rev 66335)
@@ -95,11 +95,11 @@
xe.InnerText = propertyValue;
prop = new BuildProperty (parentProject, xe);
+ AddProperty (prop);
+ return prop;
} else {
- prop = new BuildProperty (propertyName,
propertyValue);
+ throw new InvalidOperationException ("This
method is only valid for persisted <System.Object[]> elements.");
}
- AddProperty (prop);
- return prop;
}
internal void AddProperty (BuildProperty property)
@@ -122,7 +122,10 @@
[MonoTODO]
public void Clear ()
{
- throw new NotImplementedException ();
+ if (FromXml)
+ properties = new List <BuildProperty> ();
+ else
+ propertiesByName = new Dictionary <string,
BuildProperty> ();
}
[MonoTODO]
@@ -170,7 +173,8 @@
bool treatPropertyValueAsLiteral)
{
if (!propertiesByName.ContainsKey (propertyName)) {
- AddNewProperty (propertyName, propertyValue);
+ BuildProperty bp = new BuildProperty
(propertyName, propertyValue);
+ AddProperty (bp);
}
propertiesByName [propertyName].Value = propertyValue;
}
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
2006-10-06 08:57:12 UTC (rev 66334)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
2006-10-06 09:13:14 UTC (rev 66335)
@@ -1,3 +1,11 @@
+2006-10-06 Marek Sieradzki <[EMAIL PROTECTED]>
+
+ * Target.cs: Reformatted.
+ * TaskEngine.cs: Removed redundant code.
+ * BuildPropertyGroup.cs: Fixed Clear () and AddNewProperty ().
+ * Engine.cs: Made BuildProjectFile () load project file if it's not
+ loaded yet.
+
2006-09-21 Marek Sieradzki <[EMAIL PROTECTED]>
* ConditionRelationalExpression.cs: Change comparers to case
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionTokenizer.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionTokenizer.cs
2006-10-06 08:57:12 UTC (rev 66334)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionTokenizer.cs
2006-10-06 09:13:14 UTC (rev 66335)
@@ -205,6 +205,7 @@
temp = sb.ToString ();
// FIXME: test extreme cases
+ // it fails on '$(something) == ''
token = new Token (temp.Substring (1,
temp.Length - 2), TokenType.String);
return;
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
2006-10-06 08:57:12 UTC (rev 66334)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
2006-10-06 09:13:14 UTC (rev 66335)
@@ -172,9 +172,12 @@
project = (Project) projects [projectFile];
LogProjectStarted (project, targetNames);
result = project.Build (targetNames,
targetOutputs);
+ } else {
+ project = CreateNewProject ();
+ project.Load (projectFile);
+ LogProjectStarted (project, targetNames);
+ result = project.Build (targetNames,
targetOutputs);
}
- else
- return false;
LogProjectFinished (project, result);
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
2006-10-06 08:57:12 UTC (rev 66334)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs
2006-10-06 09:13:14 UTC (rev 66335)
@@ -123,9 +123,10 @@
if (this.batchingImpl.BuildNeeded ()) {
foreach (BuildTask bt in buildTasks) {
- if (this.batchingImpl.BatchBuildTask
(bt) == false && bt.ContinueOnError == false) {
+ result = batchingImpl.BatchBuildTask
(bt);
+
+ if (!result && !bt.ContinueOnError) {
executeOnErrors = true;
- result = false;
break;
}
}
Modified:
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngine.cs
===================================================================
---
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngine.cs
2006-10-06 08:57:12 UTC (rev 66334)
+++
trunk/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/TaskEngine.cs
2006-10-06 09:13:14 UTC (rev 66335)
@@ -229,13 +229,7 @@
e = new OldExpression (parentProject);
e.ParseSource (raw);
- if (type == typeof (ITaskItem)) {
- result = e.ConvertTo (typeof (ITaskItem));
- } else if (type == typeof (ITaskItem[])) {
- result = e.ConvertTo (typeof (ITaskItem[]));
- } else {
- result = e.ConvertTo (type);
- }
+ result = e.ConvertTo (type);
return result;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
