dialer-app

Merge lp:~renatofilho/dialer-app/fix-snap-path into lp:dialer-app

  1. fix-snap-path
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 557
Merged at revision: 557
Proposed branch: lp:~renatofilho/dialer-app/fix-snap-path
Merge into: lp:dialer-app
Diff against target: 31 lines (+5/-2)
1 file modified
config.h.in (+5/-2)
To merge this branch: bzr merge lp:~renatofilho/dialer-app/fix-snap-path
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
system-apps-ci-bot continuous-integration Needs Fixing
Review via email: mp+311143@code.launchpad.net

Commit message

Append "SNAP" path into the base application path, when that var is set.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:557
https://jenkins.canonical.com/system-apps/job/lp-dialer-app-ci/28/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1992/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1995
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1825/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1825/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1825
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1825/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'config.h.in'
--- config.h.in 2014-05-28 20:27:06 +0000
+++ config.h.in 2016-11-17 13:04:41 +0000
@@ -27,6 +27,7 @@
27#include <QtDBus/QDBusReply>27#include <QtDBus/QDBusReply>
2828
29#define I18N_DIRECTORY "@CMAKE_INSTALL_PREFIX@/share/locale"29#define I18N_DIRECTORY "@CMAKE_INSTALL_PREFIX@/share/locale"
30#define SNAP_PATH "SNAP"
3031
31inline bool isRunningInstalled() {32inline bool isRunningInstalled() {
32 static bool installed = (QCoreApplication::applicationDirPath() ==33 static bool installed = (QCoreApplication::applicationDirPath() ==
@@ -35,7 +36,9 @@
35}36}
3637
37inline QString dialerAppDirectory() {38inline QString dialerAppDirectory() {
38 if (isRunningInstalled()) {39 if (qEnvironmentVariableIsSet(SNAP_PATH)) {
40 return QString("%1/@CMAKE_INSTALL_PREFIX@/@DIALER_APP_DIR@/").arg(QString(qgetenv(SNAP_PATH)));
41 } else if (isRunningInstalled()) {
39 return QString("@CMAKE_INSTALL_PREFIX@/@DIALER_APP_DIR@/");42 return QString("@CMAKE_INSTALL_PREFIX@/@DIALER_APP_DIR@/");
40 } else {43 } else {
41 return QString("@CMAKE_SOURCE_DIR@/src/qml/");44 return QString("@CMAKE_SOURCE_DIR@/src/qml/");
@@ -43,7 +46,7 @@
43}46}
4447
45inline QString ubuntuPhonePluginPath() {48inline QString ubuntuPhonePluginPath() {
46 if (isRunningInstalled()) {49 if (isRunningInstalled() || qEnvironmentVariableIsSet(SNAP_PATH)) {
47 return QString::null;50 return QString::null;
48 } else {51 } else {
49 return QString("@CMAKE_SOURCE_DIR@/");52 return QString("@CMAKE_SOURCE_DIR@/");

Subscribers

People subscribed via source and target branches