rename some use of "xbuild" to "msbuild". Give loggers to ProejctInstance.Build(...

diff --git a/mcs/tools/msbuild/ErrorUtilities.cs b/mcs/tools/msbuild/ErrorUtilities.cs
index a21048644b874a752367abc71a40125a008acbf0..f5b94a09a97fa6d3e2c524676b44219bc836c1ce 100644 (file)
--- a/mcs/tools/msbuild/ErrorUtilities.cs
+++ b/mcs/tools/msbuild/ErrorUtilities.cs
@@ -33,9 +33,9 @@ namespace Mono.XBuild.CommandLine {
        public static class ErrorUtilities {
 
                static string[] version = {
-                       String.Format ("XBuild Engine Version {0}", Consts.MonoVersion),
+                       String.Format ("MSBuild Engine Version {0}", Consts.MonoVersion),
                        String.Format ("Mono, Version {0}", Consts.MonoVersion),
-                       "Copyright (C) Marek Sieradzki 2005-2008, Novell 2008-2011.",
+                       "Copyright (C) Mono Project Contributors, 2008-2013.",
                };
 
                
@@ -78,9 +78,9 @@ namespace Mono.XBuild.CommandLine {
                static public void ShowUsage ()
                {
                        Display (version);
-                       Console.WriteLine ("xbuild [options] [project-file]");
+                       Console.WriteLine ("msbuild [options] [project-file]");
                        Console.WriteLine (
-                               "    /version           Show the xbuild version\n" +
+                               "    /version           Show the msbuild version\n" +
                                "    /noconsolelogger   Disable the default console logger\n" +
                                "    /target:T1[,TN]    List of targets to build\n" +
                                "    /property:Name=Value\n" +

diff --git a/mcs/tools/msbuild/Main.cs b/mcs/tools/msbuild/Main.cs
index 328cd44b418662d27e53861b04e69bfaa1588dfa..235fe83b3ebe27e17087895c390c84fb37fdeaf5 100644 (file)
--- a/mcs/tools/msbuild/Main.cs
+++ b/mcs/tools/msbuild/Main.cs
@@ -158,7 +158,7 @@ namespace Mono.XBuild.CommandLine {
                                
                                var projectInstance = new ProjectInstance (project, parameters.Properties, parameters.ToolsVersion, project_collection);
 
-                               result = projectInstance.Build (parameters.Targets, parameters.Loggers);
+                               result = projectInstance.Build (parameters.Targets.Length > 0 ? parameters.Targets : null, parameters.Loggers.Count > 0 ? parameters.Loggers : project_collection.Loggers);
                                //result = project_collection.BuildProjectFile (projectFile, parameters.Targets, null, null, BuildSettings.None, parameters.ToolsVersion);
                        }
                        

diff --git a/mcs/tools/msbuild/Parameters.cs b/mcs/tools/msbuild/Parameters.cs
index d5e506cc143dfc80074fd622c6e57bacd46db3df..f30afc6cf10b30dedbd322e45cd894d7a79416d5 100644 (file)
--- a/mcs/tools/msbuild/Parameters.cs
+++ b/mcs/tools/msbuild/Parameters.cs
@@ -73,7 +73,7 @@ namespace Mono.XBuild.CommandLine {
                        
                        responseFile = Path.Combine (
                                        Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location),
-                                       "xbuild.rsp");
+                                       "msbuild.rsp");
                }
                
                public void ParseArguments (string[] args)

diff --git a/mcs/tools/msbuild/SolutionParser.cs b/mcs/tools/msbuild/SolutionParser.cs
index 1130afc23ea18d9f5724e10eea7fbdc12baaef4f..aad2b97247c1b172d4ac794a0eb889d3391194d2 100644 (file)
--- a/mcs/tools/msbuild/SolutionParser.cs
+++ b/mcs/tools/msbuild/SolutionParser.cs
@@ -765,11 +765,11 @@ namespace Mono.XBuild.CommandLine {
                        var t = p.AddTarget ("ValidateSolutionConfiguration");
                        var task = t.AddTask ("Warning");
                        task.SetParameter ("Text", "On windows, an environment variable 'Platform' is set to MCD sometimes, and this overrides the Platform property" +
-                                               " for xbuild, which could be an invalid Platform for this solution file. And so you are getting the following error." +
+                                               " for Mono msbuild, which could be an invalid Platform for this solution file. And so you are getting the following error." +
                                                " You could override it by either setting the environment variable to nothing, as\n" +
                                                "   set Platform=\n" +
                                                "Or explicity specify its value on the command line, as\n" +
-                                               "   xbuild Foo.sln /p:Platform=Release");
+                                               "   msbuild Foo.sln /p:Platform=Release");
                        task.Condition = "('$(CurrentSolutionConfigurationContents)' == '') and ('$(SkipInvalidConfigurations)' != 'true')" +
                                        " and '$(Platform)' == 'MCD' and '$(OS)' == 'Windows_NT'";