Changeset 42123 in webkit


Ignore:
Timestamp:
Mar 30, 2009 7:41:46 PM (15 years ago)
Author:
kov@webkit.org
Message:

2009-03-30 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Holger Freyther.

Integrate gtk-doc into the Gtk+ buildsystem.

Based on original work by Holger Freyther.

Integrate gtk-doc into our buildsystem. We are forced to
use recursive make for gtk-doc itself as the to be installed
gtk-doc.make (done by gtkdocize) is not working in a non
recursive environment.

The documentation can only be generated when srcdir == builddir.
In all other cases the generated files will not be found. This
limitation can be found in pango and gtk+ as well. There is no
easy way around. The resulting html documentation will be saved
in the srcdir as well.

  • docs/GNUmakefile.am: Added.
  • docs/version.xml.in: Added.
  • docs/webkitgtk-docs.sgml:
Location:
trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r42111 r42123  
     12009-03-30  Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
     2
     3        Reviewed by Holger Freyther.
     4
     5        Integrate gtk-doc into the Gtk+ buildsystem.
     6
     7        * autogen.sh:
     8        * configure.ac:
     9
    1102009-03-30  Xan Lopez  <xlopez@igalia.com>
    211

  • trunk/WebKit/gtk/ChangeLog

    r42113 r42123  
     12009-03-30  Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
     2
     3        Reviewed by Holger Freyther.
     4
     5        Integrate gtk-doc into the Gtk+ buildsystem.
     6
     7        Based on original work by Holger Freyther.
     8
     9        Integrate gtk-doc into our buildsystem. We are forced to
     10        use recursive make for gtk-doc itself as the to be installed
     11        gtk-doc.make (done by gtkdocize) is not working in a non
     12        recursive environment.
     13
     14        The documentation can only be generated when srcdir == builddir.
     15        In all other cases the generated files will not be found. This
     16        limitation can be found in pango and gtk+ as well. There is no
     17        easy way around. The resulting html documentation will be saved
     18        in the srcdir as well.
     19
     20        * docs/GNUmakefile.am: Added.
     21        * docs/version.xml.in: Added.
     22        * docs/webkitgtk-docs.sgml:
     23
    1242009-03-30  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
    225

  • trunk/WebKit/gtk/docs/webkitgtk-docs.sgml

    r38834 r42123  
    11<?xml version="1.0"?>
    22<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
    3                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
     3               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
     4<!ENTITY version SYSTEM "version.xml">
     5]>
    46<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
    57  <bookinfo>
    6     <title>webkitgtk Reference Manual</title>
    7     <releaseinfo>
    8       for webkitgtk [VERSION]
    9       The latest version of this documentation can be found on-line at
    10       <ulink role="online-location" url="http://[SERVER]/webkitgtk/index.html">http://[SERVER]/webkitgtk/</ulink>.
    11     </releaseinfo>
     8    <title>WebKit/Gtk+ Reference Manual</title>
     9    <releaseinfo>for WebKit/Gtk+ &version;</releaseinfo>
    1210  </bookinfo>
    1311

  • trunk/autogen.sh

    r40450 r42123  
    1414
    1515DIE=0
     16
     17(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
     18    echo
     19    echo "You must have gtkdocize installed to compile $PROJECT."
     20    echo "Install the appropriate package for your distribution,"
     21    echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
     22    DIE=1
     23}
    1624
    1725(autoconf --version) < /dev/null > /dev/null 2>&1 || {
    … …  
    5159touch README INSTALL
    5260
     61gtkdocize || exit $?
    5362aclocal $ACLOCAL_FLAGS || exit $?
    5463$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $?

  • trunk/configure.ac

    r42111 r42123  
    599599fi
    600600
     601GTK_DOC_CHECK([1.10])
     602
    601603# OS conditionals
    602604AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
    … …  
    650652WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in
    651653WebKit/gtk/webkit/webkitversion.h
     654WebKit/gtk/docs/GNUmakefile
     655WebKit/gtk/docs/version.xml
    652656]
    653657)
Note: See TracChangeset for help on using the changeset viewer.