[mono/mono-tools] [2 commits] 4686e74a: Restore behaviour when not passing a --docrootdir parameter from Mono 2.8 when running on Mono 3.0+
| Newsgroups | gmane.comp.gnome.mono.patches |
|---|---|
| Message-ID | <000001419edf5e4d-7e447dd0-2b3a-4e39-8c77-96927e2c0c75-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/mono-tools
Compare: https://github.com/mono/mono-tools/compare/3d28f26e1ca9...815fad20b919
Commit: 4686e74a1755bdec7946285154145d6c15c2b3e7
Author: Jo Shields <[email protected]> (directhex)
Date: 2013-10-09 18:09:27 GMT
URL: https://github.com/mono/mono-tools/commit/4686e74a1755bdec7946285154145d6c15c2b3e7
Restore behaviour when not passing a --docrootdir parameter from Mono 2.8 when running on Mono 3.0+
Since Mono 3.0, running monodoc without specifying --docrootdir has caused an ArgumentNullException. This works around it.
Changed paths:
M docbrowser/browser.cs
Modified: docbrowser/browser.cs
===================================================================
@@ -119,6 +119,9 @@ static int Main (string [] args)
List<string> topics = p.Parse (args);
+ if (basedir == null)
+ basedir = Directory.GetParent (System.Reflection.Assembly.GetExecutingAssembly ().Location).FullName;
+
if (show_version) {
Console.WriteLine ("Mono Documentation Browser");
Version ver = Assembly.GetExecutingAssembly ().GetName ().Version;
Commit: 815fad20b9199ae22d53d725a0459ade65b1ef35
Author: Jérémie Laval <[email protected]> (garuma)
Date: 2013-10-09 20:16:56 GMT
URL: https://github.com/mono/mono-tools/commit/815fad20b9199ae22d53d725a0459ade65b1ef35
Merge pull request #35 from directhex/master
Restore behaviour when not passing a --docrootdir parameter from Mono 2.8 when running on Mono 3.0+
Changed paths:
M docbrowser/browser.cs
Modified: docbrowser/browser.cs
===================================================================
@@ -119,6 +119,9 @@ static int Main (string [] args)
List<string> topics = p.Parse (args);
+ if (basedir == null)
+ basedir = Directory.GetParent (System.Reflection.Assembly.GetExecutingAssembly ().Location).FullName;
+
if (show_version) {
Console.WriteLine ("Mono Documentation Browser");
Version ver = Assembly.GetExecutingAssembly ().GetName ().Version;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches