Merge lp:~raof/docky/mono-options-transition into lp:docky

[Chris Halse Rogers]

[Chris Halse Rogers (raof)]

Transition from Mono.GetOptions to Mono.Options (bug #502650).

This (pretty much unavoidably) breaks building with MonoDevelop. If people really want to build using MD, I guess we'll have to copy the Options.cs source into our build tree.

[Robert Dyer (psybers)]

Hah, doesnt bother me! But Jason and Chris might not appreciate that... ;)

[Chris Halse Rogers (raof)]

Oh, bollocks. AssemblyInfo.cs also includes Mono.GetOptions references, and is what provides the Author attribute. Allow me to rework this and resubmit.

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

cszikszoy has merged a solution with trunk 1542

review: Disapprove

Unmerged revisions

1028. By Chris Halse Rogers on 2010-01-05

Convert from Mono.GetOptions to Mono.Options

1027. By Chris Halse Rogers on 2010-01-05

Add Mono.Options source to Docky build sources

=== modified file 'Docky/Docky/Docky.cs'
--- Docky/Docky/Docky.cs	2010-01-02 09:15:52 +0000
+++ Docky/Docky/Docky.cs	2010-01-05 03:57:13 +0000
@@ -79,25 +79,28 @@
 			// process the command line args
 			CommandLinePreferences = new UserArgs (args);
 			
-			// set process name
-			DockServices.System.SetProcessName ("docky");
-			
-			// check compositing
-			CheckComposite ();
-			Gdk.Screen.Default.CompositedChanged += delegate {
+			if (!CommandLinePreferences.HelpRequested) {
+				
+				// set process name
+				DockServices.System.SetProcessName ("docky");
+				
+				// check compositing
 				CheckComposite ();
-			};
-			
-			DBusManager.Default.Initialize ();
-			PluginManager.Initialize ();
-			Controller.Initialize ();
-			
-			Gdk.Threads.Enter ();
-			Gtk.Application.Run ();
-			Gdk.Threads.Leave ();
-			
-			Controller.Dispose ();
-			PluginManager.Shutdown ();
+				Gdk.Screen.Default.CompositedChanged += delegate {
+					CheckComposite ();
+				};
+				
+				DBusManager.Default.Initialize ();
+				PluginManager.Initialize ();
+				Controller.Initialize ();
+				
+				Gdk.Threads.Enter ();
+				Gtk.Application.Run ();
+				Gdk.Threads.Leave ();
+				
+				Controller.Dispose ();
+				PluginManager.Shutdown ();
+			}
 			Gnome.Vfs.Vfs.Shutdown ();
 		}
 		

=== modified file 'Docky/Docky/UserArgs.cs'
--- Docky/Docky/UserArgs.cs	2009-12-10 19:31:52 +0000
+++ Docky/Docky/UserArgs.cs	2010-01-05 03:57:13 +0000
@@ -19,51 +19,66 @@
 
 using Docky.Services;
 
-using Mono.GetOptions;
-
-// disable the warning message about Mono.GetOptions.Options being obsolete
-#pragma warning disable 618
+using Mono.Options;
 
 namespace Docky
 {
-	public class UserArgs : Options
+	public class UserArgs
 	{
-		public LogLevel Logging { get; protected set; }
-		
-		[Option ("Disable cursor polling (for testing)", 'p', "disable-polling")]
-		public bool NoPollCursor;
-		
-		[Option ("Maximum window dimension (min 500)", 'm', "max-size")]
-		public int MaxSize;
-		
-		[Option ("Enable debug level logging", 'd', "debug")]
-		public bool Debug;
-		
-		[Option ("Netbook mode", 'n', "netbook")]
-		public bool NetbookMode;
-		
-		[Option ("Nvidia mode (for Nvidia cards that lag after awhile) [-b 10]", "nvidia")]
-		public bool NvidiaMode;
-		
-		[Option ("Maximum time (in minutes) to keep buffers", 'b', "buffer-time")]
-		public uint BufferTime;
+		public LogLevel Logging { get; private set; }
+		public bool NoPollCursor { get; private set; }
+		public int MaxSize { get; private set; }
+		public bool NetbookMode { get; private set; }
+		public uint BufferTime { get; private set; }
+		public bool HelpRequested { get; private set; }
 
 		public UserArgs (string[] args)
 		{
-			ParsingMode = OptionsParsingMode.GNU_DoubleDash;
-			ProcessArgs (args);
+			var options = new OptionSet () {
+				{ "p|disable-polling", "Disable cursor polling (for testing)", v => NoPollCursor = (v != null)},
+				{ "m|max-size=", "Maximum window dimension (min 500)", (int v) => {
+						if (v < 500) {
+							throw new OptionException (String.Format ("Maximum window size must be > 500, {0} was specified", v), "max-size");
+						}
+						MaxSize = v;
+					}
+				},
+				{ "d|debug", "Enable debug level logging", v => { 
+					if (v != null) {
+							Logging = LogLevel.Debug;
+						}
+					}
+				},
+				{ "n|netbook", "Enable netbook mode", v => NetbookMode = (v != null)},
+				{ "nvidia", "nVidia mode (for nVidia cards that lag after some time)", v => {
+						if (v != null) {
+							BufferTime = 10;
+						}
+					}
+				},
+				{ "b|buffer-time=", "Maximum time (in minutes) to keep buffers", (uint v) => BufferTime = v},
+				{ "h|help", "Show this help message", v => HelpRequested = (v != null)}
+			};
 			
-			// defaults
-			if (MaxSize == 0)
-				MaxSize = int.MaxValue;
-			MaxSize = Math.Max (MaxSize, 500);
+			//Defaults
 			Logging = LogLevel.Warn;
-			if (NvidiaMode)
-				BufferTime = 10;
-			// if the debug option was passed, set it to debug
-			// otherwise leave it to the default, which is warn
-			if (Debug)
-				Log.DisplayLevel = LogLevel.Debug;
+			MaxSize = int.MaxValue;
+			BufferTime = 0;
+			HelpRequested = false;
+			
+			options.Parse (args);
+
+			if (HelpRequested) {
+				ShowHelp (options);
+			}
+		}
+		
+		static void ShowHelp (OptionSet opts)
+		{
+			Console.WriteLine ("Usage: docky [OPTIONS]");
+			Console.WriteLine ();
+			Console.WriteLine ("Options:");
+			opts.WriteOptionDescriptions (Console.Out);
 		}
 	}
 }

=== modified file 'Docky/Makefile.am'
--- Docky/Makefile.am	2009-12-20 04:17:12 +0000
+++ Docky/Makefile.am	2010-01-05 03:57:13 +0000
@@ -43,6 +43,9 @@
 	Docky/Menus/SeparatorWidget.cs \
 	Docky/Menus/DockItemMenu.cs
 
+SOURCES_BUILD += $(MONO_OPTIONS_SOURCES)
+
+
 RESOURCES = \
 	gtk-gui/gui.stetic \
 	Resources/about.svg \

=== modified file 'configure.ac'
--- configure.ac	2010-01-04 17:08:47 +0000
+++ configure.ac	2010-01-05 03:57:13 +0000
@@ -95,6 +95,7 @@
 PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0])
 PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
 PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0])
+PKG_CHECK_MODULES([MONO_OPTIONS], [mono-options])
 
 dnl check for native libraries (ones that are p/invoked)
 GTK_REQUIRED_VERSION=2.14.3
@@ -103,6 +104,9 @@
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
 PKG_CHECK_MODULES(GLIB, gobject-2.0 >= $GLIB_REQUIRED_VERSION)
 
+dnl Get Mono.Options source file
+MONO_OPTIONS_SOURCES=$(pkg-config --variable=Sources mono-options)
+AC_SUBST([MONO_OPTIONS_SOURCES])
 
 AC_SUBST([GCONF_SHARP_20_LIBS])
 AC_SUBST([GLADE_SHARP_20_LIBS])