From bd34e5b5ab78e15ee1433a7fbd1dfe2b672fef7f Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 18 Feb 2016 16:57:06 +0100 Subject: Various Ifdefed the WebSocket stuff that doesn't exist on Sailfish Voice calls nearly working, except for a segfault on callEnded, which might be a reentrant thing. --- rockworkd/rockworkd.pro | 208 +++++++----------------------------------------- 1 file changed, 29 insertions(+), 179 deletions(-) (limited to 'rockworkd/rockworkd.pro') diff --git a/rockworkd/rockworkd.pro b/rockworkd/rockworkd.pro index 53e37ff..b6f7054 100644 --- a/rockworkd/rockworkd.pro +++ b/rockworkd/rockworkd.pro @@ -1,167 +1,19 @@ -<<<<<<< HEAD -QT += core bluetooth dbus network contacts qml location organizer -QT -= gui - -include(../version.pri) - -TARGET = rockpoold - -CONFIG += c++11 -CONFIG += console -CONFIG += link_pkgconfig - -INCLUDEPATH += /usr/include/telepathy-qt5/ $$[QT_HOST_PREFIX]/include/quazip/ -LIBS += -lquazip -ltelepathy-qt5 - -PKGCONFIG += libmkcal-qt5 libkcalcoren-qt5 -INCLUDEPATH += /usr/include/mkcal-qt5 /usr/include/kcalcoren-qt5 - -SOURCES += main.cpp \ - libpebble/watchconnection.cpp \ - libpebble/pebble.cpp \ - libpebble/watchdatareader.cpp \ - libpebble/watchdatawriter.cpp \ - libpebble/notificationendpoint.cpp \ - libpebble/musicendpoint.cpp \ - libpebble/phonecallendpoint.cpp \ - libpebble/musicmetadata.cpp \ - libpebble/jskit/jskitmanager.cpp \ - libpebble/jskit/jskitconsole.cpp \ - libpebble/jskit/jskitgeolocation.cpp \ - libpebble/jskit/jskitlocalstorage.cpp \ - libpebble/jskit/jskitpebble.cpp \ - libpebble/jskit/jskitxmlhttprequest.cpp \ - libpebble/jskit/jskittimer.cpp \ - libpebble/jskit/jskitperformance.cpp \ - libpebble/appinfo.cpp \ - libpebble/appmanager.cpp \ - libpebble/appmsgmanager.cpp \ - libpebble/uploadmanager.cpp \ - libpebble/bluez/bluezclient.cpp \ - libpebble/bluez/bluez_agentmanager1.cpp \ - libpebble/bluez/bluez_adapter1.cpp \ - libpebble/bluez/bluez_device1.cpp \ - libpebble/bluez/freedesktop_objectmanager.cpp \ - libpebble/bluez/freedesktop_properties.cpp \ - libpebble/bluez/device.cpp \ - core.cpp \ - pebblemanager.cpp \ - dbusinterface.cpp \ -# Platform integration part - platformintegration/sailfish/sailfishplatform.cpp \ - platformintegration/sailfish/callchannelobserver.cpp \ -# platformintegration/sailfish/voicecallmanager.cpp \ -# platformintegration/sailfish/voicecallhandler.cpp \ - libpebble/blobdb.cpp \ - libpebble/timelineitem.cpp \ - libpebble/notification.cpp \ - platformintegration/sailfish/organizeradapter.cpp \ - libpebble/calendarevent.cpp \ - platformintegration/sailfish/syncmonitorclient.cpp \ - libpebble/appmetadata.cpp \ - libpebble/appdownloader.cpp \ - libpebble/screenshotendpoint.cpp \ - libpebble/firmwaredownloader.cpp \ - libpebble/bundle.cpp \ - libpebble/watchlogendpoint.cpp \ - libpebble/ziphelper.cpp \ - libpebble/healthparams.cpp \ - libpebble/dataloggingendpoint.cpp - -HEADERS += \ - libpebble/watchconnection.h \ - libpebble/pebble.h \ - libpebble/watchdatareader.h \ - libpebble/watchdatawriter.h \ - libpebble/notificationendpoint.h \ - libpebble/musicendpoint.h \ - libpebble/musicmetadata.h \ - libpebble/phonecallendpoint.h \ - libpebble/platforminterface.h \ - libpebble/jskit/jskitmanager.h \ - libpebble/jskit/jskitconsole.h \ - libpebble/jskit/jskitgeolocation.h \ - libpebble/jskit/jskitlocalstorage.h \ - libpebble/jskit/jskitpebble.h \ - libpebble/jskit/jskitxmlhttprequest.h \ - libpebble/jskit/jskittimer.h \ - libpebble/jskit/jskitperformance.h \ - libpebble/appinfo.h \ - libpebble/appmanager.h \ - libpebble/appmsgmanager.h \ - libpebble/uploadmanager.h \ - libpebble/bluez/bluezclient.h \ - libpebble/bluez/bluez_agentmanager1.h \ - libpebble/bluez/bluez_adapter1.h \ - libpebble/bluez/bluez_device1.h \ - libpebble/bluez/freedesktop_objectmanager.h \ - libpebble/bluez/freedesktop_properties.h \ - libpebble/bluez/device.h \ - core.h \ - pebblemanager.h \ - dbusinterface.h \ -# Platform integration part - platformintegration/sailfish/sailfishplatform.h \ - platformintegration/sailfish/callchannelobserver.h \ -# platformintegration/sailfish/voicecallmanager.h \ -# platformintegration/sailfish/voicecallhandler.h \ - libpebble/blobdb.h \ - libpebble/timelineitem.h \ - libpebble/notification.h \ - platformintegration/sailfish/organizeradapter.h \ - libpebble/calendarevent.h \ - platformintegration/sailfish/syncmonitorclient.h \ - libpebble/appmetadata.h \ - libpebble/appdownloader.h \ - libpebble/enums.h \ - libpebble/screenshotendpoint.h \ - libpebble/firmwaredownloader.h \ - libpebble/bundle.h \ - libpebble/watchlogendpoint.h \ - libpebble/ziphelper.h \ - libpebble/healthparams.h \ - libpebble/dataloggingendpoint.h - -testing: { - SOURCES += platformintegration/testing/testingplatform.cpp - HEADERS += platformintegration/testing/testingplatform.h - RESOURCES += platformintegration/testing/testui.qrc - DEFINES += ENABLE_TESTING - QT += qml quick -} - -INSTALLS += target systemd - -systemd.files = $${TARGET}.service -systemd.path = /usr/lib/systemd/user - -# Default rules for deployment. -target.path = /usr/bin - -RESOURCES += \ - libpebble/jskit/jsfiles.qrc - -======= -QT += core bluetooth dbus network contacts qml location organizer websockets +QT += core bluetooth dbus network contacts qml location organizer QT -= gui include(../version.pri) -load(ubuntu-click) -TARGET = rockworkd -CONFIG += c++11 -#CONFIG -= app_bundle +TARGET = rockpoold -TEMPLATE = app +CONFIG += c++11 +CONFIG += console +CONFIG += link_pkgconfig -#TODO: figure why pkgconfig doesn't work in the click chroot -#CONFIG += link_pkgconfig -#PKGCONFIG += url-dispatcher-1 -INCLUDEPATH += /usr/lib/arm-linux-gnueabihf/glib-2.0/include /usr/lib/x86_64-linux-gnu/glib-2.0/include/ /usr/include/glib-2.0/ -LIBS += -lurl-dispatcher +INCLUDEPATH += $$[QT_HOST_PREFIX]/include/quazip/ +LIBS += -lquazip -INCLUDEPATH += /usr/include/telepathy-qt5/ /usr/include/qmenumodel/ -LIBS += -lquazip-qt5 -ltelepathy-qt5 -lqmenumodel +PKGCONFIG += libmkcal-qt5 libkcalcoren-qt5 +INCLUDEPATH += /usr/include/mkcal-qt5 /usr/include/kcalcoren-qt5 SOURCES += main.cpp \ libpebble/watchconnection.cpp \ @@ -180,7 +32,7 @@ SOURCES += main.cpp \ libpebble/jskit/jskitxmlhttprequest.cpp \ libpebble/jskit/jskittimer.cpp \ libpebble/jskit/jskitperformance.cpp \ - libpebble/jskit/jskitwebsocket.cpp \ +# libpebble/jskit/jskitwebsocket.cpp \ libpebble/appinfo.cpp \ libpebble/appmanager.cpp \ libpebble/appmsgmanager.cpp \ @@ -191,18 +43,21 @@ SOURCES += main.cpp \ libpebble/bluez/bluez_device1.cpp \ libpebble/bluez/freedesktop_objectmanager.cpp \ libpebble/bluez/freedesktop_properties.cpp \ + libpebble/bluez/device.cpp \ core.cpp \ pebblemanager.cpp \ dbusinterface.cpp \ # Platform integration part - platformintegration/ubuntu/ubuntuplatform.cpp \ - platformintegration/ubuntu/callchannelobserver.cpp \ + platformintegration/sailfish/sailfishplatform.cpp \ +# platformintegration/sailfish/callchannelobserver.cpp \ + platformintegration/sailfish/voicecallmanager.cpp \ + platformintegration/sailfish/voicecallhandler.cpp \ libpebble/blobdb.cpp \ libpebble/timelineitem.cpp \ libpebble/notification.cpp \ - platformintegration/ubuntu/organizeradapter.cpp \ + platformintegration/sailfish/organizeradapter.cpp \ libpebble/calendarevent.cpp \ - platformintegration/ubuntu/syncmonitorclient.cpp \ + platformintegration/sailfish/syncmonitorclient.cpp \ libpebble/appmetadata.cpp \ libpebble/appdownloader.cpp \ libpebble/screenshotendpoint.cpp \ @@ -231,7 +86,7 @@ HEADERS += \ libpebble/jskit/jskitxmlhttprequest.h \ libpebble/jskit/jskittimer.h \ libpebble/jskit/jskitperformance.h \ - libpebble/jskit/jskitwebsocket.h \ +# libpebble/jskit/jskitwebsocket.h \ libpebble/appinfo.h \ libpebble/appmanager.h \ libpebble/appmsgmanager.h \ @@ -242,18 +97,21 @@ HEADERS += \ libpebble/bluez/bluez_device1.h \ libpebble/bluez/freedesktop_objectmanager.h \ libpebble/bluez/freedesktop_properties.h \ + libpebble/bluez/device.h \ core.h \ pebblemanager.h \ dbusinterface.h \ # Platform integration part - platformintegration/ubuntu/ubuntuplatform.h \ - platformintegration/ubuntu/callchannelobserver.h \ + platformintegration/sailfish/sailfishplatform.h \ +# platformintegration/sailfish/callchannelobserver.h \ + platformintegration/sailfish/voicecallmanager.h \ + platformintegration/sailfish/voicecallhandler.h \ libpebble/blobdb.h \ libpebble/timelineitem.h \ libpebble/notification.h \ - platformintegration/ubuntu/organizeradapter.h \ + platformintegration/sailfish/organizeradapter.h \ libpebble/calendarevent.h \ - platformintegration/ubuntu/syncmonitorclient.h \ + platformintegration/sailfish/syncmonitorclient.h \ libpebble/appmetadata.h \ libpebble/appdownloader.h \ libpebble/enums.h \ @@ -273,21 +131,13 @@ testing: { QT += qml quick } -libs.files = /usr/lib/arm-linux-gnueabihf/libQt5Bluetooth.so.5.4.1 \ - /usr/lib/arm-linux-gnueabihf/libQt5Bluetooth.so.5 \ - /usr/lib/arm-linux-gnueabihf/libquazip-qt5.so.1.0.0 \ - /usr/lib/arm-linux-gnueabihf/libquazip-qt5.so.1 -libs.path = $${UBUNTU_CLICK_BINARY_PATH}/.. -INSTALLS += libs +INSTALLS += target systemd +systemd.files = $${TARGET}.service +systemd.path = /usr/lib/systemd/user # Default rules for deployment. -target.path = $${UBUNTU_CLICK_BINARY_PATH} -INSTALLS+=target - -QMAKE_POST_LINK = sed -i s/@VERSION@/$$VERSION/g $$OUT_PWD/../manifest.json || exit 0 -#QMAKE_POST_LINK = echo $$OUT_PWD/../manifest.json > /tmp/huhu; +target.path = /usr/bin RESOURCES += \ libpebble/jskit/jsfiles.qrc ->>>>>>> refs/heads/rockwork -- cgit v1.2.3