Merge lp:~renatofilho/camera-app/shared-snappy into lp:camera-app

[Renato Araujo Oliveira Filho]

Set correct path when running as snap.
Added missing dep 'qtdeclarative5-qtsensors-plugin'.
Use 'ubuntu-app-platform' content share.

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

FAILED: Continuous integration, rev:674
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2009/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2012
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1842/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1842/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1842/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1842/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1842/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1842/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1842/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1842/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1842/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/camera-app/shared-snappy]

675. By Renato Araujo Oliveira Filho on 2016-11-19

Revet changes.

676. By Renato Araujo Oliveira Filho on 2016-11-19

Add empty dir used to mount platform shared content.

677. By Renato Araujo Oliveira Filho on 2016-11-19

Add missing library path on LD_LIBRARY_PATH.

Unmerged revisions

=== modified file 'config.h.in'
--- config.h.in	2016-09-09 11:56:55 +0000
+++ config.h.in	2016-11-18 22:40:21 +0000
@@ -29,33 +29,37 @@
 #endif
 }
 
-static QString SNAP_ENV = qgetenv("SNAP");
+inline bool isSnap() {
+    static const QByteArray snapPath(qgetenv("SNAP"));
+    return !snapPath.isEmpty();
+}
+
+inline QByteArray installPrefix() {
+    static const QByteArray snapPath(qgetenv("SNAP") + "@CMAKE_INSTALL_PREFIX@");
+    return snapPath;
+}
 
 inline bool isRunningInstalled() {
     static bool installed = (QCoreApplication::applicationDirPath() ==
-                             QDir(("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());
+                             QDir("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@").canonicalPath());
     return installed;
 }
 
 inline QString cameraAppDirectory() {
-    if (!SNAP_ENV.isEmpty()) {
-        return SNAP_ENV + "@CMAKE_INSTALL_PREFIX@/@CAMERA_APP_DIR@/";
-    } else if (isClick()) {
+    if (isClick()) {
         return QDir::currentPath();
-    } else if (isRunningInstalled()) {
-        return QString("@CMAKE_INSTALL_PREFIX@/@CAMERA_APP_DIR@/");
+    } else if (isSnap() || isRunningInstalled()) {
+        return (installPrefix() + "/@CAMERA_APP_DIR@/");
     } else {
         return QString("@CMAKE_SOURCE_DIR@/");
     }
 }
 
 inline QString cameraAppImportDirectory() {
-    if (!SNAP_ENV.isEmpty()) {
-        return SNAP_ENV + "@CMAKE_INSTALL_PREFIX@/@PLUGIN_BASE@";
-    } else if (isClick()) {
+    if (isClick()) {
         return QDir::currentPath() + "/@PLUGIN_BASE@";
     } else {
-        return "@CMAKE_INSTALL_PREFIX@/@PLUGIN_BASE@";
+        return (installPrefix() + "/@PLUGIN_BASE@");
     }
 }
 

=== modified file 'debian/control'
--- debian/control	2016-08-22 17:27:05 +0000
+++ debian/control	2016-11-18 22:40:21 +0000
@@ -45,6 +45,7 @@
          qtdeclarative5-ubuntu-content1,
          qml-module-ubuntu-thumbnailer0.1,
          qml-module-qtpositioning,
+         qtdeclarative5-qtsensors-plugin,
          qtdeclarative5-ubuntu-ui-extras0.2,
          ${misc:Depends},
          ${shlibs:Depends},

=== added directory 'snap'
=== renamed file 'camera.wrapper' => 'snap/camera.wrapper'
--- camera.wrapper	2016-09-29 13:47:52 +0000
+++ snap/camera.wrapper	2016-11-18 22:40:21 +0000
@@ -27,4 +27,4 @@
 mkdir -p $HOME/.config/
 ln -s /home/$USER/.config/user-dirs.dirs $HOME/.config/user-dirs.dirs
 
-exec "$SNAP/bin/desktop-launch" "camera-app" --desktop_file_hint=unity8 "$@"
+exec "$SNAP/usr/bin/camera-app" --desktop_file_hint=unity8 "$@"

=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2016-09-29 13:38:02 +0000
+++ snapcraft.yaml	2016-11-18 22:40:21 +0000
@@ -7,21 +7,23 @@
 
 apps:
   camera-app:
-    command: bin/camera.wrapper
-    plugs: [unity7, opengl, camera, pulseaudio, home]
+    command: desktop-launch $SNAP/bin/camera.wrapper
+    plugs: [unity7, opengl, camera, pulseaudio, home, platform]
+
+plugs:
+  platform:
+    interface: content
+    content: ubuntu-app-platform1
+    target: ubuntu-app-platform
 
 parts:
   wrapper:
-    source: .
+    source: snap/
     plugin: dump
     organize:
       camera.wrapper: bin/camera.wrapper
-    stage:
-      - bin/camera.wrapper
-    snap:
-      - bin/camera.wrapper
 
-  camera:
+  camera-app:
     source: .
     plugin: cmake
     configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
@@ -37,14 +39,6 @@
       - libusermetricsinput1-dev
       - qtmultimedia5-dev
     stage-packages:
-      - ubuntu-sdk-libs
-      - qtubuntu-desktop
-      - qml-module-qtpositioning
-      - qtdeclarative5-unity-action-plugin
-      - qtdeclarative5-usermetrics0.1
-      - qtdeclarative5-ubuntu-content1
-      - qtdeclarative5-ubuntu-ui-extras0.2
-      - qtdeclarative5-ubuntu-thumbnailer0.1
       - xdg-user-dirs
-      - mir-graphics-drivers-desktop
-    after: [desktop-qt5]
+    after: 
+      - desktop-ubuntu-app-platform