X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Ftools%2Fxbuild%2FErrorUtilities.cs;h=c91f97b40a6332a7309b0220c513f614c1bc2fdc;hb=7ce175b0238981998fa26aea66fec369c7fc9af2;hp=9379e7a103083cbc0655936e9d054b796ada0c1a;hpb=cccbf6a4b7152c24fafc319e77060a4723a8560e;p=mono.git

diff --git a/mcs/tools/xbuild/ErrorUtilities.cs b/mcs/tools/xbuild/ErrorUtilities.cs
index 9379e7a1030..c91f97b40a6 100644
--- a/mcs/tools/xbuild/ErrorUtilities.cs
+++ b/mcs/tools/xbuild/ErrorUtilities.cs
@@ -25,102 +25,16 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#if NET_2_0
 
 using System;
 
 namespace Mono.XBuild.CommandLine {
 	public static class ErrorUtilities {
 
-		static string[] usage = {
-			"",
-			"Syntax:              xbuild.exe [options] [project file]",
-			"",
-			"Description:         Builds the specified targets in the project file. If",
-			"                     a project file is not specified, MSBuild searches the",
-			"                     current working directory for a file that has a file",
-			"                     extension that ends in \"proj\" and uses that file.",
-			"",
-			"Switches:",
-			"",
-			"  /help              Display this usage message. (Short form: /? or /h)",
-			"",
-			"  /nologo            Do not display the startup banner and copyright message.",
-			"",
-			"  /version           Display version information only. (Short form: /ver)",
-			"",
-			"  @<file>            Insert command-line settings from a text file. To specify",
-			"                     multiple response files, specify each response file",
-			"                     separately.",
-			"",
-			"  /noautoresponse    Do not auto-include the MSBuild.rsp file. (Short form:",
-			"                     /noautorsp)",
-			"",
-			"  /target:<targets>  Build these targets in this project. Use a semicolon or a",
-			"                     comma to separate multiple targets, or specify each",
-			"                     target separately. (Short form: /t)",
-			"                     Example:",
-			"                       /target:Resources;Compile",
-			"",
-			"  /property:<n>=<v>  Set or override these project-level properties. <n> is",
-			"                     the property name, and <v> is the property value. Use a",
-			"                     semicolon or a comma to separate multiple properties, or",
-			"                     specify each property separately. (Short form: /p)",
-			"                     Example:",
-			@"                       /property:WarningLevel=2;OutDir=bin\Debug\",
-			"",
-			"  /logger:<logger>   Use this logger to log events from MSBuild. To specify",
-			"                     multiple loggers, specify each logger separately.",
-			"                     The <logger> syntax is:",
-			"                        [<logger class>,]<logger assembly>[;<logger parameters>]",
-			"                     The <logger class> syntax is:",
-			"                        [<partial or full namespace>.]<logger class name>",
-			"                     The <logger assembly> syntax is:",
-			"                        {<assembly name>[,<strong name>] | <assembly file>}",
-			"                     The <logger parameters> are optional, and are passed",
-			"                     to the logger exactly as you typed them. (Short form: /l)",
-			"                     Examples:",
-			"                       /logger:XMLLogger,MyLogger,Version=1.0.2,Culture=neutral",
-			@"                       /logger:XMLLogger,C:\Loggers\MyLogger.dll;OutputAsHTML",
-			"",
-			"  /verbosity:<level> Display this amount of information in the event log.",
-			"                     The available verbosity levels are: q[uiet], m[inimal],",
-			"                     n[ormal], d[etailed], and diag[nostic]. (Short form: /v)",
-			"                     Example:",
-			"                       /verbosity:quiet",
-			"",
-			"  /consoleloggerparameters:<parameters>",
-			"                     Parameters to console logger. (Short form: /clp)",
-			"                     The available parameters are:",
-			"                        PerformanceSummary--show time spent in tasks, targets",
-			"                            and projects.",
-			"                        NoSummary--don't show error and warning summary at the",
-			"                            end.",
-			"                     Example:",
-			"                        /consoleloggerparameters:PerformanceSummary;NoSummary",
-			"",
-			"  /noconsolelogger   Disable the default console logger and do not log events",
-			"                     to the console. (Short form: /noconlog)",
-			"",
-			"  /validate          Validate the project against the default schema. (Short",
-			"                     form: /val)",
-			"",
-			"  /validate:<schema> Validate the project against the specified schema. (Short",
-			"                     form: /val)",
-			"                     Example:",
-			"                       /validate:MyExtendedBuildSchema.xsd",
-			"",
-			"Examples:",
-			"",
-			"        MSBuild MyApp.sln /t:Rebuild /p:Configuration=Release",
-			"        MSBuild MyApp.csproj /t:Clean /p:Configuration=Debug",
-
-		};
-		
 		static string[] version = {
-			"XBuild Engine Version 0.1",
+			String.Format ("XBuild Engine Version {0}", XBuildConsts.Version),
 			String.Format ("Mono, Version {0}", Consts.MonoVersion),
-			"Copyright (C) Marek Sieradzki 2005. All rights reserved.",
+			"Copyright (C) 2005-2013 Various Mono authors",
 		};
 
 		
@@ -162,9 +76,28 @@ namespace Mono.XBuild.CommandLine {
 
 		static public void ShowUsage ()
 		{
-			Display (usage);
+			Display (version);
+			Console.WriteLine ("xbuild [options] [project-file]");
+			Console.WriteLine (
+				"    /version		Show the xbuild version\n" +
+				"    /noconsolelogger	Disable the default console logger\n" +
+				"    /target:T1[,TN]	List of targets to build\n" +
+				"    /property:Name=Value\n" +
+				"			Set or override project properties\n" +
+				"    /logger:<logger>	Custom logger to log events\n" +
+				"    /verbosity:<level>	Logger verbosity level : quiet, minimal, normal, detailed, diagnostic\n" +
+				"    /validate		Validate the project file against the schema\n" +
+				"    /validate:<schema>	Validate the project file against the specified schema\n" +
+				"    /consoleloggerparameters:<params>\n" +
+				"    /clp:<params>\n" +
+				"			Parameters for the console logger\n" +
+				"    /fileloggerparameters[n]:<params>\n" +
+				"    /flp[n]:<params>\n" +
+				"		        Parameters for the file logger, eg. LogFile=foo.log\n" +
+				"    /nologo		Don't show the initial banner\n" +
+				"    /help		Show this help\n"
+				);
 			Environment.Exit (0);
-			
 		}
 
 		static public void ShowVersion (bool exit)
@@ -182,4 +115,3 @@ namespace Mono.XBuild.CommandLine {
 	}
 }
 
-#endif