Commit 4b60d6d7 authored by akozhevnikov's avatar akozhevnikov

[ssu] Proper d-bus adaptor/interface generation

parent 191346f0
......@@ -31,13 +31,3 @@ static_config.files = repos.ini ssu-defaults.ini board-mappings.ini
static_config.path = /usr/share/ssu
INSTALLS += config static_config oneshot macros
system(qdbusxml2cpp \
-c SsuAdaptor \
-a ssud/ssuadaptor.h:ssud/ssuadaptor.cpp \
dbus/org.nemo.ssu.xml)
system(qdbusxml2cpp \
-c SsuProxy \
-p ssucli/ssuproxy.h:ssucli/ssuproxy.cpp \
dbus/org.nemo.ssu.xml)
......@@ -14,7 +14,7 @@
#include <QDebug>
#include "libssu/ssu.h"
#include "ssuproxy.h"
#include "ssu_interface.h"
class SsuCli: public QObject
{
......
......@@ -5,8 +5,11 @@ include(ssucli_dependencies.pri)
QT += network dbus
CONFIG += link_pkgconfig
HEADERS = ssucli.h \
ssuproxy.h
HEADERS = ssucli.h
SOURCES = main.cpp \
ssucli.cpp \
ssuproxy.cpp
ssucli.cpp
ssu_dbus_interface.files = ../dbus/org.nemo.ssu.xml
ssu_dbus_interface.source_flags = -c SsuProxy
ssu_dbus_interface.header_flags = -c SsuProxy -i ssud/ssud_include.h
DBUS_INTERFACES += ssu_dbus_interface
......@@ -6,7 +6,7 @@
*/
#include "ssud.h"
#include "ssuadaptor.h"
#include "ssu_adaptor.h"
#include "libssu/ssudeviceinfo.h"
#include "libssu/ssurepomanager.h"
......
......@@ -13,6 +13,7 @@
#include <QTimer>
#include "libssu/ssu.h"
#include "ssud_include.h"
class Ssud: public QObject
{
......
......@@ -5,9 +5,10 @@ include(ssud_dependencies.pri)
QT += network dbus
CONFIG += link_pkgconfig
HEADERS = ssuadaptor.h \
ssud.h
SOURCES = ssuadaptor.cpp \
HEADERS = \
ssud.h \
ssud_include.h
SOURCES = \
ssud.cpp \
main.cpp
......@@ -23,3 +24,8 @@ conf.files = ../dbus/$${DBUS_SERVICE_NAME}.conf
conf.path = /etc/dbus-1/system.d/
INSTALLS += systemd service conf
ssu_dbus_adaptor.files = ../dbus/org.nemo.ssu.xml
ssu_dbus_adaptor.source_flags = -c SsuAdaptor
ssu_dbus_adaptor.header_flags = -c SsuAdaptor -i ssud/ssud_include.h
DBUS_ADAPTORS += ssu_dbus_adaptor
#ifndef SSUD_INCLUDE_H
#define SSUD_INCLUDE_H
#endif // SSUD_INCLUDE_H
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