Merge lp:~phablet-team/telephony-service/fix-hardcoded-paths into lp:telephony-service

[Roberto Mier Escandon]

prefixes snap env var value to paths in case service is into a snap package

prefixes snap env var value to paths in case service is into a snap package

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1213
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/87/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2055/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2058
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1888
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1888/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1888/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1888
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1888
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1888
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1888
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1888
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1888
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1888
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1888/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/87/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1214
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/88/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2057/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2060
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1890
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1890/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1890/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1890
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1890/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1890
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1890/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1890
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1890/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1890
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1890/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1890
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1890/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1890
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1890/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1890/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/88/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/telephony-service/fix-hardcoded-paths]

1215. By Roberto Mier Escandon on 2016-11-28

corrected bad var reference

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1215
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/91/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2066
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/505
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2069
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1899
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1899/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1899
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1899/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1899
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1899/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1899
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1899/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1899
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1899/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1899
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1899/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1899
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1899/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1899
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1899/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1899
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1899/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telephony-service-ci/91/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Works fine. Tested telephony apps with ofono emulator and they are able to send messages and make calls.

review: Approve

[lp:~phablet-team/telephony-service/fix-hardcoded-paths]

1216. By Roberto Mier Escandon on 2016-12-01

set explicitly the architectures to build

1217. By Roberto Mier Escandon on 2016-12-02

rolledback to any architecture build

1218. By Renato Araujo Oliveira Filho on 2016-12-05

Trunk merged.

=== modified file 'config.h.in'
--- config.h.in	2015-08-26 08:19:56 +0000
+++ config.h.in	2016-12-05 15:15:21 +0000
@@ -37,7 +37,9 @@
 }
 
 inline QString telephonyServiceDir() {
-    if (isRunningInstalled()) {
+    if (qEnvironmentVariableIsSet("SNAP")) {
+        return QString("%1/@CMAKE_INSTALL_PREFIX@/@TELEPHONY_SERVICE_DIR@/").arg(QString(qgetenv("SNAP")));
+    } else if (isRunningInstalled()) {
         return QString("@CMAKE_INSTALL_PREFIX@/@TELEPHONY_SERVICE_DIR@/");
     } else {
         return QString("@CMAKE_SOURCE_DIR@/");
@@ -45,7 +47,7 @@
 }
 
 inline QString ubuntuPhonePluginPath() {
-    if (isRunningInstalled()) {
+    if (isRunningInstalled() || qEnvironmentVariableIsSet("SNAP")) {
         return QString::null;
     } else {
         return QString("@CMAKE_SOURCE_DIR@/");

=== added directory 'snap'
=== added directory 'snap/ubuntu-app-platform'
=== added file 'snapcraft.yaml'
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ snapcraft.yaml	2016-12-05 15:15:21 +0000
@@ -0,0 +1,82 @@
+name: telephony-service
+version: 0.1
+summary: Telephony service components for Ubuntu - backend
+description: 
+  Telephony service components for Ubuntu.
+  .
+  This package contains the backend components providing the telephony 
+  features such as calling and texting.
+confinement: devmode
+grade: devel
+
+apps:
+  indicator:
+    command: desktop-launch $SNAP/usr/bin/telephony-service-indicator
+    plugs: [platform]
+
+  handler:
+    command: desktop-launch $SNAP/usr/bin/telephony-service-handler
+    plugs: [platform]
+
+  approver:
+    command: desktop-launch $SNAP/usr/bin/telephony-service-approver
+    plugs: [platform]
+
+plugs:
+  platform:
+    interface: content
+    content: ubuntu-app-platform1
+    target: ubuntu-app-platform
+    default-provider: ubuntu-app-platform
+
+#slots:
+#  telephony:
+#    interface: telephony
+
+parts:
+  telephony-service:
+    plugin: cmake
+    configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCMAKE_CROSSCOMPILING=On]
+    source: .
+    build-packages:
+      - cmake
+      - dh-translations
+      - dconf-cli
+      - gnome-keyring
+      - gsettings-ubuntu-schemas
+      - libhistoryservice-dev
+      - libicu-dev
+      - libmessaging-menu-dev
+      - libnotify-dev
+      - libphonenumber-dev
+      - libtelepathy-qt5-dev
+      - libubuntu-application-api-dev
+      - libprotobuf-dev
+      - pkg-config
+      - qt5-default
+      - qtbase5-dev
+      - qtdeclarative5-dev
+      - qtdeclarative5-dev-tools
+      - qtfeedback5-dev
+      - qtdeclarative5-ubuntu-ui-toolkit-plugin
+      - qtmultimedia5-dev
+      - qtpim5-dev
+      - libusermetricsinput1-dev
+      - telepathy-mission-control-5
+      - upstart
+    stage-packages:
+      - accountsservice-ubuntu-touch-schemas
+      - gsettings-ubuntu-schemas
+      - history-service
+      - libnotify4
+      - telepathy-mission-control-5
+      - ubuntu-sounds
+      - tone-generator
+      - libusermetricsinput1
+      - dconf-cli
+    after: [desktop-ubuntu-app-platform]
+
+  environment:
+    source: snap
+    plugin: dump
+