This email list is read-only. Emails sent to this list will be discarded
----------------------------------
.gitignore | 1 -
HACKING | 16 ++
doc/Makefile.am | 19 +--
doc/connman-docs.xml | 25 ++-
doc/dbus-introspection.dtd | 32 ----
doc/dbus-introspection.xsl | 436 --------------------------------------------
doc/dbus-manager.xml | 30 ---
doc/service-api.txt | 23 +++
src/element.c | 98 ++++++-----
test/Makefile.am | 6 +-
test/list-elements | 22 ---
test/monitor-elements | 49 -----
test/monitor-networks | 52 ------
test/monitor-state | 57 ------
14 files changed, 111 insertions(+), 755 deletions(-)
New commits:
commit 206a2cad3435d785ddb76980c9af7540c9a3c3d5
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Thu Dec 4 12:04:30 2008 +0100
Remove outdated test scripts
commit fb4cdf2283756b5fe31526420d151d7b740f419a
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Thu Dec 4 11:22:06 2008 +0100
Disable element D-Bus API for now
commit a1e81534eef5bae1b27c2839bc0762feb53d2c22
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Thu Dec 4 11:14:12 2008 +0100
Add doc/xml/ directory to ignore list
commit 8bda03b4654dd6dd4875c70dcdb7e1befe77421a
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Thu Dec 4 11:13:35 2008 +0100
Add API skeleton for service interface
commit 76a376b0671b6e791ee3b5aa859e3f2dabd7bcd1
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Thu Dec 4 11:07:03 2008 +0100
Mention the automake version 1.10 requirement
commit cb90dac4899d26d218e4786f3abd09f37ed55a24
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Thu Dec 4 10:58:44 2008 +0100
Use D-Bus API text based documentation
Diff in this email is a maximum of 400 lines.
diff --git a/.gitignore b/.gitignore
index dd020ea..f4b0834 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,5 +36,4 @@ doc/connman-*.txt
doc/*.sgml
doc/version.xml
doc/xml
-doc/dbus
doc/html
diff --git a/HACKING b/HACKING
index eb1db38..221bfed 100644
--- a/HACKING
+++ b/HACKING
@@ -2,6 +2,22 @@ Hacking on Connection Manager
*****************************
+Build tools requirements
+========================
+
+When building and testing directly from the repository it is important to
+have at least automake version 1.10 or later installed. All modern
+distributions should default to the latest version, but it seems that
+Debian's default is still an earlier version:
+
+ Check version
+ # dpkg -l '*automake*'
+
+ Install new version
+ # apt-get install automake1.10
+ # update-alternatives --config automake
+
+
Working with the source code repository
=======================================
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 752c5cc..4a52ec2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,7 +21,7 @@ IGNORE_HFILES = connman connman.h rtnl.h dbus.h iface.h
HTML_IMAGES =
-content_files = connman-introduction.xml dbus/manager.xml
+content_files = connman-introduction.xml
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/gdbus \
$(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
@@ -33,22 +33,9 @@ MAINTAINERCLEANFILES = Makefile.in \
if ENABLE_GTK_DOC
include $(top_srcdir)/doc/gtk-doc.make
-
-dbus/manager.xml: dbus-manager.xml dbus-introspection.xsl
- $(MKDIR_P) -p $(builddir)/dbus
- echo "<?xml version=\"1.0\"?>" > $@
- echo "<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML
V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\";>" >>
$@
- $(XSLTPROC) dbus-introspection.xsl $< | tail -n +2 >> $@
-
-clean-local:
- rm -rf $(builddir)/dbus
-
else
EXTRA_DIST = $(DOC_MAIN_SGML_FILE) connman-introduction.xml
endif
-EXTRA_DIST += dbus-introspection.dtd dbus-introspection.xsl \
- dbus-manager.xml
-
-EXTRA_DIST += manager-api.txt device-api.txt network-api.txt \
- connection-api.txt agent-api.txt plugin-api.txt
+EXTRA_DIST += manager-api.txt device-api.txt network-api.txt service-api.txt \
+ connection-api.txt agent-api.txt plugin-api.txt
diff --git a/doc/connman-docs.xml b/doc/connman-docs.xml
index 9c5affc..542c4e1 100644
--- a/doc/connman-docs.xml
+++ b/doc/connman-docs.xml
@@ -57,17 +57,6 @@
<xi:include href="connman-introduction.xml" />
</reference>
- <reference id="dbus">
- <title>D-Bus API Reference</title>
- <partintro>
- <para>
- This part presents the D-Bus interface used to access Connection
- Manager.
- </para>
- </partintro>
- <xi:include href="dbus/manager.xml"/>
- </reference>
-
<reference id="manager">
<title>Manager interface</title>
<para>
@@ -89,6 +78,20 @@
</para>
</reference>
+ <reference id="service">
+ <title>Service interface</title>
+ <para>
+<programlisting><xi:include href="service-api.txt" parse="text"
/></programlisting>
+ </para>
+ </reference>
+
+ <reference id="connection">
+ <title>Connection interface</title>
+ <para>
+<programlisting><xi:include href="connection-api.txt" parse="text"
/></programlisting>
+ </para>
+ </reference>
+
<reference id="reference">
<title>Plugin API Reference</title>
<partintro>
diff --git a/doc/dbus-introspection.dtd b/doc/dbus-introspection.dtd
deleted file mode 100644
index 5fe508e..0000000
--- a/doc/dbus-introspection.dtd
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- DTD for D-Bus Introspection Documentation -->
-
-<!ELEMENT doc
(summary?,description?,errors?,permission?,since?,deprecated,seealso?)>
-
-<!ELEMENT summary (#PCDATA|ref)*>
-<!ELEMENT description (#PCDATA|para|example)*>
-<!ELEMENT errors (error)*>
-<!ELEMENT permission (#PCDATA|ref|para)*>
-<!ELEMENT since EMPTY>
-<!ATTLIST since version CDATA #REQUIRED>
-<!ELEMENT deprecated (#PCDATA|ref)>
-<!ATTLIST deprecated version CDATA #REQUIRED>
-<!ATTLIST deprecated instead CDATA #REQUIRED>
-<!ELEMENT seealso (ref+)>
-
-<!ELEMENT error (#PCDATA|para)*>
-<!ATTLIST error name CDATA #REQUIRED>
-<!ELEMENT para (#PCDATA|example|code|list|ref)*>
-<!ELEMENT example (#PCDATA|para|code|ref)*>
-<!ATTLIST language (c|glib|python|shell) #REQUIRED>
-<!ATTLIST title CDATA #IMPLIED>
-<!ELEMENT list (listheader?, item*)>
-<!ATTLIST list type (bullet|number|table) #REQUIRED>
-<!ELEMENT item (term|definition)*>
-<!ELEMENT term (#PCDATA|ref)*>
-<!ELEMENT definition (#PCDATA|para)*>
-
-<!ELEMENT code (#PCDATA)>
-<!ATTLIST code lang CDATA #IMPLIED>
-<!ELEMENT ref CDATA>
-<!ATTLIST ref type (parameter|arg|signal|method|interface) #REQUIRED>
-<!ATTLIST ref to CDATA #REQUIRED>
diff --git a/doc/dbus-introspection.xsl b/doc/dbus-introspection.xsl
deleted file mode 100644
index 679b358..0000000
--- a/doc/dbus-introspection.xsl
+++ /dev/null
@@ -1,436 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
- xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd";
- exclude-result-prefixes="doc">
-<!--
- Convert D-Bus GLib XML into DocBook refentries
- Copyright (C) 2007 William Jon McCann
- License: GPL
--->
-<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-
-<xsl:template match="/">
-
-<xsl:variable name="interface" select="//interface/@name"/>
-<xsl:variable name="basename">
- <xsl:call-template name="interface-basename">
- <xsl:with-param name="str" select="$interface"/>
- </xsl:call-template>
-</xsl:variable>
-
-<refentry><xsl:attribute name="id"><xsl:value-of
select="$basename"/></xsl:attribute>
- <refmeta>
- <refentrytitle role="top_of_page"><xsl:value-of
select="//interface/@name"/></refentrytitle>
- </refmeta>
-
- <refnamediv>
- <refname><xsl:value-of select="//interface/@name"/></refname>
- <refpurpose><xsl:value-of select="$basename"/> interface</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv role="synopsis">
- <title role="synopsis.title">Methods</title>
- <synopsis>
- <xsl:call-template name="methods-synopsis">
- <xsl:with-param name="basename" select="$basename"/>
- </xsl:call-template>
- </synopsis>
- </refsynopsisdiv>
-
- <refsect1 role="signal_proto">
- <title role="signal_proto.title">Signals</title>
- <synopsis>
- <xsl:call-template name="signals-synopsis">
- <xsl:with-param name="basename" select="$basename"/>
- </xsl:call-template>
- </synopsis>
- </refsect1>
-
- <refsect1 role="impl_interfaces">
- <title role="impl_interfaces.title">Implemented Interfaces</title>
- <para>
- <xsl:value-of select="$interface"/> implements
- org.freedesktop.DBus.Introspectable,
- org.freedesktop.DBus.Properties
- </para>
- </refsect1>
-
- <refsect1 role="properties">
- <title role="properties.title">Properties</title>
- <synopsis>
- <xsl:call-template name="properties-synopsis">
- <xsl:with-param name="basename" select="$basename"/>
- </xsl:call-template>
- </synopsis>
- </refsect1>
-
- <refsect1 role="desc">
- <title role="desc.title">Description</title>
- <para>
- <xsl:apply-templates select="//interface/doc:doc"/>
- </para>
- </refsect1>
-
- <refsect1 role="details">
- <title role="details.title">Details</title>
- <xsl:call-template name="method-details">
- <xsl:with-param name="basename" select="$basename"/>
- </xsl:call-template>
- </refsect1>
-
- <refsect1 role="signals">
- <title role="signals.title">Signal Details</title>
- <xsl:call-template name="signal-details">
- <xsl:with-param name="basename" select="$basename"/>
- </xsl:call-template>
- </refsect1>
-
- <refsect1 role="property_details">
- <title role="property_details.title">Property Details</title>
- <xsl:call-template name="property-details">
- <xsl:with-param name="basename" select="$basename"/>
- </xsl:call-template>
- </refsect1>
-
-</refentry>
-</xsl:template>
-
-
-<xsl:template name="property-doc">
- <xsl:apply-templates select="doc:doc/doc:description"/>
-
- <variablelist role="params">
- <xsl:for-each select="arg">
-<varlistentry><term><parameter><xsl:value-of
select="@name"/></parameter>:</term>
-<listitem><simpara><xsl:value-of
select="doc:doc/doc:summary"/></simpara></listitem>
-</varlistentry>
- </xsl:for-each>
- </variablelist>
-
- <xsl:apply-templates select="doc:doc/doc:since"/>
- <xsl:apply-templates select="doc:doc/doc:deprecated"/>
- <xsl:apply-templates select="doc:doc/doc:permission"/>
- <xsl:apply-templates select="doc:doc/doc:seealso"/>
-</xsl:template>
-
-
-<xsl:template name="property-details">
- <xsl:param name="basename"/>
- <xsl:variable name="longest">
- <xsl:call-template name="find-longest">
- <xsl:with-param name="set" select="@name"/>
- </xsl:call-template>
- </xsl:variable>
- <xsl:for-each select="///property">
- <refsect2>
- <title><anchor role="function"><xsl:attribute name="id"><xsl:value-of
select="$basename"/>:<xsl:value-of select="@name"/></xsl:attribute></anchor>The
"<xsl:value-of select="@name"/>" property</title>
-<indexterm><primary><xsl:value-of
select="@name"/></primary><secondary><xsl:value-of
select="$basename"/></secondary></indexterm>
-<programlisting>'<xsl:value-of select="@name"/>'<xsl:call-template
name="pad-spaces"><xsl:with-param name="width" select="2"/></xsl:call-template>
-<xsl:call-template name="property-args"><xsl:with-param name="indent"
select="string-length(@name) + 2"/></xsl:call-template></programlisting>
- </refsect2>
-
- <xsl:call-template name="property-doc"/>
-
- </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="signal-doc">
- <xsl:apply-templates select="doc:doc/doc:description"/>
-
- <variablelist role="params">
- <xsl:for-each select="arg">
-<varlistentry><term><parameter><xsl:value-of
select="@name"/></parameter>:</term>
-<listitem><simpara><xsl:value-of
select="doc:doc/doc:summary"/></simpara></listitem>
-</varlistentry>
- </xsl:for-each>
- </variablelist>
-
- <xsl:apply-templates select="doc:doc/doc:since"/>
- <xsl:apply-templates select="doc:doc/doc:deprecated"/>
- <xsl:apply-templates select="doc:doc/doc:permission"/>
- <xsl:apply-templates select="doc:doc/doc:seealso"/>
-</xsl:template>
-
-<xsl:template name="signal-details">
- <xsl:param name="basename"/>
- <xsl:variable name="longest">
- <xsl:call-template name="find-longest">
- <xsl:with-param name="set" select="@name"/>
- </xsl:call-template>
- </xsl:variable>
- <xsl:for-each select="///signal">
- <refsect2>
- <title><anchor role="function"><xsl:attribute name="id"><xsl:value-of
select="$basename"/>::<xsl:value-of
select="@name"/></xsl:attribute></anchor>The <xsl:value-of select="@name"/>
signal</title>
-<indexterm><primary><xsl:value-of
select="@name"/></primary><secondary><xsl:value-of
select="$basename"/></secondary></indexterm>
-<programlisting><xsl:value-of select="@name"/> (<xsl:call-template
name="signal-args"><xsl:with-param name="indent" select="string-length(@name) +
2"/><xsl:with-param name="prefix"
select="."/></xsl:call-template>)</programlisting>
- </refsect2>
-
- <xsl:call-template name="signal-doc"/>
-
- </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="doc:code">
-<programlisting>
-<xsl:apply-templates />
-</programlisting>
-</xsl:template>
-
-<xsl:template match="doc:summary">
-<!-- by default don't display -->
-</xsl:template>
-
-<xsl:template match="doc:example">
-<informalexample>
-<xsl:apply-templates />
-</informalexample>
-</xsl:template>
-
-<xsl:template match="doc:para">
-<para>
-<xsl:apply-templates />
-</para>
-</xsl:template>
-
-<xsl:template match="doc:description">
-<xsl:apply-templates />
-</xsl:template>
-
-<xsl:template match="doc:since">
-<para role="since">Since <xsl:value-of select="@version"/>
-</para>
-</xsl:template>
-
-<xsl:template match="doc:deprecated">
- <xsl:variable name="name" select="../../@name"/>
- <xsl:variable name="parent">
- <xsl:call-template name="interface-basename">
- <xsl:with-param name="str" select="../../../@name"/>/>
- </xsl:call-template>
- </xsl:variable>
-
- <xsl:variable name="type" select="name(../..)"/>
-
- <para role="deprecated">
- <warning><para><literal><xsl:value-of select="$name"/></literal> is
deprecated since version <xsl:value-of select="@version"/> and should not be
used in newly-written code. Use
-
- <xsl:variable name="to">
- <xsl:choose>
- <xsl:when test="contains($type,'property')">
- <xsl:value-of select="$parent"/>:<xsl:value-of select="@instead"/>
- </xsl:when>
- <xsl:when test="contains($type,'signal')">
- <xsl:value-of select="$parent"/>::<xsl:value-of select="@instead"/>
- </xsl:when>
- <xsl:when test="contains($type,'method')">
- <xsl:value-of select="$parent"/>.<xsl:value-of select="@instead"/>
- </xsl:when>
- <xsl:when test="contains($type,'interface')">
- <xsl:value-of select="@instead"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@instead"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <xsl:call-template name="create-link">
- <xsl:with-param name="type" select="$type"/>
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
