[connectionagent] Generate interface code from the XML at build time.

Don't rely on a pregenerated copy, as it may not be noticed by someone changing this.
sailfishos · Mar 18, 2014 · b51697c · b51697c
1 parent 7980724
commit b51697c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 166 deletions.
diff --git a/connd/connadaptor.cpp b/connd/connadaptor.cpp
diff --git a/connd/connadaptor.h b/connd/connadaptor.h
diff --git a/connd/connd.pro b/connd/connd.pro
@@ -11,17 +11,20 @@ TEMPLATE = app
 
 OTHER_FILES += com.jolla.Connectiond.xml
 
+DBUS_ADAPTORS = connadaptor
+connadaptor.files = com.jollamobile.Connectiond.xml
+connadaptor.header_flags = -c ConnAdaptor
+connadaptor.source_flags = -c ConnAdaptor
+
 # create adaptor
 #system(qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jollamobile.Connectiond.xml)
 
 SOURCES += main.cpp \
     qconnectionmanager.cpp \
-    connadaptor.cpp \
     wakeupwatcher.cpp
 
 HEADERS+= \
     qconnectionmanager.h \
-    connadaptor.h \
     wakeupwatcher.h
 
 target.path = /usr/bin

diff --git a/connd/main.cpp b/connd/main.cpp
@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 
 #include "qconnectionmanager.h"
-#include "connadaptor.h"
+#include "connectiond_adaptor.h"
 
 static void signal_handler(int signum)
 {

diff --git a/connd/qconnectionmanager.cpp b/connd/qconnectionmanager.cpp
@@ -15,7 +15,7 @@
 ****************************************************************************/
 
 #include "qconnectionmanager.h"
-#include "connadaptor.h"
+#include "connectiond_adaptor.h"
 #include "wakeupwatcher.h"
 
 #include <connman-qt5/useragent.h>

diff --git a/connectionagent.pro b/connectionagent.pro
@@ -6,6 +6,8 @@ SUBDIRS = \
     config \
     connd
 
+test.depends = connd # xml interface
+
 OTHER_FILES += rpm/connectionagent-qt5.spec \
                rpm/connectionagent-qt5.yaml \
                rpm/connectionagent.tracing

diff --git a/test/auto/tst_connectionagent/tst_connectionagent.pro b/test/auto/tst_connectionagent/tst_connectionagent.pro
@@ -11,12 +11,12 @@ DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
 SOURCES += tst_connectionagent.cpp \
         ../../../connd/qconnectionmanager.cpp \
-        ../../../connd/connadaptor.cpp \
+        ../../../connd/connectiond_adaptor.cpp \
         ../../../connd/wakeupwatcher.cpp
 
 HEADERS += \
         ../../../connd/qconnectionmanager.h \
-        ../../../connd/connadaptor.h \
+        ../../../connd/connectiond_adaptor.h \
         ../../../connd/wakeupwatcher.h
 
 INCLUDEPATH += ../../../connd