Commit 1d34bf5d authored by aviau's avatar aviau Committed by Alexandre Viau

Install D-Bus interface files in $(datadir)/dbus-1/interfaces

- Rename D-Bus interface files according to the recommended scheme

- Install D-Bus interface to $(datadir)/dbus-1/interfaces, as specified
  on the freedsektop website[1].

Installing interface files on the system will allow for compiling LRC
without having to duplicate the D-Bus interface files.

1. https://dbus.freedesktop.org/doc/dbus-api-design.html#interface-files

Change-Id: I687484aad2d1e4bb27553db76018ffb6efc52bbd
Tuleap: #688
parent 67cee1e7
......@@ -8,25 +8,25 @@ BUILT_SOURCES= \
dbusinstance.adaptor.h
BUILT_SOURCES+=dbuspresencemanager.adaptor.h
dbuspresencemanager.adaptor.h: presencemanager-introspec.xml Makefile.am
dbuspresencemanager.adaptor.h: cx.ring.Ring.PresenceManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
if RING_VIDEO
BUILT_SOURCES+=dbusvideomanager.adaptor.h
dbusvideomanager.adaptor.h: videomanager-introspec.xml Makefile.am
dbusvideomanager.adaptor.h: cx.ring.Ring.VideoManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
endif
# Rule to generate the binding headers
dbuscallmanager.adaptor.h: callmanager-introspec.xml Makefile.am
dbuscallmanager.adaptor.h: cx.ring.Ring.CallManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
# Rule to generate the binding headers
dbusconfigurationmanager.adaptor.h: configurationmanager-introspec.xml Makefile.am
dbusconfigurationmanager.adaptor.h: cx.ring.Ring.ConfigurationManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
# Rule to generate the binding headers
dbusinstance.adaptor.h: instance-introspec.xml Makefile.am
dbusinstance.adaptor.h: cx.ring.Ring.Instance.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
libclient_dbus_la_SOURCES = \
......@@ -58,13 +58,16 @@ libclient_dbus_la_CXXFLAGS = -I../ \
servicedir = $(datadir)/dbus-1/services
service_DATA = cx.ring.Ring.service
EXTRA_DIST = callmanager-introspec.xml \
configurationmanager-introspec.xml \
instance-introspec.xml \
presencemanager-introspec.xml
# Dbus interface files
# https://dbus.freedesktop.org/doc/dbus-api-design.html#interface-files
interfacedir = $(datadir)/dbus-1/interfaces
interface_DATA = cx.ring.Ring.CallManager.xml \
cx.ring.Ring.ConfigurationManager.xml \
cx.ring.Ring.Instance.xml \
cx.ring.Ring.PresenceManager.xml
if RING_VIDEO
EXTRA_DIST += videomanager-introspec.xml
interface_DATA += cx.ring.Ring.VideoManager.xml
endif
CLEANFILES= \
......
<?xml version="1.0" encoding="UTF-8" ?>
<node name="/callmanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<node name="/cx.ring.Ring.CallManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="cx.ring.Ring.CallManager">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
......
<?xml version="1.0" ?>
<node name="/configurationmanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<node name="/cx.ring.Ring.ConfigurationManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="cx.ring.Ring.ConfigurationManager">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
......
<?xml version="1.0" ?>
<node name="/instance-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<node name="/cx.ring.Ring.Instance" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="cx.ring.Ring.Instance">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>Count the number of clients actually registered to the core. When initializing your client, you need to register it against the core by using this interface.</p>
......
<?xml version="1.0" encoding="UTF-8" ?>
<node name="/presencemanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<node name="/cx.ring.Ring.PresenceManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="cx.ring.Ring.PresenceManager">
<!-- METHODS !-->
<method name="publish" tp:name-for-bindings="publish">
......
<?xml version="1.0" ?>
<node name="/videomanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<node name="/cx.ring.Ring.VideoManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="cx.ring.Ring.VideoManager">
<!-- Video device methods -->
......
......@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</
An Instance Manager to handle multiple clients connections. Count the number of clients actually registered to the core. When initializing your client, you need to register it against the core by using this interface.
</p>
</tp:docstring>
<xi:include href="instance-introspec.xml"/>
<xi:include href="cx.ring.Ring.Instance.xml"/>
</tp:section>
<tp:section name="Call Manager">
......@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</
A Call Manager to handle call-related features.
</p>
</tp:docstring>
<xi:include href="callmanager-introspec.xml"/>
<xi:include href="cx.ring.Ring.CallManager.xml"/>
</tp:section>
<tp:section name="Configuration Manager">
......@@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</
A Configuration Manager to handle account configuration, user preferences, ...
</p>
</tp:docstring>
<xi:include href="configurationmanager-introspec.xml"/>
<xi:include href="cx.ring.Ring.ConfigurationManager.xml"/>
</tp:section>
<xi:include href="generic-types.xml"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment