Author: jonpryor
Date: 2006-12-26 15:22:17 -0500 (Tue, 26 Dec 2006)
New Revision: 70094
Modified:
trunk/monodoc/tools/ChangeLog
trunk/monodoc/tools/Makefile.am
trunk/monodoc/tools/monodocer.cs
Log:
* Makefile.am: Add check-monodocer-ignore_extra_docs test.
* monodocer.cs: Fix -ignore_extra_docs. Previously, it would just
ignore
"missing" types, but it would still remove "missing" members.
Modified: trunk/monodoc/tools/ChangeLog
===================================================================
--- trunk/monodoc/tools/ChangeLog 2006-12-26 20:15:38 UTC (rev 70093)
+++ trunk/monodoc/tools/ChangeLog 2006-12-26 20:22:17 UTC (rev 70094)
@@ -1,5 +1,11 @@
2006-12-26 Jonathan Pryor <[EMAIL PROTECTED]>
+ * Makefile.am: Add check-monodocer-ignore_extra_docs test.
+ * monodocer.cs: Fix -ignore_extra_docs. Previously, it would just
ignore
+ "missing" types, but it would still remove "missing" members.
+
+2006-12-26 Jonathan Pryor <[EMAIL PROTECTED]>
+
* monodocer.cs: Don't insert internal attributes into the documentation.
* DocTest-v1.cs: Add test for use of an internal attribute.
Modified: trunk/monodoc/tools/Makefile.am
===================================================================
--- trunk/monodoc/tools/Makefile.am 2006-12-26 20:15:38 UTC (rev 70093)
+++ trunk/monodoc/tools/Makefile.am 2006-12-26 20:22:17 UTC (rev 70094)
@@ -96,6 +96,12 @@
-assembly:DocTest.dll -path:DocTest/en.actual -pretty
diff --exclude=.svn -rup DocTest/en.expected.importslashdoc
DocTest/en.actual
+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 \
@@ -109,7 +115,7 @@
check : check-doc-tools
-check-doc-tools: check-monodocer-since check-monodocer-importslashdoc
check-monodocer check-monodocs2html
+check-doc-tools: check-monodocer-since check-monodocer-ignore_extra_docs
check-monodocer-importslashdoc check-monodocer check-monodocs2html
clean:
-rm DocTest.dll DocTest.dll.mdb
Modified: trunk/monodoc/tools/monodocer.cs
===================================================================
--- trunk/monodoc/tools/monodocer.cs 2006-12-26 20:15:38 UTC (rev 70093)
+++ trunk/monodoc/tools/monodocer.cs 2006-12-26 20:22:17 UTC (rev 70094)
@@ -541,6 +541,8 @@
// Deleted (or signature changed)
if (oldmember2 == null) {
+ if (ignore_extra_docs && !delete)
+ continue;
Console.Error.WriteLine("Member Deleted: " +
oldmember.SelectSingleNode("[EMAIL PROTECTED]'C#']/@Value").InnerText);
if (!delete &&
MemberDocsHaveUserContent(oldmember)) {
Console.Error.WriteLine("Member
deletions must be enabled with the --delete option.");
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
