diff options
| author | Jonathan Pryor <jpryor@novell.com> | 2010-01-14 15:46:19 +0300 |
|---|---|---|
| committer | Jonathan Pryor <jpryor@novell.com> | 2010-01-14 15:46:19 +0300 |
| commit | b51b58935fe9e6279ebdac6f47d7c29e183d256b (patch) | |
| tree | 2d39834e33d196409ceb519dbcddd94b1bd06b64 /mcs/tools | |
| parent | 9c6bce34ae6dcd090c699ab49815ab6a62a46aa8 (diff) | |
* Mono.Documentation/monodocs2slashdoc.cs: Fix NamespaceSummaries.xml
generation to look at the ns-NAMESPACE.xml files, not just
NAMESPACE.xml files.
svn path=/branches/mono-2-6/mcs/; revision=149552
Diffstat (limited to 'mcs/tools')
| -rw-r--r-- | mcs/tools/mdoc/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/tools/mdoc/Mono.Documentation/monodocs2slashdoc.cs | 19 |
2 files changed, 17 insertions, 8 deletions
diff --git a/mcs/tools/mdoc/ChangeLog b/mcs/tools/mdoc/ChangeLog index 3717a1653a3..17a8faf7875 100644 --- a/mcs/tools/mdoc/ChangeLog +++ b/mcs/tools/mdoc/ChangeLog @@ -1,3 +1,9 @@ +2010-01-11 Jonathan Pryor <jpryor@novell.com> + + * Mono.Documentation/monodocs2slashdoc.cs: Fix NamespaceSummaries.xml + generation to look at the ns-NAMESPACE.xml files, not just + NAMESPACE.xml files. + 2009-09-19 Jonathan Pryor <jpryor@novell.com> * Mono.Documentation/monodocs2html.cs: Add --with-profile=PROFILE diff --git a/mcs/tools/mdoc/Mono.Documentation/monodocs2slashdoc.cs b/mcs/tools/mdoc/Mono.Documentation/monodocs2slashdoc.cs index 54c1e24e9c0..190861277f0 100644 --- a/mcs/tools/mdoc/Mono.Documentation/monodocs2slashdoc.cs +++ b/mcs/tools/mdoc/Mono.Documentation/monodocs2slashdoc.cs @@ -133,14 +133,17 @@ public class MDocToMSXDocConverter : MDocCommand { } private static void AddNamespaceSummary(XmlDocument nsSummaries, string basepath, string currentNs) { - string filename = Path.Combine(basepath, currentNs + ".xml"); - if (File.Exists(filename)) { - XmlDocument nsSummary = new XmlDocument(); - nsSummary.Load(filename); - XmlElement ns = nsSummaries.CreateElement("namespace"); - nsSummaries.DocumentElement.AppendChild(ns); - ns.SetAttribute("name", currentNs); - ns.InnerText = nsSummary.SelectSingleNode("/Namespace/Docs/summary").InnerText; + foreach (var filename in new [] { + Path.Combine(basepath, currentNs + ".xml"), + Path.Combine(basepath, "ns-" + currentNs + ".xml")}) { + if (File.Exists(filename)) { + XmlDocument nsSummary = new XmlDocument(); + nsSummary.Load(filename); + XmlElement ns = nsSummaries.CreateElement("namespace"); + nsSummaries.DocumentElement.AppendChild(ns); + ns.SetAttribute("name", currentNs); + ns.InnerText = nsSummary.SelectSingleNode("/Namespace/Docs/summary").InnerText; + } } } |