Merge lp:~mardy/webbrowser-app/qml-path into lp:webbrowser-app

[Alberto Mardegan]

Find QML files even if relocated

When the webbrowser-app or webapp-container is run from inside a snap and provided by another snap (such as ubuntu-app-platform), the only reliable way to locate the data files is to walk up the bindir and then descend into the datadir.
This way allows us to locate the data file regardless of any relocation of the package.

Find QML files even if relocated

When the webbrowser-app or webapp-container is run from inside a snap and provided by another snap (such as ubuntu-app-platform), the only reliable way to locate the data files is to walk up the bindir and then descend into the datadir.
This way allows us to locate the data file regardless of any relocation of the package.

[Olivier Tilloy (osomon)]

I haven’t reviewed the actual change, but it’s conditional on reaching an agreement on bug #1646187, IIUC. Can you please ping me again when we have an agreement, and this kind of trick becomes necessary? Thanks!

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

FAILED: Continuous integration, rev:1565
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/731/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2204
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/571
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2207
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2034
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2034/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2034
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2034/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2034
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2034/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2034
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2034/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2034
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2034/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2034
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2034/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2034
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2034/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2034
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2034/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2034
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2034/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

1565. By Alberto Mardegan on 2016-12-19

Properly find qml files even if relocated

=== modified file 'src/app/config.h.in'
--- src/app/config.h.in	2016-07-12 11:54:37 +0000
+++ src/app/config.h.in	2016-12-19 13:40:44 +0000
@@ -22,20 +22,42 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
 #include <QtCore/QString>
+#include <QtCore/QStringList>
 #include <QtCore/QtGlobal>
 
 #define REMOTE_INSPECTOR_PORT 9221
 
 inline bool isRunningInstalled()
 {
-    static bool installed = (QCoreApplication::applicationDirPath() == QDir(qgetenv("SNAP").append("@CMAKE_INSTALL_FULL_BINDIR@")).canonicalPath());
+    static bool installed = QCoreApplication::applicationDirPath().endsWith("@CMAKE_INSTALL_FULL_BINDIR@");
     return installed;
 }
 
 inline QString UbuntuBrowserDirectory()
 {
     if (isRunningInstalled()) {
-        return qgetenv("SNAP").append("@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app");
+        QDir dir(QCoreApplication::applicationDirPath());
+        bool ok = true;
+
+        QStringList parts(QString("@CMAKE_INSTALL_FULL_BINDIR@")
+                          .split(QDir::separator(), QString::SkipEmptyParts));
+        Q_FOREACH(const QString &part, parts) {
+            if (!dir.cdUp()) {
+                ok = false;
+                break;
+            }
+        }
+
+        parts = QStringList(QString("@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app")
+                            .split(QDir::separator(), QString::SkipEmptyParts));
+        Q_FOREACH(const QString &part, parts) {
+            if (!dir.cd(part)) {
+                ok = false;
+                break;
+            }
+        }
+
+        return ok ? dir.path() : qgetenv("SNAP").append("@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app");
     } else {
         return QStringLiteral("@CMAKE_SOURCE_DIR@/src/app");
     }