history-service

Merge lp:~renatofilho/history-service/snap-path into lp:history-service

  1. snap-path
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 233
Merged at revision: 231
Proposed branch: lp:~renatofilho/history-service/snap-path
Merge into: lp:history-service
Diff against target: 66 lines (+48/-1)
2 files modified
daemon/pluginmanager.cpp (+1/-1)
snapcraft.yaml (+47/-0)
To merge this branch: bzr merge lp:~renatofilho/history-service/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+311412@code.launchpad.net

Commit message

Append "SNAP" prefix into the path to the plugins dir if none is set.

To post a comment you must log in.
lp:~renatofilho/history-service/snap-path updated
232. By Renato Araujo Oliveira Filho

Created snap package.

233. By Renato Araujo Oliveira Filho

Does not use "CLICK_MODE" build flag.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:231
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/34/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2024/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2027
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1857
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1857/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1857
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1857/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1857
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1857/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1857
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1857/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1857
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1857/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1857
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1857/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1857/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1857/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1857/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:233
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/35/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2025/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2028
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1858
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1858/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1858
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1858/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1858
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1858/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1858
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1858/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1858
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1858/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1858
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1858/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1858
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1858/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1858
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1858/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1858/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/35/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
1=== modified file 'daemon/pluginmanager.cpp'
2--- daemon/pluginmanager.cpp 2013-11-28 12:25:07 +0000
3+++ daemon/pluginmanager.cpp 2016-11-21 16:51:29 +0000
4@@ -55,7 +55,7 @@
5 {
6 QString pluginPath = qgetenv("HISTORY_PLUGIN_PATH");
7 if (pluginPath.isEmpty()) {
8- pluginPath = HISTORY_PLUGIN_PATH;
9+ pluginPath = qgetenv("SNAP") + HISTORY_PLUGIN_PATH;
10 }
11
12 QDir dir(pluginPath);
13
14=== added directory 'snap'
15=== added directory 'snap/ubuntu-app-platform'
16=== added file 'snapcraft.yaml'
17--- snapcraft.yaml 1970-01-01 00:00:00 +0000
18+++ snapcraft.yaml 2016-11-21 16:51:29 +0000
19@@ -0,0 +1,47 @@
20+name: history-service
21+version: 0.1
22+summary: History service to store messages and calls
23+description: A service to record the messages that are sent and received and the calls that are made in the Ubuntu Touch platform.
24+confinement: devmode # use "strict" to enforce system access only via declared interfaces
25+grade: devel
26+
27+apps:
28+ history-service:
29+ command: desktop-launch $SNAP/usr/bin/history-daemon
30+ plugs: [platform]
31+
32+plugs:
33+ platform:
34+ interface: content
35+ content: ubuntu-app-platform1
36+ target: ubuntu-app-platform
37+ default-provider: ubuntu-app-platform
38+
39+#slots:
40+# history:
41+# interface: history
42+
43+parts:
44+ history-service:
45+ plugin: cmake
46+ configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCMAKE_CROSSCOMPILING=On]
47+ source: .
48+ build-packages:
49+ - cmake
50+ - dh-translations
51+ - dconf-cli
52+ - libphonenumber-dev
53+ - libsqlite3-dev
54+ - libtelepathy-qt5-dev
55+ - pkg-config
56+ - qt5-default
57+ - qtbase5-dev
58+ - qtdeclarative5-dev
59+ - qtpim5-dev
60+
61+ after: [desktop-ubuntu-app-platform]
62+
63+ environment:
64+ source: snap
65+ plugin: dump
66+

Subscribers

People subscribed via source and target branches