[xbuild] LogExtensions.LogError - disambiguate.

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

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
index 8f7bc6d4b7a275abf033e796ae806318024f3506..47b5ffddffd0e5213883adcdeb7ff3040db9727c 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
@@ -45,7 +45,7 @@ namespace Microsoft.Build.BuildEngine {
                const string            defaultTasksProjectName = "Microsoft.Common.tasks";
                EventSource             eventSource;
                bool                    buildStarted;
-               ToolsetDefinitionLocations toolsetLocations;
+               //ToolsetDefinitionLocations toolsetLocations;
                BuildPropertyGroup      global_properties;
                //IDictionary           importedProjects;
                List <ILogger>          loggers;
@@ -73,7 +73,7 @@ namespace Microsoft.Build.BuildEngine {
                public Engine (ToolsetDefinitionLocations locations)
                        : this (ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20))
                {
-                       toolsetLocations = locations;
+                       //toolsetLocations = locations;
                }
                
                public Engine (BuildPropertyGroup globalProperties)
@@ -86,7 +86,7 @@ namespace Microsoft.Build.BuildEngine {
                        : this (ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20))
                {
                        this.global_properties = globalProperties;
-                       toolsetLocations = locations;
+                       //toolsetLocations = locations;
                }
 
                // engine should be invoked with path where binary files are
@@ -229,6 +229,31 @@ namespace Microsoft.Build.BuildEngine {
                                              IDictionary targetOutputs,
                                              BuildSettings buildFlags, string toolsVersion)
                {
+                       bool result = false;
+                       try {
+                               StartEngineBuild ();
+                               result = BuildProjectFileInternal (projectFile, targetNames, globalProperties, targetOutputs, buildFlags, toolsVersion);
+                               return result;
+                       } catch (InvalidProjectFileException ie) {
+                               this.LogErrorWithFilename (projectFile, ie.Message);
+                               this.LogMessage (MessageImportance.Low, String.Format ("{0}: {1}", projectFile, ie.ToString ()));
+                               return false;
+                       } catch (Exception e) {
+                               this.LogErrorWithFilename (projectFile, e.Message);
+                               this.LogMessage (MessageImportance.Low, String.Format ("{0}: {1}", projectFile, e.ToString ()));
+                               return false;
+                       } finally {
+                               EndEngineBuild (result);
+                       }
+               }
+
+               bool BuildProjectFileInternal (string projectFile,
+                                             string[] targetNames,
+                                             BuildPropertyGroup globalProperties,
+                                             IDictionary targetOutputs,
+                                             BuildSettings buildFlags, string toolsVersion)
+               {
+
                        if ((buildFlags & BuildSettings.DoNotResetPreviouslyBuiltTargets) != BuildSettings.DoNotResetPreviouslyBuiltTargets)
                                builtTargetsOutputByName.Clear ();
 
@@ -366,12 +391,25 @@ namespace Microsoft.Build.BuildEngine {
                        loggers.Clear ();
                }
 
-               internal void StartProjectBuild (Project project, string [] target_names)
+               void StartEngineBuild ()
                {
                        if (!buildStarted) {
                                LogBuildStarted ();
                                buildStarted = true;
                        }
+               }
+
+               void EndEngineBuild (bool succeeded)
+               {
+                       if (buildStarted && currentlyBuildingProjectsStack.Count == 0) {
+                               LogBuildFinished (succeeded);
+                               buildStarted = false;
+                       }
+               }
+
+               internal void StartProjectBuild (Project project, string [] target_names)
+               {
+                       StartEngineBuild ();
 
                        if (currentlyBuildingProjectsStack.Count == 0 ||
                                String.Compare (currentlyBuildingProjectsStack.Peek ().FullFileName, project.FullFileName) != 0)
@@ -397,10 +435,7 @@ namespace Microsoft.Build.BuildEngine {
                                String.Compare (top_project.FullFileName, currentlyBuildingProjectsStack.Peek ().FullFileName) != 0)
                                LogProjectFinished (top_project, succeeded);
 
-                       if (currentlyBuildingProjectsStack.Count == 0) {
-                               LogBuildFinished (succeeded);
-                               buildStarted = false;
-                       }
+                       EndEngineBuild (succeeded);
                }
 
                internal void ClearBuiltTargetsForProject (Project project)
@@ -518,16 +553,14 @@ namespace Microsoft.Build.BuildEngine {
 
                public string DefaultToolsVersion {
                        get {
-                               if (String.IsNullOrEmpty (defaultToolsVersion))
-#if NET_4_0
-                                       return "4.0";
-#elif NET_3_5
-                                       return "3.5";
-#else
-                                       return "2.0";
-#endif
-                               
-                               return defaultToolsVersion;
+                               // This is used as the fall back version if the
+                               // project can't find a version to use
+                               // Hard-coded to 2.0, so it allows even vs2005 projects
+                               // to build correctly, as they won't have a ToolsVersion
+                               // set!
+                               return String.IsNullOrEmpty (defaultToolsVersion)
+                                               ? "2.0"
+                                               : defaultToolsVersion;
                        }
                        set {
                                if (Toolsets [value] == null)