Merge pull request #3142 from henricm/fix-for-win-mono_string_to_utf8

[mono.git] / mcs / tools / mconfig / mconfig.cs

diff --git a/mcs/tools/mconfig/mconfig.cs b/mcs/tools/mconfig/mconfig.cs
index 65ac73784e0b83e099c443238e1697db7f916a66..7fc9f0bc97b62be945c9724e047fbd6a871b3248 100644 (file)
--- a/mcs/tools/mconfig/mconfig.cs
+++ b/mcs/tools/mconfig/mconfig.cs
@@ -57,29 +57,27 @@ namespace Mono.MonoConfig
                        "                                    the standard ones. Settings in this file override ones",
                        "                                    in the other files.",
                        "  -t,--target={any,web,application} Use this target when executing 'command'",
-                       "  -C,--list-configs                 List all the default config file names defined in the",
-                       "                                    configuration files.",
-                       "  -F,--list-features                List all the features defined in the configuration files.",
                        "",
-                       "Commands:",
-                       "  {addfeature,af} <feature_name> [config_file_path]",
-                       "  {defconfig,dc} [config_name] [target_directory]"
+                       "To see the list of commands, features and default config file templates, run mconfig",
+                       "without any parameters"
                };
-               
-               public delegate void ListDefaultConfigsHandler ();
-               public delegate void ListFeaturesHandler ();
 
-               public event ListDefaultConfigsHandler OnListDefaultConfigs;
-               public event ListFeaturesHandler OnListFeatures;
+               string[] usageCommands = {
+                       "Available commands (see 'man mconfig' for details):",
+                       "  {addfeature,af} <feature_name> [config_file_path]",
+                       "     Add the named feature to the specified config file",
+                       "",
+                       "  {defconfig,dc} [template_name] [target_directory]",
+                       "     Write a config file based on the named template.",
+                       ""
+               };              
 
                List <string> plain_arguments;
                Dictionary <string, string> unknown_arguments;
 
                public string ConfigFile;
                public FeatureTarget Target = FeatureTarget.Any;
-               public bool ListDefaultConfigs;
-               public bool ListFeatures;
-               
+
                public Dictionary <string, string> UnknownArguments {
                        get {
                                if (unknown_arguments == null || unknown_arguments.Count == 0)
@@ -107,7 +105,7 @@ namespace Mono.MonoConfig
                public void Parse (string[] args)
                {
                        if (args == null || args.Length == 0)
-                               Usage ();
+                               return;
 
                        int len = args.Length;
                        string arg;
@@ -192,22 +190,12 @@ namespace Mono.MonoConfig
                                                RequiredParameterMissing (argName);
                                        
                                        try {
-                                               Target = Helpers.ConvertTarget (argParam);
+                                               Target = Helpers.ConvertEnum <FeatureTarget> (argParam, "target");
                                        } catch (Exception ex) {
                                                OptionParameterError (argName, ex.Message);
                                        }
                                        break;
 
-                               case "C":
-                               case "list-configs":
-                                       ListDefaultConfigs = true;
-                                       break;
-
-                               case "F":
-                               case "list-features":
-                                       ListFeatures = true;
-                                       break;
-
                                default:
                                        unknown_arguments.Add (argName, argParam);
                                        break;
@@ -230,11 +218,22 @@ namespace Mono.MonoConfig
                        Environment.Exit (1);
                }
 
-               public void Usage ()
+               void ShowUsage (string[] msg, bool exit)
                {
-                       foreach (string line in usage)
+                       foreach (string line in msg)
                                Console.WriteLine (line);
-                       Environment.Exit (1);
+                       if (exit)
+                               Environment.Exit (1);
+               }
+               
+               public void Usage ()
+               {
+                       ShowUsage (usage, true);
+               }
+
+               public void UsageCommands ()
+               {
+                       ShowUsage (usageCommands, false);
                }
                
                void ShowVersion ()
@@ -271,7 +270,7 @@ namespace Mono.MonoConfig
        class MConfig
        {
                static string[] configPaths = {
-                       Constants.GlobalConfigPath,
+                       Path.GetFullPath (Path.Combine (Environment.CommandLine, "..", "..", "..","..", "etc", "mono", "mconfig", "config.xml")),
                        Path.Combine (ConfigPath, "config.xml"),
                        Path.Combine (".", "mconfig.xml"),
                        null
@@ -311,7 +310,17 @@ namespace Mono.MonoConfig
                        }
 
                        foreach (string item in list)
-                               Console.WriteLine (" {0}", item);
+                               Console.WriteLine ("  {0}", item);
+               }
+
+               static void PrintException (Exception ex, string format, params object[] parms)
+               {
+                       if (ex == null)
+                               return;
+                       Console.Error.WriteLine (format, parms);
+                       Console.Error.WriteLine ("  {0}", ex.Message);
+                       if (ex.InnerException != null)
+                               Console.Error.WriteLine ("    {0}", ex.InnerException.Message);
                }
                
                static int Main (string[] args)
@@ -323,25 +332,19 @@ namespace Mono.MonoConfig
                                configPaths [3] = options.ConfigFile;
                        
                        Configuration config = new Configuration ();
-                       config.Load (configPaths);
-
-                       bool doQuit = false;
-                       if (options.ListDefaultConfigs) {
-                               DisplayList ("Default config files", config.DefaultConfigFiles);
-                               doQuit = true;
-                       }
-
-                       if (options.ListFeatures) {
-                               DisplayList ("Available features", config.Features);
-                               doQuit = true;
+                       try {
+                               config.Load (configPaths);
+                       } catch (Exception ex) {
+                               PrintException (ex, "Failed to load configuration files:");
+                               return 1;
                        }
-
-                       if (doQuit)
-                               return 0;
                        
                        string[] commandArguments = options.PlainArguments;
                        if (commandArguments == null || commandArguments.Length == 0) {
-                               options.Usage ();
+                               options.UsageCommands ();
+                               DisplayList ("Default config files:", config.DefaultConfigFiles);
+                               Console.WriteLine ();
+                               DisplayList ("Available features:", config.Features);
                                return 1;
                        }
                        
@@ -411,8 +414,8 @@ namespace Mono.MonoConfig
                        try {
                                config.AddFeature (configPath, target, featureName);
                        } catch (Exception ex) {
-                               Console.Error.WriteLine ("Failed to add feature '{0}' to config file '{1}'.\n{2}",
-                                                        featureName, configPath, ex.Message);
+                               PrintException (ex, "Failed to add feature '{0}' to config file '{1}'.",
+                                               featureName, configPath);
                                return 1;
                        }
                        
@@ -454,8 +457,8 @@ namespace Mono.MonoConfig
                        try {
                                config.WriteDefaultConfigFile (configName, targetPath, target);
                        } catch (Exception ex) {
-                               Console.Error.WriteLine ("Failed to write default config file '{0}':\n{1}",
-                                                        configName, ex.Message);
+                               PrintException (ex, "Failed to write default config file '{0}':",
+                                               configName);
                                return 1;
                        }