* Makefile ($(build_lib)): Make CYCLIC_DEP_FILES depend on this.

[mono.git] / mcs / class / Microsoft.Build.Engine / Microsoft.Build.BuildEngine / BuildTask.cs

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs
index ef25e6b7e9bf2dc913b2fde70ce4877effb47bed..c8654942580b416b3ad7c186bd99fc5980b8d283 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildTask.cs
@@ -87,15 +87,19 @@ namespace Microsoft.Build.BuildEngine {
                        TaskEngine      taskEngine;
 
                        LogTaskStarted ();
-                       
-                       taskEngine = new TaskEngine (parentTarget.Project);
-                       
-                       taskEngine.Prepare (InitializeTask (), this.taskElement, GetParameters (), this.Type);
-                       
-                       result = taskEngine.Execute ();
-                       
-                       taskEngine.PublishOutput ();
-                       
+
+                       try {
+                               taskEngine = new TaskEngine (parentTarget.Project);             
+                               taskEngine.Prepare (InitializeTask (), this.taskElement, GetParameters (), this.Type);
+                               result = taskEngine.Execute ();
+                               if (result)
+                                       taskEngine.PublishOutput ();
+                       // FIXME: it should be logged (exception)
+                       } catch (Exception e) {
+                               Console.Error.WriteLine (e);
+                               result = false;
+                       }
+
                        LogTaskFinished (result);
                
                        return result;
@@ -107,9 +111,7 @@ namespace Microsoft.Build.BuildEngine {
                        List <string> tempNames = new List <string> ();
                        
                        foreach (XmlAttribute xmlAttribute in taskElement.Attributes) {
-                               if (xmlAttribute.Name == "Condition")
-                                       continue;
-                               if (xmlAttribute.Name == "ContinueOnError")
+                               if (xmlAttribute.Name == "Condition" || xmlAttribute.Name == "ContinueOnError")
                                        continue;
                                tempNames.Add (xmlAttribute.Name);
                        }
@@ -143,40 +145,38 @@ namespace Microsoft.Build.BuildEngine {
                                taskElement.SetAttribute (parameterName, parameterValue);
                }
                
-               private void LogTaskStarted ()
+               void LogTaskStarted ()
                {
                        TaskStartedEventArgs tsea = new TaskStartedEventArgs ("Task started.", null, parentTarget.Project.FullFileName,
                                parentTarget.Project.FullFileName, taskElement.Name);
                        parentTarget.Project.ParentEngine.EventSource.FireTaskStarted (this, tsea);
                }
                
-               private void LogTaskFinished (bool succeeded)
+               void LogTaskFinished (bool succeeded)
                {
                        TaskFinishedEventArgs tfea = new TaskFinishedEventArgs ("Task finished.", null, parentTarget.Project.FullFileName,
                                parentTarget.Project.FullFileName, taskElement.Name, succeeded);
                        parentTarget.Project.ParentEngine.EventSource.FireTaskFinished (this, tfea);
                }
                
-               private ITask InitializeTask ()
+               ITask InitializeTask ()
                {
                        ITask task;
                        
                        task = (ITask)Activator.CreateInstance (this.Type);
-                       task.BuildEngine = new BuildEngine (parentTarget.Project.ParentEngine, 0, 0, ContinueOnError,
-                               parentTarget.Project.FullFileName);
+                       task.BuildEngine = new BuildEngine (parentTarget.Project.ParentEngine, parentTarget.Project, 0, 0, ContinueOnError);
                        
                        return task;
                }
                
-               private IDictionary <string, string> GetParameters ()
+               IDictionary <string, string> GetParameters ()
                {
                        Dictionary <string, string> parameters = new Dictionary <string, string> ();
                        
                        string[] parameterNames = GetParameterNames ();
                        
-                       foreach (string s in parameterNames) {
+                       foreach (string s in parameterNames)
                                parameters.Add (s, GetParameterValue (s));
-                       }
                        
                        return parameters;
                }
@@ -198,7 +198,7 @@ namespace Microsoft.Build.BuildEngine {
                                        return false;
                                else {
                                        Expression exp = new Expression ();
-                                       exp.Parse (str);
+                                       exp.Parse (str, true);
                                        return (bool) exp.ConvertTo (parentTarget.Project, typeof (bool));
                                }
                        }