diff options
| author | Stefan Kost <ensonic@users.sf.net> | 2009-07-23 23:53:55 +0300 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sf.net> | 2009-07-24 00:38:03 +0300 |
| commit | 94f95e3d83fe677bfc4aaebb23badc3abc56366a (patch) | |
| tree | df76e3f385269358e2a6309e35ae41aee8350ada | |
| parent | fedaaee6fa5c0006f5b7264732cb4e29584ef100 (diff) | |
plugin-docs: add a fallback for the include of -details.xml
For wrapper plugins we cannot know the details.xml (besides that there will be
many). Regardless we don't want to fail if there are no details (gtk-doc-1.12
handles this already). Also remove that fancy warning -> ERROR mapping from
makefile, we don't do that for normal docs either.
| -rw-r--r-- | gtk-doc-plugins.mak | 6 | ||||
| -rw-r--r-- | mangle-tmpl.py | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak index 7ea1254..83599ad 100644 --- a/gtk-doc-plugins.mak +++ b/gtk-doc-plugins.mak @@ -236,11 +236,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @for f in $(content_files); do cp $(srcdir)/$$f html; done cp -pr xml html cp ../version.entities html - cd html && gtkdoc-mkhtml $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) \ - 2>&1 | tee ../html-build.log - @if grep "warning:" html-build.log > /dev/null; then \ - echo "ERROR"; grep "warning:" html-build.log; exit 1; fi - @rm html-build.log + cd html && gtkdoc-mkhtml $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) mv html/index.sgml html/index.sgml.bak $(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml rm -f html/index.sgml.bak diff --git a/mangle-tmpl.py b/mangle-tmpl.py index dbd0566..e4095a2 100644 --- a/mangle-tmpl.py +++ b/mangle-tmpl.py @@ -148,7 +148,9 @@ def main(): # put in an include if not yet there line = '<include xmlns="http://www.w3.org/2003/XInclude" href="' + \ - 'element-' + element + '-details.xml" />\n' + 'element-' + element + '-details.xml">' + \ + '<fallback xmlns="http://www.w3.org/2003/XInclude" />' + \ + '</include>\n' section = tmpl.get_section("Long_Description") if not section[0] == line: section.insert(0, line) |