[Pkg-mono-svn-commits] rev 3801 - in monodoc/trunk/debian: . patches
David Paleino
hanska-guest at alioth.debian.org
Sun Nov 23 17:20:16 UTC 2008
Author: hanska-guest
Date: 2008-11-23 17:20:16 +0000 (Sun, 23 Nov 2008)
New Revision: 3801
Added:
monodoc/trunk/debian/patches/05-backport_2.2_nodes_handling.patch
Modified:
monodoc/trunk/debian/changelog
monodoc/trunk/debian/patches/series
Log:
* debian/patches:
+ 05-backport_2.2_nodes_handling.patch added, implements new way of
handling monodoc.xml and documentation nodes
+ implement get-orig-source target in debian/rules
Modified: monodoc/trunk/debian/changelog
===================================================================
--- monodoc/trunk/debian/changelog 2008-11-23 17:09:07 UTC (rev 3800)
+++ monodoc/trunk/debian/changelog 2008-11-23 17:20:16 UTC (rev 3801)
@@ -22,10 +22,13 @@
* debian/monodoc-base.dirs added
* debian/rules updated
* Patch system switched to quilt
+ * debian/patches:
+ + 05-backport_2.2_nodes_handling.patch added, implements new way of
+ handling monodoc.xml and documentation nodes
* Group Policy:
- - implement get-orig-source target in debian/rules
+ + implement get-orig-source target in debian/rules
- -- David Paleino <d.paleino at gmail.com> Sun, 23 Nov 2008 17:45:03 +0100
+ -- David Paleino <d.paleino at gmail.com> Sun, 23 Nov 2008 18:19:49 +0100
monodoc (1.9-2) unstable; urgency=low
Added: monodoc/trunk/debian/patches/05-backport_2.2_nodes_handling.patch
===================================================================
--- monodoc/trunk/debian/patches/05-backport_2.2_nodes_handling.patch (rev 0)
+++ monodoc/trunk/debian/patches/05-backport_2.2_nodes_handling.patch 2008-11-23 17:20:16 UTC (rev 3801)
@@ -0,0 +1,245 @@
+--- monodoc-2.0.orig/class/Makefile.am
++++ monodoc-2.0/class/Makefile.am
+@@ -2,16 +2,18 @@
+ cserrors_sourcesdir = $(libdir)/monodoc/sources
+
+ sources_DATA = \
+- ecma334.tree ecma334.zip ecma334.source \
++ ecma334.tree ecma334.zip \
+ netdocs.tree netdocs.zip netdocs.source \
+ nunit-docs.tree nunit-docs.zip nunit-docs.source \
+ Mono.tree Mono.zip Mono.source \
+ mono-tools.tree mono-tools.zip mono-tools.source \
+- Novell.source Novell.zip Novell.tree
++ Novell.source Novell.zip Novell.tree \
++ lang-csharp.source mono-file-formats.source \
++ mono-file-formats.tree mono-file-formats.zip
+
+ if BUILD_CSERRORS
+ cserrors_sources_DATA = \
+- cs-errors.tree cs-errors.zip cs-errors.source
++ cs-errors.tree cs-errors.zip
+ endif
+
+ ASSEMBLER = ../engine/assembler.exe
+@@ -73,6 +75,9 @@
+ mono-tools.tree mono-tools.zip: $(srcdir)/mono-tools.config
+ mono --debug $(ASSEMBLER) -o mono-tools --man $(srcdir)/mono-tools.config
+
++mono-file-formats.tree mono-file-formats.zip: $(srcdir)/mono-file-formats.config
++ mono --debug $(ASSEMBLER) --man $< -o mono-file-formats
++
+ CLEANFILES = \
+ ecma334.tree ecma334.zip \
+ netdocs.tree netdocs.zip \
+@@ -85,7 +90,8 @@
+ EXTRA_DIST = \
+ $(sources_DATA) \
+ $(cserrors_sources_DATA) \
+- mono-tools.config
++ mono-tools.config \
++ mono-file-formats.config
+
+ # format: assembly-name,directory,versions
+ # if directory=-, uses assembly-name.
+--- monodoc-2.0.orig/class/Mono.source
++++ monodoc-2.0/class/Mono.source
+@@ -1,4 +1,5 @@
+ <?xml version="1.0"?>
+ <monodoc>
++ <node label="Mono Libraries" name="classlib-mono" parent="libraries" />
+ <source provider="ecma" basefile="Mono" path="classlib-mono"/>
+ </monodoc>
+--- monodoc-2.0.orig/class/Novell.source
++++ monodoc-2.0/class/Novell.source
+@@ -1,4 +1,5 @@
+ <?xml version="1.0"?>
+ <monodoc>
++ <node label="Novell Libraries" name="classlib-novell" parent="libraries" />
+ <source provider="ecma" basefile="Novell" path="classlib-novell"/>
+ </monodoc>
+--- monodoc-2.0.orig/class/cs-errors.source
++++ /dev/null
+@@ -1,4 +0,0 @@
+-<?xml version="1.0"?>
+-<monodoc>
+- <source provider="error" basefile="cs-errors" path="cs-errors"/>
+-</monodoc>
+--- monodoc-2.0.orig/class/ecma334.source
++++ /dev/null
+@@ -1,4 +0,0 @@
+-<?xml version="1.0"?>
+-<monodoc>
+- <source provider="ecmaspec" basefile="ecma334" path="ecmaspec"/>
+-</monodoc>
+--- /dev/null
++++ monodoc-2.0/class/lang-csharp.source
+@@ -0,0 +1,9 @@
++<?xml version="1.0"?>
++<monodoc>
++ <node label="C#" name="lang-c#" parent="languages">
++ <node label="C# Compiler Error Reference" name="cs-errors"/>
++ <node label="C# Language Specification" name="ecmaspec"/>
++ </node>
++ <source provider="error" basefile="cs-errors" path="cs-errors"/>
++ <source provider="ecmaspec" basefile="ecma334" path="ecmaspec"/>
++</monodoc>
+--- /dev/null
++++ monodoc-2.0/class/mono-file-formats.source
+@@ -0,0 +1,5 @@
++<?xml version="1.0"?>
++<monodoc>
++ <node label="Mono File Formats" name="mono-formats" parent="formats" />
++ <source provider="man" basefile="mono-file-formats" path="mono-formats"/>
++</monodoc>
+--- monodoc-2.0.orig/class/mono-tools.config
++++ monodoc-2.0/class/mono-tools.config
+@@ -20,7 +20,6 @@
+ <manpage name="mdcs2ecma(1)" page="../man/mdcs2ecma.1" />
+ <manpage name="mdnormalizer(1)" page="../man/mdnormalizer.1" />
+ <manpage name="mdoc(1)" page="../man/mdoc.1" />
+- <manpage name="mdoc(5)" page="../man/mdoc.5" />
+ <manpage name="mdoc-assemble(1)" page="../man/mdoc-assemble.1" />
+ <manpage name="mdoc-export-html(1)" page="../man/mdoc-export-html.1" />
+ <manpage name="mdoc-export-msxdoc(1)" page="../man/mdoc-export-msxdoc.1" />
+@@ -29,7 +28,6 @@
+ <manpage name="mdvalidator(1)" page="../man/mdvalidator.1" />
+ <manpage name="mkbundle(1)" page="../../mono/man/mkbundle.1" />
+ <manpage name="mono(1)" page="../../mono/man/mono.1" />
+- <manpage name="mono-config(5)" page="../../mono/man/mono-config.5" />
+ <manpage name="mono-service(1)" page="../../mono/man/mono-service.1" />
+ <manpage name="mono-shlib-cop(1)" page="../../mono/man/mono-shlib-cop.1" />
+ <manpage name="monodocer(1)" page="../man/monodocer.1" />
+--- monodoc-2.0.orig/class/mono-tools.source
++++ monodoc-2.0/class/mono-tools.source
+@@ -1,4 +1,5 @@
+ <?xml version="1.0"?>
+ <monodoc>
++ <node label="Mono Development Tools" name="dev-tools" parent="tools" />
+ <source provider="man" basefile="mono-tools" path="dev-tools"/>
+ </monodoc>
+--- monodoc-2.0.orig/class/netdocs.source
++++ monodoc-2.0/class/netdocs.source
+@@ -1,4 +1,5 @@
+ <?xml version="1.0"?>
+ <monodoc>
++ <node label="Base Class Library" name="classlib" parent="libraries" />
+ <source provider="ecma" basefile="netdocs" path="classlib"/>
+ </monodoc>
+--- monodoc-2.0.orig/class/nunit-docs.source
++++ monodoc-2.0/class/nunit-docs.source
+@@ -1,4 +1,5 @@
+ <?xml version="1.0"?>
+ <monodoc>
++ <node label="NUnit Libraries" name="classlib-nunit" parent="libraries" />
+ <source provider="ecma" basefile="nunit-docs" path="classlib-nunit"/>
+ </monodoc>
+--- monodoc-2.0.orig/engine/monodoc.xml
++++ monodoc-2.0/engine/monodoc.xml
+@@ -1,24 +1,7 @@
+ <?xml version="1.0"?>
+-<node label="Mono Documentation" name="root:">
+- <node label="Class Library" name="classlib"/>
+- <node label="Mono Libraries" name="classlib-mono"/>
+- <node label="Gnome Libraries" name="classlib-gnome"/>
+- <node label="Mozilla Libraries" name="classlib-gecko"/>
+- <node label="Novell Libraries" name="classlib-novell"/>
+- <node label="MonoDevelop IDE" name="md">
+- <node label="API Reference" name="monodevelop" />
+- <node label="Extension Point Reference" name="monodevelop-extension-guide" />
+- </node>
+- <node label="Moonlight/Silverlight" name="moonlight"/>
+- <node label="C# Language Specification" name="ecmaspec" />
+- <node label="C# Compiler Error Reference" name="cs-errors" />
+- <node label="Mono Development Tools" name="dev-tools">
+- <node label="Mono Debugger" name="debugger"/>
+- </node>
+- <node label="Mono Embedding" name="embed"/>
+- <node label="Various" name="various">
+- <node label="DiaCanvas Libraries" name="classlib-diacanvas"/>
+- <node label="NUnit Libraries" name="classlib-nunit"/>
+- <node label="Tao" name="tao"/>
+- </node>
++<node label="Mono Documentation" name="libraries">
++ <node label="File Formats" name="formats" />
++ <node label="Languages" name="languages" />
++ <node label="Tools" name="tools" />
++ <node label="Various" name="various" />
+ </node>
+--- monodoc-2.0.orig/engine/provider.cs
++++ monodoc-2.0/engine/provider.cs
+@@ -339,7 +339,8 @@
+
+ public void Sort ()
+ {
+- nodes.Sort ();
++ if (nodes != null)
++ nodes.Sort ();
+ }
+
+ public string URL {
+@@ -364,7 +365,15 @@
+
+ int IComparable.CompareTo (object obj)
+ {
+- Node other = (Node) obj;
++ Node other = obj as Node;
++ if (other == null)
++ return -1;
++
++ if (position < 0)
++ LoadNode ();
++ if (other.position < 0)
++ other.LoadNode ();
++
+ return String.CompareOrdinal(caption, other.caption);
+ }
+ }
+@@ -779,6 +788,7 @@
+ XmlNodeList nodes = doc.SelectNodes ("/node/node");
+
+ root.name_to_node ["root"] = root;
++ root.name_to_node ["libraries"] = root;
+ root.Populate (root, nodes);
+
+ Node third_party = root.LookupEntryPoint ("various");
+@@ -845,12 +855,13 @@
+ Node parent = root.LookupEntryPoint (path);
+ if (parent == null){
+ Console.Error.WriteLine ("node `{0}' is not defined on the documentation map", path);
+- continue;
++ parent = third_party;
+ }
+
+ foreach (Node n in hs.Tree.Nodes){
+ parent.AddNode (n);
+ }
++ parent.Sort ();
+ }
+ }
+
+@@ -869,6 +880,8 @@
+ // Clean the tree
+ PurgeNode(root);
+
++ root.Sort ();
++
+ return root;
+ }
+
+@@ -949,7 +962,14 @@
+ void Populate (Node parent, XmlNodeList xml_node_list)
+ {
+ foreach (XmlNode xml_node in xml_node_list){
+- XmlAttribute e = xml_node.Attributes ["label"];
++ XmlAttribute e = xml_node.Attributes ["parent"];
++ if (e != null && name_to_node.ContainsKey (e.InnerText)) {
++ Node p = (Node) name_to_node [e.InnerText];
++ xml_node.Attributes.Remove (e);
++ Populate (p, xml_node.SelectNodes ("."));
++ continue;
++ }
++ e = xml_node.Attributes ["label"];
+ if (e == null){
+ Console.Error.WriteLine ("`label' attribute missing in <node>");
+ continue;
Modified: monodoc/trunk/debian/patches/series
===================================================================
--- monodoc/trunk/debian/patches/series 2008-11-23 17:09:07 UTC (rev 3800)
+++ monodoc/trunk/debian/patches/series 2008-11-23 17:20:16 UTC (rev 3801)
@@ -3,3 +3,4 @@
02-keep_cs-errors.patch
03-build_sqlite_docs.patch
04-fix_Novell_docs.patch
+05-backport_2.2_nodes_handling.patch
More information about the Pkg-mono-svn-commits
mailing list