X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Ftools%2Fxbuild%2FMain.cs;h=fef416f1ba1506e51c501d0b27beb4dfcc49c1e5;hb=5979d6f01982aba922f86e1273b0173eab7b285e;hp=dea952d5c3294702066ce10891dc2209374c2bed;hpb=e4baa57b8eba4412ad607d1cc44cf2bac5150206;p=mono.git diff --git a/mcs/tools/xbuild/Main.cs b/mcs/tools/xbuild/Main.cs index dea952d5c32..fef416f1ba1 100644 --- a/mcs/tools/xbuild/Main.cs +++ b/mcs/tools/xbuild/Main.cs @@ -3,8 +3,11 @@ // // Author: // Marek Sieradzki (marek.sieradzki@gmail.com) +// Miguel de Icaza (miguel@ximian.com) +// Marek Safar (marek.safar@seznam.cz) // // (C) 2005 Marek Sieradzki +// Copyright 2009 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -31,6 +34,7 @@ using System; using System.Collections; using System.IO; using System.Reflection; +using System.Text; using Microsoft.Build.BuildEngine; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; @@ -41,11 +45,12 @@ namespace Mono.XBuild.CommandLine { Parameters parameters; string[] args; - string binPath; string defaultSchema; Engine engine; Project project; + ConsoleReportPrinter printer; + public static void Main (string[] args) { @@ -56,31 +61,58 @@ namespace Mono.XBuild.CommandLine { public MainClass () { - binPath = ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20); + string binPath = ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20); defaultSchema = Path.Combine (binPath, "Microsoft.Build.xsd"); - parameters = new Parameters (binPath); + parameters = new Parameters (); } - + public void Execute () { bool result = false; + bool show_stacktrace = false; try { parameters.ParseArguments (args); + show_stacktrace = (parameters.LoggerVerbosity == LoggerVerbosity.Detailed || + parameters.LoggerVerbosity == LoggerVerbosity.Diagnostic); - if (parameters.DisplayVersion) + if (!parameters.NoLogo) ErrorUtilities.ShowVersion (false); - engine = new Engine (binPath); + engine = Engine.GlobalEngine; + if (!String.IsNullOrEmpty (parameters.ToolsVersion)) { + if (engine.Toolsets [parameters.ToolsVersion] == null) + ErrorUtilities.ReportError (0, new UnknownToolsVersionException (parameters.ToolsVersion).Message); + + engine.DefaultToolsVersion = parameters.ToolsVersion; + } engine.GlobalProperties = this.parameters.Properties; if (!parameters.NoConsoleLogger) { - ConsoleLogger cl = new ConsoleLogger (); + printer = new ConsoleReportPrinter (); + ConsoleLogger cl = new ConsoleLogger (parameters.LoggerVerbosity, + printer.Print, printer.SetForeground, printer.ResetColor); + cl.Parameters = parameters.ConsoleLoggerParameters; cl.Verbosity = parameters.LoggerVerbosity; engine.RegisterLogger (cl); } + + if (parameters.FileLoggerParameters != null) { + for (int i = 0; i < parameters.FileLoggerParameters.Length; i ++) { + string fl_params = parameters.FileLoggerParameters [i]; + if (fl_params == null) + continue; + + var fl = new FileLogger (); + if (fl_params.Length == 0 && i > 0) + fl.Parameters = String.Format ("LogFile=msbuild{0}.log", i); + else + fl.Parameters = fl_params; + engine.RegisterLogger (fl); + } + } foreach (LoggerInfo li in parameters.Loggers) { Assembly assembly; @@ -108,31 +140,20 @@ namespace Mono.XBuild.CommandLine { return; } - if (projectFile.EndsWith (".sln")) - projectFile = GenerateSolutionProject (projectFile); - - project.Load (projectFile); - - string oldCurrentDirectory = Environment.CurrentDirectory; - string dir = Path.GetDirectoryName (projectFile); - if (!String.IsNullOrEmpty (dir)) - Directory.SetCurrentDirectory (dir); - result = engine.BuildProject (project, parameters.Targets, null); - Directory.SetCurrentDirectory (oldCurrentDirectory); + result = engine.BuildProjectFile (projectFile, parameters.Targets, null, null, BuildSettings.None, parameters.ToolsVersion); } catch (InvalidProjectFileException ipfe) { - ErrorUtilities.ReportError (0, ipfe.Message); + ErrorUtilities.ReportError (0, show_stacktrace ? ipfe.ToString () : ipfe.Message); } catch (InternalLoggerException ile) { - ErrorUtilities.ReportError (0, ile.Message); + ErrorUtilities.ReportError (0, show_stacktrace ? ile.ToString () : ile.Message); } - catch (Exception) { - throw; + catch (CommandLineException cle) { + ErrorUtilities.ReportError(cle.ErrorCode, show_stacktrace ? cle.ToString() : cle.Message); } - finally { if (engine != null) engine.UnregisterAllLoggers (); @@ -141,18 +162,163 @@ namespace Mono.XBuild.CommandLine { } } + } + + // code from mcs/report.cs + class ConsoleReportPrinter + { + string prefix, postfix; + bool color_supported; + TextWriter writer; + string [] colorPrefixes; + + public ConsoleReportPrinter () + : this (Console.Out) + { + } + + public ConsoleReportPrinter (TextWriter writer) + { + this.writer = writer; + + string term = Environment.GetEnvironmentVariable ("TERM"); + bool xterm_colors = false; + + color_supported = false; + switch (term){ + case "xterm": + case "rxvt": + case "rxvt-unicode": + if (Environment.GetEnvironmentVariable ("COLORTERM") != null){ + xterm_colors = true; + } + break; + + case "xterm-color": + case "xterm-256color": + xterm_colors = true; + break; + } + if (!xterm_colors) + return; + + if (!(UnixUtils.isatty (1) && UnixUtils.isatty (2))) + return; + + color_supported = true; + PopulateColorPrefixes (); + postfix = "\x001b[0m"; + } - string GenerateSolutionProject (string solutionFile) + void PopulateColorPrefixes () { - SolutionParser s = new SolutionParser (); - Project p = engine.CreateNewProject (); - s.ParseSolution (solutionFile, p); - string projectFile = solutionFile + ".proj"; - p.Save (projectFile); + colorPrefixes = new string [16]; + + colorPrefixes [(int)ConsoleColor.Black] = GetForeground ("black"); + colorPrefixes [(int)ConsoleColor.DarkBlue] = GetForeground ("blue"); + colorPrefixes [(int)ConsoleColor.DarkGreen] = GetForeground ("green"); + colorPrefixes [(int)ConsoleColor.DarkCyan] = GetForeground ("cyan"); + colorPrefixes [(int)ConsoleColor.DarkRed] = GetForeground ("red"); + colorPrefixes [(int)ConsoleColor.DarkMagenta] = GetForeground ("magenta"); + colorPrefixes [(int)ConsoleColor.DarkYellow] = GetForeground ("yellow"); + colorPrefixes [(int)ConsoleColor.DarkGray] = GetForeground ("grey"); - return projectFile; + colorPrefixes [(int)ConsoleColor.Gray] = GetForeground ("brightgrey"); + colorPrefixes [(int)ConsoleColor.Blue] = GetForeground ("brightblue"); + colorPrefixes [(int)ConsoleColor.Green] = GetForeground ("brightgreen"); + colorPrefixes [(int)ConsoleColor.Cyan] = GetForeground ("brightcyan"); + colorPrefixes [(int)ConsoleColor.Red] = GetForeground ("brightred"); + colorPrefixes [(int)ConsoleColor.Magenta] = GetForeground ("brightmagenta"); + colorPrefixes [(int)ConsoleColor.Yellow] = GetForeground ("brightyellow"); + + colorPrefixes [(int)ConsoleColor.White] = GetForeground ("brightwhite"); + } + + public void SetForeground (ConsoleColor color) + { + if (color_supported) + prefix = colorPrefixes [(int)color]; } + + public void ResetColor () + { + prefix = "\x001b[0m"; + } + + static int NameToCode (string s) + { + switch (s) { + case "black": + return 0; + case "red": + return 1; + case "green": + return 2; + case "yellow": + return 3; + case "blue": + return 4; + case "magenta": + return 5; + case "cyan": + return 6; + case "grey": + case "white": + return 7; + } + return 7; + } + + // + // maps a color name to its xterm color code + // + static string GetForeground (string s) + { + string highcode; + + if (s.StartsWith ("bright")) { + highcode = "1;"; + s = s.Substring (6); + } else + highcode = ""; + + return "\x001b[" + highcode + (30 + NameToCode (s)).ToString () + "m"; + } + + static string GetBackground (string s) + { + return "\x001b[" + (40 + NameToCode (s)).ToString () + "m"; + } + + string FormatText (string txt) + { + if (prefix != null && color_supported) + return prefix + txt + postfix; + + return txt; + } + + public void Print (string message) + { + writer.WriteLine (FormatText (message)); + } + } + + class UnixUtils { + [System.Runtime.InteropServices.DllImport ("libc", EntryPoint="isatty")] + extern static int _isatty (int fd); + + public static bool isatty (int fd) + { + try { + return _isatty (fd) == 1; + } catch { + return false; + } + } + } + } #endif