Author: jonpryor
Date: 2008-01-02 11:48:25 -0500 (Wed, 02 Jan 2008)
New Revision: 92115
Added:
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/ns-Mono.DocTest.Generic.xml
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/ns-Mono.DocTest.xml
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/ns-System.xml
trunk/monodoc/tools/DocTest/en.expected.since/ns-Mono.DocTest.Generic.xml
trunk/monodoc/tools/DocTest/en.expected.since/ns-Mono.DocTest.xml
trunk/monodoc/tools/DocTest/en.expected.since/ns-System.xml
trunk/monodoc/tools/DocTest/en.expected/ns-Mono.DocTest.Generic.xml
trunk/monodoc/tools/DocTest/en.expected/ns-Mono.DocTest.xml
trunk/monodoc/tools/DocTest/en.expected/ns-System.xml
Removed:
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.Generic.xml
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.xml
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/System.xml
trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.Generic.xml
trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.xml
trunk/monodoc/tools/DocTest/en.expected.since/System.xml
trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.Generic.xml
trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.xml
trunk/monodoc/tools/DocTest/en.expected/System.xml
Modified:
trunk/monodoc/tools/ChangeLog
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.Generic/MyList`2.xml
trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.Generic/MyList`2.xml
trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.Generic/MyList`2.xml
trunk/monodoc/tools/Makefile.am
trunk/monodoc/tools/monodocer.cs
trunk/monodoc/tools/overview.xsl
Log:
* monodocer.cs:
- Write namespace files as 'ns-<Namespace>.xml', not
'<Namespace>.xml', as
the previous behavior would break monodoc checkout on Win32 (due to
dir
class/System.Security/en/System.Security.Cryptography.Xml vs. file
class/System.Security/en/System.Security.Cryptography.xml).
- This will rename existing <Namespace>.xml to ns-<Namespace>.xml
automatically.
- gmcs/mcs changed Reflection names (again); cope.
* DocTest/en.expected/System.xml,
DocTest/en.expected/Mono.DocTest.Generic.xml,
DocTest/en.expected/Mono.DocTest.Generic/MyList`2.xml,
DocTest/en.expected/Mono.DocTest.xml,
DocTest/en.expected.since/System.xml,
DocTest/en.expected.since/Mono.DocTest.Generic.xml,
DocTest/en.expected.since/Mono.DocTest.Generic/MyList`2.xml,
DocTest/en.expected.since/Mono.DocTest.xml,
DocTest/en.expected.importslashdoc/System.xml,
DocTest/en.expected.importslashdoc/Mono.DocTest.Generic.xml,
DocTest/en.expected.importslashdoc/Mono.DocTest.Generic/MyList`2.xml,
DocTest/en.expected.importslashdoc/Mono.DocTest.xml: Rename to have a
'ns-' prefix.
* Makefile.am: Remove obsolete targets; add -show_exceptions to tests
so we
get more information on errors.
* overview.xsl: Use the 'ns-' prefixed namespace documentation files.
Modified: trunk/monodoc/tools/ChangeLog
===================================================================
--- trunk/monodoc/tools/ChangeLog 2008-01-02 16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/ChangeLog 2008-01-02 16:48:25 UTC (rev 92115)
@@ -1,3 +1,29 @@
+2008-01-02 Jonathan Pryor <[EMAIL PROTECTED]>
+
+ * monodocer.cs:
+ - Write namespace files as 'ns-<Namespace>.xml', not
'<Namespace>.xml', as
+ the previous behavior would break monodoc checkout on Win32 (due to
dir
+ class/System.Security/en/System.Security.Cryptography.Xml vs. file
+ class/System.Security/en/System.Security.Cryptography.xml).
+ - This will rename existing <Namespace>.xml to ns-<Namespace>.xml
+ automatically.
+ - gmcs/mcs changed Reflection names (again); cope.
+ * DocTest/en.expected/System.xml,
+ DocTest/en.expected/Mono.DocTest.Generic.xml,
+ DocTest/en.expected/Mono.DocTest.Generic/MyList`2.xml,
+ DocTest/en.expected/Mono.DocTest.xml,
DocTest/en.expected.since/System.xml,
+ DocTest/en.expected.since/Mono.DocTest.Generic.xml,
+ DocTest/en.expected.since/Mono.DocTest.Generic/MyList`2.xml,
+ DocTest/en.expected.since/Mono.DocTest.xml,
+ DocTest/en.expected.importslashdoc/System.xml,
+ DocTest/en.expected.importslashdoc/Mono.DocTest.Generic.xml,
+ DocTest/en.expected.importslashdoc/Mono.DocTest.Generic/MyList`2.xml,
+ DocTest/en.expected.importslashdoc/Mono.DocTest.xml: Rename to have a
+ 'ns-' prefix.
+ * Makefile.am: Remove obsolete targets; add -show_exceptions to tests
so we
+ get more information on errors.
+ * overview.xsl: Use the 'ns-' prefixed namespace documentation files.
+
2007-12-19 Jonathan Pryor <[EMAIL PROTECTED]>
* monodocer.cs: PropertyInfo.GetValue() may throw (in particular, within
Modified:
trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.Generic/MyList`2.xml
===================================================================
--- trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.Generic/MyList`2.xml
2008-01-02 16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.Generic/MyList`2.xml
2008-01-02 16:48:25 UTC (rev 92115)
@@ -281,7 +281,7 @@
</Docs>
</Member>
<Member
MemberName="System.Collections.Generic.IEnumerator<A>.Current">
- <MemberSignature Language="C#" Value="A IEnumerator<A>.Current {
get; }" />
+ <MemberSignature Language="C#" Value="A
System.Collections.Generic.IEnumerator<A>.Current { get; }" />
<MemberType>Property</MemberType>
<AssemblyInfo>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
@@ -312,7 +312,7 @@
</Docs>
</Member>
<Member MemberName="System.Collections.IEnumerator.Current">
- <MemberSignature Language="C#" Value="object IEnumerator.Current { get;
}" />
+ <MemberSignature Language="C#" Value="object
System.Collections.IEnumerator.Current { get; }" />
<MemberType>Property</MemberType>
<AssemblyInfo>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
Deleted: trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.Generic.xml
===================================================================
--- trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.Generic.xml
2008-01-02 16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.Generic.xml
2008-01-02 16:48:25 UTC (rev 92115)
@@ -1,6 +0,0 @@
-<Namespace Name="Mono.DocTest.Generic">
- <Docs>
- <summary>To be added.</summary>
- <remarks>To be added.</remarks>
- </Docs>
-</Namespace>
Deleted: trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.xml
===================================================================
--- trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.xml 2008-01-02
16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.xml 2008-01-02
16:48:25 UTC (rev 92115)
@@ -1,6 +0,0 @@
-<Namespace Name="Mono.DocTest">
- <Docs>
- <summary>To be added.</summary>
- <remarks>To be added.</remarks>
- </Docs>
-</Namespace>
Deleted: trunk/monodoc/tools/DocTest/en.expected/System.xml
===================================================================
--- trunk/monodoc/tools/DocTest/en.expected/System.xml 2008-01-02 16:46:51 UTC
(rev 92114)
+++ trunk/monodoc/tools/DocTest/en.expected/System.xml 2008-01-02 16:48:25 UTC
(rev 92115)
@@ -1,6 +0,0 @@
-<Namespace Name="System">
- <Docs>
- <summary>To be added.</summary>
- <remarks>To be added.</remarks>
- </Docs>
-</Namespace>
Copied: trunk/monodoc/tools/DocTest/en.expected/ns-Mono.DocTest.Generic.xml
(from rev 91210,
trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.Generic.xml)
Copied: trunk/monodoc/tools/DocTest/en.expected/ns-Mono.DocTest.xml (from rev
91210, trunk/monodoc/tools/DocTest/en.expected/Mono.DocTest.xml)
Copied: trunk/monodoc/tools/DocTest/en.expected/ns-System.xml (from rev 91210,
trunk/monodoc/tools/DocTest/en.expected/System.xml)
Modified:
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.Generic/MyList`2.xml
===================================================================
---
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.Generic/MyList`2.xml
2008-01-02 16:46:51 UTC (rev 92114)
+++
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.Generic/MyList`2.xml
2008-01-02 16:48:25 UTC (rev 92115)
@@ -295,7 +295,7 @@
</Docs>
</Member>
<Member
MemberName="System.Collections.Generic.IEnumerator<A>.Current">
- <MemberSignature Language="C#" Value="A IEnumerator<A>.Current {
get; }" />
+ <MemberSignature Language="C#" Value="A
System.Collections.Generic.IEnumerator<A>.Current { get; }" />
<MemberType>Property</MemberType>
<AssemblyInfo>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
@@ -326,7 +326,7 @@
</Docs>
</Member>
<Member MemberName="System.Collections.IEnumerator.Current">
- <MemberSignature Language="C#" Value="object IEnumerator.Current { get;
}" />
+ <MemberSignature Language="C#" Value="object
System.Collections.IEnumerator.Current { get; }" />
<MemberType>Property</MemberType>
<AssemblyInfo>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
Deleted:
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.Generic.xml
===================================================================
---
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.Generic.xml
2008-01-02 16:46:51 UTC (rev 92114)
+++
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.Generic.xml
2008-01-02 16:48:25 UTC (rev 92115)
@@ -1,6 +0,0 @@
-<Namespace Name="Mono.DocTest.Generic">
- <Docs>
- <summary>To be added.</summary>
- <remarks>To be added.</remarks>
- </Docs>
-</Namespace>
Deleted: trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.xml
===================================================================
--- trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.xml
2008-01-02 16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.xml
2008-01-02 16:48:25 UTC (rev 92115)
@@ -1,6 +0,0 @@
-<Namespace Name="Mono.DocTest">
- <Docs>
- <summary>To be added.</summary>
- <remarks>To be added.</remarks>
- </Docs>
-</Namespace>
Deleted: trunk/monodoc/tools/DocTest/en.expected.importslashdoc/System.xml
===================================================================
--- trunk/monodoc/tools/DocTest/en.expected.importslashdoc/System.xml
2008-01-02 16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/DocTest/en.expected.importslashdoc/System.xml
2008-01-02 16:48:25 UTC (rev 92115)
@@ -1,6 +0,0 @@
-<Namespace Name="System">
- <Docs>
- <summary>To be added.</summary>
- <remarks>To be added.</remarks>
- </Docs>
-</Namespace>
Copied:
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/ns-Mono.DocTest.Generic.xml
(from rev 91210,
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.Generic.xml)
Copied:
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/ns-Mono.DocTest.xml
(from rev 91210,
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/Mono.DocTest.xml)
Copied: trunk/monodoc/tools/DocTest/en.expected.importslashdoc/ns-System.xml
(from rev 91210,
trunk/monodoc/tools/DocTest/en.expected.importslashdoc/System.xml)
Modified:
trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.Generic/MyList`2.xml
===================================================================
---
trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.Generic/MyList`2.xml
2008-01-02 16:46:51 UTC (rev 92114)
+++
trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.Generic/MyList`2.xml
2008-01-02 16:48:25 UTC (rev 92115)
@@ -297,7 +297,7 @@
</Docs>
</Member>
<Member
MemberName="System.Collections.Generic.IEnumerator<A>.Current">
- <MemberSignature Language="C#" Value="A IEnumerator<A>.Current {
get; }" />
+ <MemberSignature Language="C#" Value="A
System.Collections.Generic.IEnumerator<A>.Current { get; }" />
<MemberType>Property</MemberType>
<AssemblyInfo>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
@@ -330,7 +330,7 @@
</Docs>
</Member>
<Member MemberName="System.Collections.IEnumerator.Current">
- <MemberSignature Language="C#" Value="object IEnumerator.Current { get;
}" />
+ <MemberSignature Language="C#" Value="object
System.Collections.IEnumerator.Current { get; }" />
<MemberType>Property</MemberType>
<AssemblyInfo>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
Deleted: trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.Generic.xml
===================================================================
--- trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.Generic.xml
2008-01-02 16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.Generic.xml
2008-01-02 16:48:25 UTC (rev 92115)
@@ -1,6 +0,0 @@
-<Namespace Name="Mono.DocTest.Generic">
- <Docs>
- <summary>To be added.</summary>
- <remarks>To be added.</remarks>
- </Docs>
-</Namespace>
Deleted: trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.xml
===================================================================
--- trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.xml
2008-01-02 16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.xml
2008-01-02 16:48:25 UTC (rev 92115)
@@ -1,6 +0,0 @@
-<Namespace Name="Mono.DocTest">
- <Docs>
- <summary>To be added.</summary>
- <remarks>To be added.</remarks>
- </Docs>
-</Namespace>
Deleted: trunk/monodoc/tools/DocTest/en.expected.since/System.xml
===================================================================
--- trunk/monodoc/tools/DocTest/en.expected.since/System.xml 2008-01-02
16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/DocTest/en.expected.since/System.xml 2008-01-02
16:48:25 UTC (rev 92115)
@@ -1,6 +0,0 @@
-<Namespace Name="System">
- <Docs>
- <summary>To be added.</summary>
- <remarks>To be added.</remarks>
- </Docs>
-</Namespace>
Copied:
trunk/monodoc/tools/DocTest/en.expected.since/ns-Mono.DocTest.Generic.xml (from
rev 91210,
trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.Generic.xml)
Copied: trunk/monodoc/tools/DocTest/en.expected.since/ns-Mono.DocTest.xml (from
rev 91210, trunk/monodoc/tools/DocTest/en.expected.since/Mono.DocTest.xml)
Copied: trunk/monodoc/tools/DocTest/en.expected.since/ns-System.xml (from rev
91210, trunk/monodoc/tools/DocTest/en.expected.since/System.xml)
Modified: trunk/monodoc/tools/Makefile.am
===================================================================
--- trunk/monodoc/tools/Makefile.am 2008-01-02 16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/Makefile.am 2008-01-02 16:48:25 UTC (rev 92115)
@@ -48,77 +48,69 @@
check-monodocer-update: monodocer.exe
find DocTest/en.expected -name \*.xml -exec rm "{}" \;
$(MAKE) DocTest.dll-v1
- mono --debug monodocer.exe \
+ mono --debug monodocer.exe -show_exceptions \
-assembly:DocTest.dll -path:DocTest/en.expected -pretty
check-monodocer: monodocer.exe
rm -Rf DocTest/en.actual
$(MAKE) DocTest.dll-v1
- mono --debug monodocer.exe \
+ mono --debug monodocer.exe -show_exceptions \
-assembly:DocTest.dll -path:DocTest/en.actual -pretty
diff --exclude=.svn -rup DocTest/en.expected DocTest/en.actual
- mono --debug monodocer.exe \
+ mono --debug monodocer.exe -show_exceptions \
-assembly:DocTest.dll -path:DocTest/en.actual -pretty
diff --exclude=.svn -rup DocTest/en.expected DocTest/en.actual
mono --debug monodocer.exe -namespace:Mono.DocTest.Generic -pretty \
- -assembly:DocTest.dll -path:DocTest/en.actual
+ -assembly:DocTest.dll -path:DocTest/en.actual -show_exceptions
diff --exclude=.svn -rup DocTest/en.expected DocTest/en.actual
check-monodocer-since-update: monodocer.exe
find DocTest/en.expected.since -name \*.xml -exec rm "{}" \;
$(MAKE) DocTest.dll-v1
- mono --debug monodocer.exe \
+ mono --debug monodocer.exe -show_exceptions \
-assembly:DocTest.dll -path:DocTest/en.expected.since -pretty
$(MAKE) DocTest.dll-v2
- mono --debug monodocer.exe -since:"Version 2.0" \
+ mono --debug monodocer.exe -show_exceptions -since:"Version 2.0" \
-assembly:DocTest.dll -path:DocTest/en.expected.since -pretty
check-monodocer-since: monodocer.exe
rm -Rf DocTest/en.actual
$(MAKE) DocTest.dll-v1
- mono --debug monodocer.exe \
+ mono --debug monodocer.exe -show_exceptions \
-assembly:DocTest.dll -path:DocTest/en.actual -pretty
$(MAKE) DocTest.dll-v2
- mono --debug monodocer.exe -since:"Version 2.0" \
+ mono --debug monodocer.exe -show_exceptions -since:"Version 2.0" \
-assembly:DocTest.dll -path:DocTest/en.actual -pretty
diff --exclude=.svn -rup DocTest/en.expected.since DocTest/en.actual
check-monodocer-importslashdoc-update: monodocer.exe
find DocTest/en.expected.importslashdoc -name \*.xml -exec rm "{}" \;
$(MAKE) DocTest.dll-v1 TEST_CSCFLAGS=-doc:DocTest.xml
- mono --debug monodocer.exe -importslashdoc:DocTest.xml \
+ mono --debug monodocer.exe -show_exceptions -importslashdoc:DocTest.xml
\
-assembly:DocTest.dll -path:DocTest/en.expected.importslashdoc
-pretty
check-monodocer-importslashdoc: monodocer.exe
rm -Rf DocTest/en.actual
$(MAKE) DocTest.dll-v1 TEST_CSCFLAGS=-doc:DocTest.xml
- mono --debug monodocer.exe -importslashdoc:DocTest.xml \
+ mono --debug monodocer.exe -show_exceptions -importslashdoc:DocTest.xml
\
-assembly:DocTest.dll -path:DocTest/en.actual -pretty
diff --exclude=.svn -rup DocTest/en.expected.importslashdoc
DocTest/en.actual
check-monodocer-importecmadoc-update: monodocer.exe
find DocTest/en.expected.importecmadoc -name \*.xml -exec rm "{}" \;
$(MAKE) DocTest.dll-v1
- mono --debug monodocer.exe -importecmadoc:TestEcmaDocs.xml \
+ mono --debug monodocer.exe -show_exceptions
-importecmadoc:TestEcmaDocs.xml \
-type:System.AsyncCallback -type:System.Environment
-type:System.Array \
-assembly:DocTest.dll -path:DocTest/en.expected.importecmadoc
-pretty
check-monodocer-importecmadoc: monodocer.exe
rm -Rf DocTest/en.actual
$(MAKE) DocTest.dll-v1
- mono --debug monodocer.exe -importecmadoc:TestEcmaDocs.xml \
+ mono --debug monodocer.exe -show_exceptions
-importecmadoc:TestEcmaDocs.xml \
-type:System.AsyncCallback -type:System.Environment
-type:System.Array \
-assembly:DocTest.dll -path:DocTest/en.actual -pretty
diff --exclude=.svn -rup DocTest/en.expected.importecmadoc
DocTest/en.actual
-check-monodocer-ignore_extra_docs-update:
-
-check-monodocer-ignore_extra_docs: check-monodocer-since
- $(MAKE) DocTest.dll-v1
- mono --debug monodocer.exe -pretty -overrides -ignore_extra_docs \
- -assembly:DocTest.dll -path:en
- diff --exclude=.svn -rup DocTest/en.expected.since DocTest/en.actual
-
check-monodocs2html-update: monodocs2html.exe
find DocTest/html.expected -name \*.html -exec rm "{}" \;
mono --debug monodocs2html.exe \
@@ -135,14 +127,12 @@
check-update : check-doc-tools-update
check-doc-tools: check-monodocer-since \
- check-monodocer-ignore_extra_docs \
check-monodocer-importecmadoc \
check-monodocer-importslashdoc \
check-monodocer \
check-monodocs2html
check-doc-tools-update: check-monodocer-since-update \
- check-monodocer-ignore_extra_docs-update \
check-monodocer-importecmadoc-update \
check-monodocer-importslashdoc-update \
check-monodocer-update \
Modified: trunk/monodoc/tools/monodocer.cs
===================================================================
--- trunk/monodoc/tools/monodocer.cs 2008-01-02 16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/monodocer.cs 2008-01-02 16:48:25 UTC (rev 92115)
@@ -56,7 +56,6 @@
static MemberFormatter csharpFullFormatter = new
CSharpFullMemberFormatter ();
static MemberFormatter csharpFormatter = new CSharpMemberFormatter
();
- static MemberFormatter docTypeFullFormatter = new
DocTypeFullMemberFormatter ();
static MemberFormatter docTypeFormatter = new
DocTypeMemberFormatter ();
static MemberFormatter slashdocFormatter = new
SlashDocMemberFormatter ();
static MemberFormatter filenameFormatter = new
FileNameMemberFormatter ();
@@ -323,7 +322,7 @@
index_remarks.InnerText = "To be added.";
index_docs.AppendChild(index_remarks);
- using (TextWriter writer = OpenWrite (outdir + "/" + ns +
".xml", FileMode.CreateNew)) {
+ using (TextWriter writer = OpenWrite (outdir + "/ns-" + ns +
".xml", FileMode.CreateNew)) {
WriteXml(index.DocumentElement, writer);
}
}
@@ -570,7 +569,13 @@
typenode.RemoveAttribute("DisplayName");
// Ensure the namespace index file exists
- if (!new System.IO.FileInfo(dest + "/" + type.Namespace
+ ".xml").Exists) {
+ string onsdoc = Path.Combine (dest, type.Namespace +
".xml");
+ string nsdoc = Path.Combine (dest, "ns-" +
type.Namespace + ".xml");
+ if (File.Exists (onsdoc)) {
+ File.Move (onsdoc, nsdoc);
+ }
+
+ if (!File.Exists (nsdoc)) {
Console.WriteLine("New Namespace File: " +
type.Namespace);
WriteNamespaceStub(type.Namespace, dest);
}
@@ -1126,7 +1131,10 @@
// -- System.Collections.Generic.IEnumerable<T>.Current
// - Try as-is, and try type.member, *keeping* the generic
parameters.
// --> System.Collections.Generic.IEnumerable<T>.Current,
IEnumerable<T>.Current
- if (docName.IndexOf ('<') == -1) {
+ // 5. As of 2008-01-02, gmcs will do e.g. 'IFoo`1[A].Method'
instead of
+ // 'IFoo<A>.Method' for explicitly implemented methods;
don't interpret
+ // this as (1) or (2).
+ if (docName.IndexOf ('<') == -1 && docName.IndexOf ('[') == -1)
{
// Cases 1 & 2
foreach (MemberInfo mi in type.GetMember (docName,
DefaultBindingFlags))
yield return mi;
@@ -1165,13 +1173,13 @@
break;
}
}
- docName = startLt == -1 ? docName : docName.Substring (0,
startLt);
+ string refName = startLt == -1 ? docName : docName.Substring
(0, startLt);
// case 3
- foreach (MemberInfo mi in type.GetMember (docName,
DefaultBindingFlags))
+ foreach (MemberInfo mi in type.GetMember (refName,
DefaultBindingFlags))
yield return mi;
// case 4
- foreach (MemberInfo mi in type.GetMember (docName.Substring
(startType + 1), DefaultBindingFlags))
+ foreach (MemberInfo mi in type.GetMember (refName.Substring
(startType + 1), DefaultBindingFlags))
yield return mi;
// If we _still_ haven't found it, we've hit another generic
naming issue:
@@ -2048,24 +2056,7 @@
PropertyInfo pi = mi as PropertyInfo;
if (pi == null)
return mi.Name;
- // Issue: (g)mcs-generated assemblies that explicitly
implement
- // properties don't specify the full namespace, just
the
- // TypeName.Property; .NET uses
Full.Namespace.TypeName.Property.
- MethodInfo method = pi.GetGetMethod (true);
- if (method == null)
- method = pi.GetSetMethod (true);
- if (!DocUtils.IsExplicitlyImplemented (method))
- return mi.Name;
-
- // explicitly implemented member; is this a
.NET-generated assembly?
- if (CountChars (mi.Name, '.') > 1)
- return mi.Name;
-
- // Need to determine appropriate namespace for this
member.
- Type iface;
- MethodInfo ifaceMethod;
- DocUtils.GetInfoForExplicitlyImplementedMethod (method,
out iface, out ifaceMethod);
- return string.Join (".", new string[]{iface.Namespace,
mi.Name});
+ return DocUtils.GetPropertyName (pi);
}
StringBuilder sb = new StringBuilder (mi.Name.Length);
if (!DocUtils.IsExplicitlyImplemented (mb))
@@ -2138,12 +2129,12 @@
private static string GetDocTypeFullName (Type type)
{
- return docTypeFullFormatter.GetName (type);
+ return DocTypeFullMemberFormatter.Default.GetName (type);
}
private static string GetCSharpFullName (Type type)
{
- return docTypeFullFormatter.GetName (type);
+ return DocTypeFullMemberFormatter.Default.GetName (type);
}
class DocsNodeInfo {
@@ -2397,6 +2388,14 @@
return name.Substring (startType+1);
}
+ public static string GetMember (string name)
+ {
+ int i = name.LastIndexOf ('.');
+ if (i == -1)
+ return name;
+ return name.Substring (i+1);
+ }
+
public static void GetInfoForExplicitlyImplementedMethod (
MethodBase method, out Type iface, out MethodInfo
ifaceMethod)
{
@@ -2421,6 +2420,26 @@
return list.ToArray ();
#endif
}
+
+ public static string GetPropertyName (PropertyInfo pi)
+ {
+ // Issue: (g)mcs-generated assemblies that explicitly implement
+ // properties don't specify the full namespace, just the
+ // TypeName.Property; .NET uses
Full.Namespace.TypeName.Property.
+ MethodInfo method = pi.GetGetMethod (true);
+ if (method == null)
+ method = pi.GetSetMethod (true);
+ if (!IsExplicitlyImplemented (method))
+ return pi.Name;
+
+ // Need to determine appropriate namespace for this member.
+ Type iface;
+ MethodInfo ifaceMethod;
+ GetInfoForExplicitlyImplementedMethod (method, out iface, out
ifaceMethod);
+ return string.Join (".", new string[]{
+ DocTypeFullMemberFormatter.Default.GetName
(iface),
+ GetMember (pi.Name)});
+ }
}
class DocumentationMember {
@@ -3089,7 +3108,7 @@
break;
}
}
- buf.Append (name);
+ buf.Append (name == "this" ? name : DocUtils.GetPropertyName
(property));
if (property.GetIndexParameters ().Length != 0) {
AppendParameters (buf, property.GetIndexParameters (),
'[', ']');
@@ -3193,6 +3212,8 @@
}
class DocTypeFullMemberFormatter : MemberFormatter {
+ public static readonly MemberFormatter Default = new
DocTypeFullMemberFormatter ();
+
protected override char NestedTypeSeparator {
get {return '+';}
}
Modified: trunk/monodoc/tools/overview.xsl
===================================================================
--- trunk/monodoc/tools/overview.xsl 2008-01-02 16:46:51 UTC (rev 92114)
+++ trunk/monodoc/tools/overview.xsl 2008-01-02 16:48:25 UTC (rev 92115)
@@ -102,7 +102,7 @@
<xsl:for-each
select="Types/Namespace">
<xsl:sort
select="@Name"/>
<h2 class="Section"><a
href="[EMAIL PROTECTED]/index.{$ext}"><xsl:value-of select="@Name"/>
Namespace</a></h2>
- <p><xsl:apply-templates
select="document(concat(@Name,'.xml'), .)/Namespace/Docs/summary"
mode="notoppara"/></p>
+ <p><xsl:apply-templates
select="document(concat('ns-',@Name,'.xml'), .)/Namespace/Docs/summary"
mode="notoppara"/></p>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
@@ -119,7 +119,7 @@
</xsl:template>
<xsl:template name="CreateNamespaceDetails">
<xsl:param name="ns" />
- <p><xsl:apply-templates
select="document(concat($ns/@Name,'.xml'), .)/Namespace/Docs/remarks"
mode="notoppara"/></p>
+ <p><xsl:apply-templates
select="document(concat('ns-',$ns/@Name,'.xml'), .)/Namespace/Docs/remarks"
mode="notoppara"/></p>
<table class="TypesListing"
style="margin-top: 1em">
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
