From: DongHun Kwak Date: Fri, 29 Sep 2017 02:04:52 +0000 (+0900) Subject: Imported Upstream version 1.23 X-Git-Tag: upstream/1.23 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1cfff551b756159dfc22f39329428511061ddcf9;p=platform%2Fupstream%2Fgtk-doc.git Imported Upstream version 1.23 Change-Id: I8551c9d89d62c57e6a2d9c4414a7852ca032b1ca Signed-off-by: DongHun Kwak --- diff --git a/Makefile.am b/Makefile.am index a236d18..de22c19 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,7 @@ gtkdocdata_DATA = \ gtk-doc.dcl \ gtk-doc.xsl \ version-greater-or-equal.xsl \ + devhelp2.xsd \ devhelp2.xsl \ gtk-doc.make \ gtk-doc.notmpl.make \ @@ -84,7 +85,8 @@ EXTRA_DIST = \ CLEANFILES = \ gtk-doc.flat.make \ - gtk-doc.notmpl-flat.make + gtk-doc.notmpl-flat.make \ + gtkdoc-depscanc MAINTAINERCLEANFILES = \ build-aux \ diff --git a/Makefile.in b/Makefile.in index 81ef200..a4d0bf4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -413,6 +413,7 @@ gtkdocdata_DATA = \ gtk-doc.dcl \ gtk-doc.xsl \ version-greater-or-equal.xsl \ + devhelp2.xsd \ devhelp2.xsl \ gtk-doc.make \ gtk-doc.notmpl.make \ @@ -460,7 +461,8 @@ EXTRA_DIST = \ CLEANFILES = \ gtk-doc.flat.make \ - gtk-doc.notmpl-flat.make + gtk-doc.notmpl-flat.make \ + gtkdoc-depscanc MAINTAINERCLEANFILES = \ build-aux \ diff --git a/NEWS b/NEWS index 406cb49..16fff84 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,17 @@ -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 diff --git a/configure b/configure index c24739e..15cec04 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /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 . # @@ -591,8 +591,8 @@ MAKEFLAGS= # 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='' @@ -1371,7 +1371,7 @@ if test "$ac_init_help" = "long"; then # 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]... @@ -1441,7 +1441,7 @@ fi 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 @@ -1567,7 +1567,7 @@ fi 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. @@ -1845,7 +1845,7 @@ cat >config.log <<_ACEOF 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 $@ @@ -2712,7 +2712,7 @@ fi # Define the identity of the package. PACKAGE='gtk-doc' - VERSION='1.22' + VERSION='1.23' cat >>confdefs.h <<_ACEOF @@ -13745,7 +13745,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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 @@ -13802,7 +13802,7 @@ _ACEOF 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\\" diff --git a/configure.ac b/configure.ac index ccbc1d0..5620d52 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl Use a simple 2-digit version number for a while, since our old example 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]) diff --git a/devhelp2.xsd b/devhelp2.xsd new file mode 100644 index 0000000..f436087 --- /dev/null +++ b/devhelp2.xsd @@ -0,0 +1,207 @@ + + + + + + + Devhelp2 files are use in the 'devhelp' documentation browser. + + + + + + + Known keyword types. + + + + + + + + + + + + + + + + + + + + Known programing languages. + + + + + + + + + + + + + + + + + + Title of the reference manual. + + + + + + + Entry point to the manual. Can be given as a relative path to the + location of the devhelp2 file.. + + + + + + + Author of the document. Multiple authors are separated by ','. + + + + + + + Short name of the manual. + + + + + + + Version of the devhelp xml specification (2). + + + + + + + Programing language this manual refers to. + + + + + + + + Type of the keyword. + + + + + + + Version since that the keyword is part of the API. + + + + + + + Marks the keyword as deprecated. + + + + + + + Document the stability status. + + + + + + + + + Sub tags for the hierachy of the chapters and parts. + + + + + + + + + + + + + + + The chapters tag encloses the structure of the reference manual. Each + sub unit is represented by a sub tag. + + + + + + + + + + + + + The keyword tag points to the documentation of a api symbol. + + + + + + + + + + + + + + + + The functions tag encloses all api symbols of the reference manual. Each + sub unit is represented by a keyword tag. + + + + + + + + + + + + + Toplevel element of a devhelp book. A devhelp book list the structure of + a developer manual together with development related metadata. + + + + + + + + + + + + + + + + + diff --git a/devhelp2.xsl b/devhelp2.xsl index b441df7..7854894 100644 --- a/devhelp2.xsl +++ b/devhelp2.xsl @@ -1,7 +1,7 @@ @@ -21,6 +21,7 @@ + @@ -55,7 +56,7 @@ - diff --git a/gtk-doc.spec b/gtk-doc.spec index 8f15bd8..70ccb43 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -2,7 +2,7 @@ Summary: GTK+ DocBook Documentation Generator Name: gtk-doc -Version: 1.22 +Version: 1.23 Release: 1 License: GPL Group: Utilities/Text diff --git a/gtk-doc.xsl b/gtk-doc.xsl index 992fd9d..f0b6f9d 100644 --- a/gtk-doc.xsl +++ b/gtk-doc.xsl @@ -416,10 +416,10 @@ Get a newer version at http://docbook.sourceforge.net/projects/xsl/
- Generated by GTK-Doc V + Generated by GTK-Doc V - Generated by GTK-Doc + Generated by GTK-Doc diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in index 6e11e56..dc1ba67 100755 --- a/gtkdoc-mkdb.in +++ b/gtkdoc-mkdb.in @@ -4811,6 +4811,7 @@ sub MarkDownParseBlocks { } } $md_block->{"text"} .= "\n" . $line; + @TRACE@("add to markup"); next OUTER; } } @@ -5005,41 +5006,60 @@ sub MarkDownParseBlocks { # markup, including 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 => "", - 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"} = ""; - $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 => "", + 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"} = ""; + $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 =~ /^([ ]*)[*+-][ ](.*)/) { @@ -5064,7 +5084,6 @@ sub MarkDownParseBlocks { } # list item - if ($line =~ /^([ ]{0,4})\d+[.][ ]+(.*)/) { push @md_blocks, $md_block; my $lines = $2; @@ -5089,13 +5108,16 @@ sub MarkDownParseBlocks { $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"); } } @@ -5368,19 +5390,21 @@ sub MarkDownOutputDocBook { my $text; my $title; + #$output .= "\n\n"; + if ($block->{"type"} eq "paragraph") { $text = &MarkDownParseSpanElements ($block->{"text"}); if ($context eq "li" && $output eq "") { if ($block->{"interrupted"}) { - $output .= "\n"."".$text.""."\n"; + $output .= "\n$text\n"; } else { - $output .= "".$text.""; + $output .= "$text"; if ($#blocks > 0) { $output .= "\n"; } } } else { - $output .= "".$text.""."\n"; + $output .= "$text\n"; } } elsif ($block->{"type"} eq "heading") { @@ -5396,12 +5420,12 @@ sub MarkDownOutputDocBook { $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 . "" . $text . "\n"; + $output .= "$title$text\n"; } elsif ($block->{"type"} eq "li") { my $tag = "itemizedlist"; @@ -5409,7 +5433,7 @@ sub MarkDownOutputDocBook { if ($block->{"ordered"}) { $tag = "orderedlist"; } - $output .= "<".$tag.">\n"; + $output .= "<$tag>\n"; } if ($block->{"interrupted"}) { @@ -5422,11 +5446,11 @@ sub MarkDownOutputDocBook { if ($block->{"ordered"}) { $tag = "orderedlist"; } - $output .= "\n"; + $output .= "\n"; } } elsif ($block->{"type"} eq "quote") { $text = &MarkDownParseLines ($block->{"lines"}, $symbol, "quote"); - $output .= "
\n" . $text . "
\n"; + $output .= "
\n$text
\n"; } elsif ($block->{"type"} eq "code") { if ($block->{"language"}) { $output .= "{"language"} . "\">{"text"}."\n"; } + #$output .= "\n\n"; } return $output; diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in index 15be1b3..b6e91a5 100644 --- a/gtkdoc-mkman.in +++ b/gtkdoc-mkman.in @@ -83,7 +83,8 @@ if $is_xml; then --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/'` diff --git a/help/manual/C/index.docbook b/help/manual/C/index.docbook index 860e561..6ae5449 100644 --- a/help/manual/C/index.docbook +++ b/help/manual/C/index.docbook @@ -10,7 +10,7 @@ GTK-Doc Manual - 1.20 + 1.23 User manual for developers with instructions of GTK-Doc usage. @@ -80,6 +80,12 @@ + + 1.23 + 17 May 2015 + ss + bug fix + 1.22 07 May 2015 diff --git a/help/manual/bn_IN/index.docbook b/help/manual/bn_IN/index.docbook index a208296..4543cc1 100644 --- a/help/manual/bn_IN/index.docbook +++ b/help/manual/bn_IN/index.docbook @@ -81,11 +81,17 @@ - 1.21.1 - 18 Jul 2014 + 1.22.1 + 08 May 2015 ss development version + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 diff --git a/help/manual/de/index.docbook b/help/manual/de/index.docbook index 51d9277..b6d5b38 100644 --- a/help/manual/de/index.docbook +++ b/help/manual/de/index.docbook @@ -46,11 +46,17 @@ - 1.21.1 - 18 Jul 2014 + 1.22.1 + 08 May 2015 ss development version + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 diff --git a/help/manual/el/index.docbook b/help/manual/el/index.docbook index c34cbf9..df66205 100644 --- a/help/manual/el/index.docbook +++ b/help/manual/el/index.docbook @@ -34,7 +34,18 @@ - 1.21.1 18 Ιουλ 2014 ss έκδοση ανάπτυξης + + 1.22.1 + 08 May 2015 + ss + development version + + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Ιουλ 2013 ss διορθώσεις σφαλμάτων, απόρριψη παρωχημένων λειτουργιών 1.20 16 Φεβ 2014 ss διορθώσεις σφαλμάτων, υποστήριξη markdown, και βελτιώσεις στυλ 1.19 05 Ιουν 2013 ss διόρθωση σφαλμάτων diff --git a/help/manual/en_GB/index.docbook b/help/manual/en_GB/index.docbook index c8a1f17..3ccaa7a 100644 --- a/help/manual/en_GB/index.docbook +++ b/help/manual/en_GB/index.docbook @@ -68,11 +68,17 @@ - 1.21.1 - 18 Jul 2014 + 1.22.1 + 08 May 2015 ss development version + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 diff --git a/help/manual/es/index.docbook b/help/manual/es/index.docbook index 9fe9683..e6238d2 100644 --- a/help/manual/es/index.docbook +++ b/help/manual/es/index.docbook @@ -34,7 +34,18 @@ - 1.21.1 18 de julio de 2014 ss versión de desarrollo + + 1.22.1 + 08 May 2015 + ss + development version + + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 de julio de 2014 ss correcciones de errores, eliminadas funcionalidades obsoletas 1.20 16 de febrero de 2014 ss errores corregidos, soporte de marcado, mejoras en los estilos 1.19 05 de junio de 2013 ss correcciones de errores diff --git a/help/manual/fr/index.docbook b/help/manual/fr/index.docbook index 572d9d5..0038444 100644 --- a/help/manual/fr/index.docbook +++ b/help/manual/fr/index.docbook @@ -46,11 +46,17 @@ - 1.21.1 - 18 Jul 2014 + 1.22.1 + 08 May 2015 ss development version + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 diff --git a/help/manual/gl/index.docbook b/help/manual/gl/index.docbook index 0da3357..07854ee 100644 --- a/help/manual/gl/index.docbook +++ b/help/manual/gl/index.docbook @@ -40,7 +40,18 @@ - 1.21.1 18 de Xullo de 2014 ss versión de desenvolvemento + + 1.22.1 + 08 May 2015 + ss + development version + + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 de Xullo de 2014 ss arranxos de erros, retirado de características obsoletas 1.20 16 de Febreiro de 2014 ss arranxos de erros, compatibilidade de markdown, melloras de estilo 1.19 05 de Xuño de 2013 ss arranxos de erros diff --git a/help/manual/gu/index.docbook b/help/manual/gu/index.docbook index 0893cb1..d4f0e18 100644 --- a/help/manual/gu/index.docbook +++ b/help/manual/gu/index.docbook @@ -68,11 +68,17 @@ - 1.21.1 - 18 Jul 2014 + 1.22.1 + 08 May 2015 ss development version + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 diff --git a/help/manual/pt_BR/index.docbook b/help/manual/pt_BR/index.docbook index 09b4eec..1180798 100644 --- a/help/manual/pt_BR/index.docbook +++ b/help/manual/pt_BR/index.docbook @@ -34,7 +34,18 @@ - 1.21.1 18 Jul 2014 ss versão de desenvolvimento + + 1.22.1 + 08 May 2015 + ss + development version + + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 ss correção de erros, desativadas funcionalidades obsoletas 1.20 14 Fev 2014 ss correção de erros, suporte a markdown, melhorias no estilo 1.19 05 Jun 2013 ss correção de erros diff --git a/help/manual/sl/index.docbook b/help/manual/sl/index.docbook index 3726f76..753ff77 100644 --- a/help/manual/sl/index.docbook +++ b/help/manual/sl/index.docbook @@ -81,11 +81,17 @@ - 1.21.1 - 18 Jul 2014 + 1.22.1 + 08 May 2015 ss development version + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 diff --git a/help/manual/sv/index.docbook b/help/manual/sv/index.docbook index 02724cf..ff5f51d 100644 --- a/help/manual/sv/index.docbook +++ b/help/manual/sv/index.docbook @@ -68,11 +68,17 @@ - 1.21.1 - 18 Jul 2014 + 1.22.1 + 08 May 2015 ss development version + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 diff --git a/help/manual/ta/index.docbook b/help/manual/ta/index.docbook index ec44daa..0825b09 100644 --- a/help/manual/ta/index.docbook +++ b/help/manual/ta/index.docbook @@ -68,11 +68,17 @@ - 1.21.1 - 18 Jul 2014 + 1.22.1 + 08 May 2015 ss development version + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 diff --git a/help/manual/te/index.docbook b/help/manual/te/index.docbook index 015b8fd..06b2d59 100644 --- a/help/manual/te/index.docbook +++ b/help/manual/te/index.docbook @@ -68,11 +68,17 @@ - 1.21.1 - 18 Jul 2014 + 1.22.1 + 08 May 2015 ss development version + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 diff --git a/help/manual/zh_CN/index.docbook b/help/manual/zh_CN/index.docbook index 36467af..abee31c 100644 --- a/help/manual/zh_CN/index.docbook +++ b/help/manual/zh_CN/index.docbook @@ -46,11 +46,17 @@ - 1.21.1 - 18 Jul 2014 + 1.22.1 + 08 May 2015 ss development version + + 1.22 + 07 May 2015 + ss + bug fixes, dropping deprecated features + 1.21 17 Jul 2014 diff --git a/tests/Makefile.am b/tests/Makefile.am index 2fb48ae..dc7cacd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,13 +15,26 @@ TESTS_ENVIRONMENT = \ 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 .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 diff --git a/tests/Makefile.in b/tests/Makefile.in index 1bbbc96..845d40c 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -535,8 +535,8 @@ SUBDIRS = gobject bugs annotations fail empty . @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 @@ -1067,6 +1067,20 @@ uninstall-am: @$(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. diff --git a/tests/bugs/docs/tester-sections.txt b/tests/bugs/docs/tester-sections.txt index 64f62d1..1d179fb 100644 --- a/tests/bugs/docs/tester-sections.txt +++ b/tests/bugs/docs/tester-sections.txt @@ -64,6 +64,7 @@ bug_624001c bug_624001d bug_624001e bug_711598 +bug_749142 deprecation_notice bug_741941 bug_732689 diff --git a/tests/bugs/src/tester.c b/tests/bugs/src/tester.c index 817b6fc..94235bd 100644 --- a/tests/bugs/src/tester.c +++ b/tests/bugs/src/tester.c @@ -448,4 +448,24 @@ void bug_741941(void *object, void *par) void bug_732689 (const gchar *spec) { -} \ No newline at end of file +} + +/** + * bug_749142: + * + * The message's structure contains one field: + * + * int timeout: the timeout. + * + * + * + * Example usage + * |[ + * echo "Hello" | foo + * ]| + * + **/ +void +bug_749142 (void) +{ +} diff --git a/tests/bugs/src/tester.h b/tests/bugs/src/tester.h index 2b680ae..ecbda08 100644 --- a/tests/bugs/src/tester.h +++ b/tests/bugs/src/tester.h @@ -504,6 +504,8 @@ void deprecation_notice(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: diff --git a/tests/gtkdoctest.sh b/tests/gtkdoctest.sh index 93f3b36..cf52bd9 100755 --- a/tests/gtkdoctest.sh +++ b/tests/gtkdoctest.sh @@ -5,6 +5,3 @@ dir=`dirname $0` 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 -# diff --git a/tests/sanity.sh b/tests/sanity.sh index 6ef67bc..6b03bf9 100755 --- a/tests/sanity.sh +++ b/tests/sanity.sh @@ -77,6 +77,40 @@ done 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` diff --git a/tests/tools.sh b/tests/tools.sh index 01e2d6c..570e308 100755 --- a/tests/tools.sh +++ b/tests/tools.sh @@ -32,6 +32,13 @@ for file in $ABS_TOP_SRCDIR/*.xsl; do 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` diff --git a/tests/tools.sh.in b/tests/tools.sh.in index d331f52..a114a42 100644 --- a/tests/tools.sh.in +++ b/tests/tools.sh.in @@ -32,6 +32,13 @@ for file in $ABS_TOP_SRCDIR/*.xsl; do 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`