gtk-doc.dcl \
gtk-doc.xsl \
version-greater-or-equal.xsl \
+ devhelp2.xsd \
devhelp2.xsl \
gtk-doc.make \
gtk-doc.notmpl.make \
CLEANFILES = \
gtk-doc.flat.make \
- gtk-doc.notmpl-flat.make
+ gtk-doc.notmpl-flat.make \
+ gtkdoc-depscanc
MAINTAINERCLEANFILES = \
build-aux \
gtk-doc.dcl \
gtk-doc.xsl \
version-greater-or-equal.xsl \
+ devhelp2.xsd \
devhelp2.xsl \
gtk-doc.make \
gtk-doc.notmpl.make \
CLEANFILES = \
gtk-doc.flat.make \
- gtk-doc.notmpl-flat.make
+ gtk-doc.notmpl-flat.make \
+ gtkdoc-depscanc
MAINTAINERCLEANFILES = \
build-aux \
-GTK-Doc 1.22 (May 07 2014)
+GTK-Doc 1.23 (May 17 2015)
+==============
+
+ Changes
+
+ o 749142 : Can't build totem-pl-parser from master using gtk-doc 1.22
+ o 749210 : mkman: Use full URL to refer to the docbook manpages stylesheet
+
+ Contributors
+
+ Emanuele Aina
+ Stefan Sauer
+
+GTK-Doc 1.22 (May 07 2015)
============
Important notice - starting with the next release these long deprecated
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gtk-doc 1.22.
+# Generated by GNU Autoconf 2.69 for gtk-doc 1.23.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc>.
#
# Identity of this package.
PACKAGE_NAME='gtk-doc'
PACKAGE_TARNAME='gtk-doc'
-PACKAGE_VERSION='1.22'
-PACKAGE_STRING='gtk-doc 1.22'
+PACKAGE_VERSION='1.23'
+PACKAGE_STRING='gtk-doc 1.23'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc'
PACKAGE_URL=''
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gtk-doc 1.22 to adapt to many kinds of systems.
+\`configure' configures gtk-doc 1.23 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gtk-doc 1.22:";;
+ short | recursive ) echo "Configuration of gtk-doc 1.23:";;
esac
cat <<\_ACEOF
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gtk-doc configure 1.22
+gtk-doc configure 1.23
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gtk-doc $as_me 1.22, which was
+It was created by gtk-doc $as_me 1.23, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
# Define the identity of the package.
PACKAGE='gtk-doc'
- VERSION='1.22'
+ VERSION='1.23'
cat >>confdefs.h <<_ACEOF
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gtk-doc $as_me 1.22, which was
+This file was extended by gtk-doc $as_me 1.23, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gtk-doc config.status 1.22
+gtk-doc config.status 1.23
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
dnl Makefile can only cope with that, i.e. use 1.1, 1.2, 1.3 ... 9.9.
dnl FIXME: I can't see anything failing (1.14.1), lets try to use a three digit
dnl number for the development version
-m4_define(gtk_doc_version, 1.22)
+m4_define(gtk_doc_version, 1.23)
AC_INIT([gtk-doc],[gtk_doc_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc],[gtk-doc])
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+get http://xml.fiforms.org/xs3p/ and generate docs
+xsltproc -o devhelp2.xsd.html $HOME/download/xs3p-1.1.3/xs3p.xsl devhelp2.xsd
+-->
+<xsd:schema
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+ <xsd:annotation>
+ <xsd:documentation>
+ Devhelp2 files are use in the 'devhelp' documentation browser.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:simpleType name="keyword-type">
+ <xsd:annotation>
+ <xsd:documentation>
+ Known keyword types.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="constant"/>
+ <xsd:enumeration value="enum"/>
+ <xsd:enumeration value="function"/>
+ <xsd:enumeration value="macro"/>
+ <xsd:enumeration value="property"/>
+ <xsd:enumeration value="signal"/>
+ <xsd:enumeration value="struct"/>
+ <xsd:enumeration value="typedef"/>
+ <xsd:enumeration value="union"/>
+ <xsd:enumeration value="variable"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="language-type">
+ <xsd:annotation>
+ <xsd:documentation>
+ Known programing languages.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="c"/>
+ <xsd:enumeration value="c++"/>
+ <xsd:enumeration value="c#"/>
+ <xsd:enumeration value="java"/>
+ <xsd:enumeration value="javascript"/>
+ <xsd:enumeration value="perl"/>
+ <xsd:enumeration value="python"/>
+ <xsd:enumeration value="vala"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:attribute name="title" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ Title of the reference manual.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="link" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ Entry point to the manual. Can be given as a relative path to the
+ location of the devhelp2 file..
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="author" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ Author of the document. Multiple authors are separated by ','.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="name" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ Short name of the manual.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="version" type="xsd:integer">
+ <xsd:annotation>
+ <xsd:documentation>
+ Version of the devhelp xml specification (2).
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="language" type="language-type">
+ <xsd:annotation>
+ <xsd:documentation>
+ Programing language this manual refers to.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+
+ <xsd:attribute name="type" type="keyword-type">
+ <xsd:annotation>
+ <xsd:documentation>
+ Type of the keyword.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="since" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ Version since that the keyword is part of the API.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="deprecated" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ Marks the keyword as deprecated.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="stability" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ Document the stability status.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+
+
+ <xsd:element name="sub">
+ <xsd:annotation>
+ <xsd:documentation>
+ Sub tags for the hierachy of the chapters and parts.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="sub" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute ref="name" use="required"/>
+ <xsd:attribute ref="link" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="chapters">
+ <xsd:annotation>
+ <xsd:documentation>
+ The chapters tag encloses the structure of the reference manual. Each
+ sub unit is represented by a sub tag.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="sub" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="keyword">
+ <xsd:annotation>
+ <xsd:documentation>
+ The keyword tag points to the documentation of a api symbol.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:attribute ref="type" use="required"/>
+ <xsd:attribute ref="name" use="required"/>
+ <xsd:attribute ref="link" use="required"/>
+ <xsd:attribute ref="since"/>
+ <xsd:attribute ref="deprecated"/>
+ <xsd:attribute ref="stability"/>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="functions">
+ <xsd:annotation>
+ <xsd:documentation>
+ The functions tag encloses all api symbols of the reference manual. Each
+ sub unit is represented by a keyword tag.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="keyword" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="book">
+ <xsd:annotation>
+ <xsd:documentation>
+ Toplevel element of a devhelp book. A devhelp book list the structure of
+ a developer manual together with development related metadata.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="chapters" minOccurs="1" maxOccurs="1"/>
+ <xsd:element ref="functions" minOccurs="1" maxOccurs="1"/>
+ </xsd:sequence>
+ <xsd:attribute ref="title" use="required"/>
+ <xsd:attribute ref="link" use="required"/>
+ <xsd:attribute ref="author" use="required"/>
+ <xsd:attribute ref="name" use="required"/>
+ <xsd:attribute ref="version" use="required"/>
+ <xsd:attribute ref="language" />
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
+
<?xml version='1.0'?> <!--*- mode: xml -*-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version='1.0'
- xmlns="http://www.devhelp.net/book"
+ xmlns=""
xmlns:str="http://exslt.org/strings"
exclude-result-prefixes="str">
<xsl:with-param name="method" select="'xml'"/>
<xsl:with-param name="indent" select="'yes'"/>
<xsl:with-param name="encoding" select="'utf-8'"/>
+ <xsl:with-param name="doctype-public"/>
<xsl:with-param name="content">
<xsl:call-template name="devhelp2"/>
</xsl:with-param>
</chapters>
</xsl:if>
<functions>
- <xsl:apply-templates select="$gtkdoc.refsect2"
+ <xsl:apply-templates select="$gtkdoc.refsect2[@role]"
mode="generate.devhelp2.index.mode"/>
<xsl:apply-templates select="$gtkdoc.refsect2/refsect3[@role='enum_members']/informaltable/tgroup/tbody/row[@role='constant']"
mode="generate.devhelp2.index.mode"/>
Summary: GTK+ DocBook Documentation Generator
Name: gtk-doc
-Version: 1.22
+Version: 1.23
Release: 1
License: GPL
Group: Utilities/Text
<hr />
<xsl:choose>
<xsl:when test="$gtkdoc.version">
- Generated by GTK-Doc V<xsl:copy-of select="$gtkdoc.version" />
+ <xsl:text>Generated by GTK-Doc V</xsl:text><xsl:copy-of select="$gtkdoc.version" />
</xsl:when>
<xsl:otherwise>
- Generated by GTK-Doc
+ <xsl:text>Generated by GTK-Doc</xsl:text>
</xsl:otherwise>
</xsl:choose>
</div>
}
}
$md_block->{"text"} .= "\n" . $line;
+ @TRACE@("add to markup");
next OUTER;
}
}
# markup, including <?xml version="1.0"?>
my $tag = $1;
my $is_self_closing = defined($2);
- # FIXME: why do we need to skip https? here, if we generalize this to all
- # uri schemes we get parsing errors
- if (! $MD_TEXT_LEVEL_ELEMENTS{$tag} && $tag !~ /^https?/ && !defined($md_block->{"start"})) {
- push @md_blocks, $md_block;
-
- if ($is_self_closing) {
- @TRACE@("self-closing docbook '$tag'");
- $md_block = { type => "self-closing tag",
- text => $deindented_line };
- $is_self_closing = 0;
- next OUTER;
- }
-
- @TRACE@("new markup '$tag'");
- $md_block = { type => "markup",
- text => $deindented_line,
- start => "<" . $tag . ">",
- end => "</" . $tag . ">",
- closed => 0,
- depth => 0 };
- if ($deindented_line =~ /<\/$tag>/) {
- $md_block->{"closed"} = 1;
- }
- next OUTER;
+
+ # skip link markdown
+ # TODO(ensonic): consider adding more uri schemes (ftp, ...)
+ if ($tag =~ /^https?/) {
+ @TRACE@("skipping link '$tag'");
} else {
- @TRACE@("text level docbook '$tag'");
- if (!defined($md_block->{"start"}) && $MD_TEXT_LEVEL_ELEMENTS{$tag}) {
- $md_block->{"start"} = "<" . $tag . ">";
- $md_block->{"end"} = "</" . $tag . ">";
- $md_block->{"closed"} = 0;
- @TRACE@("scanning for end of '$tag'");
- }
- if (defined($md_block->{"start"}) && $deindented_line =~ /$md_block->{"end"}/) {
- $md_block->{"closed"} = 1;
- @TRACE@("found end of '$tag'");
+ # for TEXT_LEVEL_ELEMENTS, we want to keep them as-is in the paragraph
+ # instead of creation a markdown block.
+ my $scanning_for_end_of_text_level_tag = (
+ $md_block->{"type"} eq "paragraph" &&
+ defined($md_block->{"start"}) &&
+ !$md_block->{"closed"});
+ @TRACE@("markup found '$tag', scanning $scanning_for_end_of_text_level_tag ?");
+ if (!$MD_TEXT_LEVEL_ELEMENTS{$tag} && !$scanning_for_end_of_text_level_tag) {
+ push @md_blocks, $md_block;
+
+ if ($is_self_closing) {
+ @TRACE@("self-closing docbook '$tag'");
+ $md_block = { type => "self-closing tag",
+ text => $deindented_line };
+ $is_self_closing = 0;
+ next OUTER;
+ }
+
+ @TRACE@("new markup '$tag'");
+ $md_block = { type => "markup",
+ text => $deindented_line,
+ start => "<" . $tag . ">",
+ end => "</" . $tag . ">",
+ closed => 0,
+ depth => 0 };
+ if ($deindented_line =~ /<\/$tag>/) {
+ $md_block->{"closed"} = 1;
+ }
+ next OUTER;
+ } else {
+ if ($MD_TEXT_LEVEL_ELEMENTS{$tag}) {
+ @TRACE@("text level docbook '$tag' in '".$md_block->{"type"}."' state");
+ # TODO(ensonic): handle nesting
+ if (!$scanning_for_end_of_text_level_tag) {
+ if ($deindented_line !~ /<\/$tag>/) {
+ @TRACE@("new text level markup '$tag'");
+ $md_block->{"start"} = "<" . $tag . ">";
+ $md_block->{"end"} = "</" . $tag . ">";
+ $md_block->{"closed"} = 0;
+ @TRACE@("scanning for end of '$tag'");
+ }
+ } else {
+ if ($deindented_line =~ /$md_block->{"end"}/) {
+ $md_block->{"closed"} = 1;
+ @TRACE@("found end of '$tag'");
+ }
+ }
+ }
}
}
} elsif ($line =~ /^([ ]*)[*+-][ ](.*)/) {
}
# list item
-
if ($line =~ /^([ ]{0,4})\d+[.][ ]+(.*)/) {
push @md_blocks, $md_block;
my $lines = $2;
$md_block = { type => "paragraph",
interrupted => 0,
text => $line };
+ @TRACE@("new paragraph due to interrupted");
} else {
$md_block->{"text"} .= "\n" . $line;
+ @TRACE@("add to paragraph");
}
} else {
push @md_blocks, $md_block;
$md_block = { type => "paragraph",
text => $line };
+ @TRACE@("new paragraph due to different block type");
}
}
my $text;
my $title;
+ #$output .= "\n<!-- beg type='" . $block->{"type"} . "'-->\n";
+
if ($block->{"type"} eq "paragraph") {
$text = &MarkDownParseSpanElements ($block->{"text"});
if ($context eq "li" && $output eq "") {
if ($block->{"interrupted"}) {
- $output .= "\n"."<para>".$text."</para>"."\n";
+ $output .= "\n<para>$text</para>\n";
} else {
- $output .= "<para>".$text."</para>";
+ $output .= "<para>$text</para>";
if ($#blocks > 0) {
$output .= "\n";
}
}
} else {
- $output .= "<para>".$text."</para>"."\n";
+ $output .= "<para>$text</para>\n";
}
} elsif ($block->{"type"} eq "heading") {
$text = &MarkDownParseLines ($block->{"lines"}, $symbol, "heading");
if (defined ($block->{"id"})) {
- $output .= "<" . $tag . " id=\"" . $block->{"id"} . "\">";
+ $output .= "<$tag id=\"" . $block->{"id"} . "\">";
} else {
- $output .= "<" . $tag . ">";
+ $output .= "<$tag>";
}
- $output .= "<title>" . $title . "</title>" . $text . "</" . $tag . ">\n";
+ $output .= "<title>$title</title>$text</$tag>\n";
} elsif ($block->{"type"} eq "li") {
my $tag = "itemizedlist";
if ($block->{"ordered"}) {
$tag = "orderedlist";
}
- $output .= "<".$tag.">\n";
+ $output .= "<$tag>\n";
}
if ($block->{"interrupted"}) {
if ($block->{"ordered"}) {
$tag = "orderedlist";
}
- $output .= "</".$tag.">\n";
+ $output .= "</$tag>\n";
}
} elsif ($block->{"type"} eq "quote") {
$text = &MarkDownParseLines ($block->{"lines"}, $symbol, "quote");
- $output .= "<blockquote>\n" . $text . "</blockquote>\n";
+ $output .= "<blockquote>\n$text</blockquote>\n";
} elsif ($block->{"type"} eq "code") {
if ($block->{"language"}) {
$output .= "<informalexample><programlisting language=\"" . $block->{"language"} . "\"><![CDATA[\n";
} else {
$output .= $block->{"text"}."\n";
}
+ #$output .= "\n<!-- end type='" . $block->{"type"} . "'-->\n";
}
return $output;
--stringparam gtkdoc.version "@VERSION@" \
--stringparam chunk.quietly $quiet \
--stringparam chunker.output.quiet $quiet \
- manpages/docbook.xsl $document || exit $?
+ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+ $document || exit $?
else
for i in `cd sgml;ls *.sgml`; do
j=`echo $i | sed 's/.sgml/.man/'`
<book id="index">
<bookinfo>
<title>GTK-Doc Manual</title>
- <edition>1.20</edition>
+ <edition>1.23</edition>
<abstract role="description"><para>User manual for developers with instructions of GTK-Doc usage.</para></abstract>
<authorgroup>
<author>
</legalnotice>
<revhistory>
+ <revision>
+ <revnumber>1.23</revnumber>
+ <date>17 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fix</revremark>
+ </revision>
<revision>
<revnumber>1.22</revnumber>
<date>07 May 2015</date>
<revhistory>
<revision>
- <revnumber>1.21.1</revnumber>
- <date>18 Jul 2014</date>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
<authorinitials>ss</authorinitials>
<revremark>development version</revremark>
</revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision>
<revnumber>1.21</revnumber>
<date>17 Jul 2014</date>
<revhistory>
<revision>
- <revnumber>1.21.1</revnumber>
- <date>18 Jul 2014</date>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
<authorinitials>ss</authorinitials>
<revremark>development version</revremark>
</revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision>
<revnumber>1.21</revnumber>
<date>17 Jul 2014</date>
</legalnotice>
<revhistory>
- <revision><revnumber>1.21.1</revnumber> <date>18 Ιουλ 2014</date> <authorinitials>ss</authorinitials> <revremark>έκδοση ανάπτυξης</revremark></revision>
+ <revision>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>development version</revremark>
+ </revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision><revnumber>1.21</revnumber> <date>17 Ιουλ 2013</date> <authorinitials>ss</authorinitials> <revremark>διορθώσεις σφαλμάτων, απόρριψη παρωχημένων λειτουργιών</revremark></revision>
<revision><revnumber>1.20</revnumber> <date>16 Φεβ 2014</date> <authorinitials>ss</authorinitials> <revremark>διορθώσεις σφαλμάτων, υποστήριξη markdown, και βελτιώσεις στυλ</revremark></revision>
<revision><revnumber>1.19</revnumber> <date>05 Ιουν 2013</date> <authorinitials>ss</authorinitials> <revremark>διόρθωση σφαλμάτων</revremark></revision>
<revhistory>
<revision>
- <revnumber>1.21.1</revnumber>
- <date>18 Jul 2014</date>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
<authorinitials>ss</authorinitials>
<revremark>development version</revremark>
</revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision>
<revnumber>1.21</revnumber>
<date>17 Jul 2014</date>
</legalnotice>
<revhistory>
- <revision><revnumber>1.21.1</revnumber> <date>18 de julio de 2014</date> <authorinitials>ss</authorinitials> <revremark>versión de desarrollo</revremark></revision>
+ <revision>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>development version</revremark>
+ </revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision><revnumber>1.21</revnumber> <date>17 de julio de 2014</date> <authorinitials>ss</authorinitials> <revremark>correcciones de errores, eliminadas funcionalidades obsoletas</revremark></revision>
<revision><revnumber>1.20</revnumber> <date>16 de febrero de 2014</date> <authorinitials>ss</authorinitials> <revremark>errores corregidos, soporte de marcado, mejoras en los estilos</revremark></revision>
<revision><revnumber>1.19</revnumber> <date>05 de junio de 2013</date> <authorinitials>ss</authorinitials> <revremark>correcciones de errores</revremark></revision>
<revhistory>
<revision>
- <revnumber>1.21.1</revnumber>
- <date>18 Jul 2014</date>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
<authorinitials>ss</authorinitials>
<revremark>development version</revremark>
</revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision>
<revnumber>1.21</revnumber>
<date>17 Jul 2014</date>
</legalnotice>
<revhistory>
- <revision><revnumber>1.21.1</revnumber> <date>18 de Xullo de 2014</date> <authorinitials>ss</authorinitials> <revremark>versión de desenvolvemento</revremark></revision>
+ <revision>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>development version</revremark>
+ </revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision><revnumber>1.21</revnumber> <date>17 de Xullo de 2014</date> <authorinitials>ss</authorinitials> <revremark>arranxos de erros, retirado de características obsoletas</revremark></revision>
<revision><revnumber>1.20</revnumber> <date>16 de Febreiro de 2014</date> <authorinitials>ss</authorinitials> <revremark>arranxos de erros, compatibilidade de markdown, melloras de estilo</revremark></revision>
<revision><revnumber>1.19</revnumber> <date>05 de Xuño de 2013</date> <authorinitials>ss</authorinitials> <revremark>arranxos de erros</revremark></revision>
<revhistory>
<revision>
- <revnumber>1.21.1</revnumber>
- <date>18 Jul 2014</date>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
<authorinitials>ss</authorinitials>
<revremark>development version</revremark>
</revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision>
<revnumber>1.21</revnumber>
<date>17 Jul 2014</date>
</legalnotice>
<revhistory>
- <revision><revnumber>1.21.1</revnumber> <date>18 Jul 2014</date> <authorinitials>ss</authorinitials> <revremark>versão de desenvolvimento</revremark></revision>
+ <revision>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>development version</revremark>
+ </revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision><revnumber>1.21</revnumber> <date>17 Jul 2014</date> <authorinitials>ss</authorinitials> <revremark>correção de erros, desativadas funcionalidades obsoletas</revremark></revision>
<revision><revnumber>1.20</revnumber> <date>14 Fev 2014</date> <authorinitials>ss</authorinitials> <revremark>correção de erros, suporte a markdown, melhorias no estilo</revremark></revision>
<revision><revnumber>1.19</revnumber> <date>05 Jun 2013</date> <authorinitials>ss</authorinitials> <revremark>correção de erros</revremark></revision>
<revhistory>
<revision>
- <revnumber>1.21.1</revnumber>
- <date>18 Jul 2014</date>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
<authorinitials>ss</authorinitials>
<revremark>development version</revremark>
</revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision>
<revnumber>1.21</revnumber>
<date>17 Jul 2014</date>
<revhistory>
<revision>
- <revnumber>1.21.1</revnumber>
- <date>18 Jul 2014</date>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
<authorinitials>ss</authorinitials>
<revremark>development version</revremark>
</revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision>
<revnumber>1.21</revnumber>
<date>17 Jul 2014</date>
<revhistory>
<revision>
- <revnumber>1.21.1</revnumber>
- <date>18 Jul 2014</date>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
<authorinitials>ss</authorinitials>
<revremark>development version</revremark>
</revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision>
<revnumber>1.21</revnumber>
<date>17 Jul 2014</date>
<revhistory>
<revision>
- <revnumber>1.21.1</revnumber>
- <date>18 Jul 2014</date>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
<authorinitials>ss</authorinitials>
<revremark>development version</revremark>
</revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision>
<revnumber>1.21</revnumber>
<date>17 Jul 2014</date>
<revhistory>
<revision>
- <revnumber>1.21.1</revnumber>
- <date>18 Jul 2014</date>
+ <revnumber>1.22.1</revnumber>
+ <date>08 May 2015</date>
<authorinitials>ss</authorinitials>
<revremark>development version</revremark>
</revision>
+ <revision>
+ <revnumber>1.22</revnumber>
+ <date>07 May 2015</date>
+ <authorinitials>ss</authorinitials>
+ <revremark>bug fixes, dropping deprecated features</revremark>
+ </revision>
<revision>
<revnumber>1.21</revnumber>
<date>17 Jul 2014</date>
endif
-EXTRA_DIST = gtkdoctest.sh tools.sh \
- gobject.sh bugs.sh annotations.sh fail.sh empty.sh sanity.sh
+EXTRA_DIST = gtkdoctest.sh tools.sh sanity.sh \
+ gobject.sh bugs.sh annotations.sh fail.sh empty.sh
# run any given test by running make <test>.check
%.check: %
@$(TESTS_ENVIRONMENT) \
./$*
+snapshot:
+ @for dir in $(SUBDIRS); do \
+ rm -rf $$dir/docs/html.ref; \
+ if test -d $$dir/docs/html; then \
+ cp -r $$dir/docs/html $$dir/docs/html.ref; \
+ fi; \
+ rm -rf $$dir/docs/xml.ref; \
+ if test -d $$dir/docs/xml; then \
+ cp -r $$dir/docs/xml $$dir/docs/xml.ref; \
+ fi; \
+ done
+
+.PHONY: snapshot
-include $(top_srcdir)/git.mk
@BUILD_TESTS_TRUE@ PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
@BUILD_TESTS_TRUE@ PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
-EXTRA_DIST = gtkdoctest.sh tools.sh \
- gobject.sh bugs.sh annotations.sh fail.sh empty.sh sanity.sh
+EXTRA_DIST = gtkdoctest.sh tools.sh sanity.sh \
+ gobject.sh bugs.sh annotations.sh fail.sh empty.sh
all: all-recursive
@$(TESTS_ENVIRONMENT) \
./$*
+snapshot:
+ @for dir in $(SUBDIRS); do \
+ rm -rf $$dir/docs/html.ref; \
+ if test -d $$dir/docs/html; then \
+ cp -r $$dir/docs/html $$dir/docs/html.ref; \
+ fi; \
+ rm -rf $$dir/docs/xml.ref; \
+ if test -d $$dir/docs/xml; then \
+ cp -r $$dir/docs/xml $$dir/docs/xml.ref; \
+ fi; \
+ done
+
+.PHONY: snapshot
+
-include $(top_srcdir)/git.mk
# Tell versions [3.59,3.63) of GNU make to not export all variables.
bug_624001d
bug_624001e
bug_711598
+bug_749142
deprecation_notice
bug_741941
bug_732689
void
bug_732689 (const gchar *spec)
{
-}
\ No newline at end of file
+}
+
+/**
+ * bug_749142:
+ *
+ * The message's structure contains one field:
+ * <itemizedlist>
+ * <listitem><para>int timeout: the timeout.</para></listitem>
+ * </itemizedlist>
+ *
+ * <refsect3>
+ * <title>Example usage</title>
+ * |[
+ * echo "Hello" | foo
+ * ]|
+ * </refsect3>
+ **/
+void
+bug_749142 (void)
+{
+}
void bug_741941(void *object, void *par) G_GNUC_NONNULL(1) G_GNUC_NONNULL(2);
void bug_732689 (const gchar *spec);
+void bug_749142 (void);
+
/**
* BUG_731417_DEPRECATED:
cd $dir/$suite/docs && \
env BUILDDIR=$BUILDDIR/$suite/docs SRCDIR=$SRCDIR/$suite/docs gtkdoc-check
-
-# xmllint --noout --nonet --schema ../devhelp2.xsd ./bugs/docs/html/tester.devhelp2
-#
if test $nok -gt 0 ; then failed=`expr $failed + 1`; fi
tested=`expr $tested + 1`
+# check validity of devhelp2 files
+nok=0
+for file in $dir/*/docs*/html/*.devhelp2; do
+ xmllint --noout --nonet --schema $ABS_TOP_SRCDIR/devhelp2.xsd $file
+ if test $? != 0 ; then
+ echo 1>&2 "devhelp2 xml validity check failed for $file"
+ nok=`expr $nok + 1`;
+ fi
+done
+if test $nok -gt 0 ; then failed=`expr $failed + 1`; fi
+tested=`expr $tested + 1`
+
+
+# check stability of generated xml/html
+nok=0
+for path in $dir/*/docs*; do
+ if test -d $path/xml.ref; then
+ diff -u $path/xml.ref $path/xml
+ if test $? = 1 ; then
+ echo 1>&2 "difference in generated xml for $path"
+ nok=`expr $nok + 1`;
+ fi
+ fi
+ if test -d $path/html.ref; then
+ diff -u $path/html.ref $path/html
+ if test $? = 1 ; then
+ echo 1>&2 "difference in generated html for $path"
+ nok=`expr $nok + 1`;
+ fi
+ fi
+done
+if test $nok -gt 0 ; then failed=`expr $failed + 1`; fi
+tested=`expr $tested + 1`
+
# summary
successes=`expr $tested - $failed`
tested=`expr $tested + 1`
done
+
+# test python scripts
+/usr/bin/python -m py_compile `which gtkdoc-depscan`
+if test $? != 0 ; then failed=`expr $failed + 1`; fi
+tested=`expr $tested + 1`
+
+
# summary
successes=`expr $tested - $failed`
tested=`expr $tested + 1`
done
+
+# test python scripts
+@PYTHON@ -m py_compile `which gtkdoc-depscan`
+if test $? != 0 ; then failed=`expr $failed + 1`; fi
+tested=`expr $tested + 1`
+
+
# summary
successes=`expr $tested - $failed`
projects / platform / upstream / gtk-doc.git / commitdiff