Merge lp:~renatofilho/ubuntu-calendar-app/snappy into lp:ubuntu-calendar-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Merged at revision: 871
Proposed branch: lp:~renatofilho/ubuntu-calendar-app/snappy
Merge into: lp:ubuntu-calendar-app
Diff against target: 105 lines (+91/-0)
3 files modified
snapcraft.yaml (+54/-0)
snappy-qt5.conf (+2/-0)
ubuntu-calendar-app.wrapper (+35/-0)
To merge this branch: bzr merge lp:~renatofilho/ubuntu-calendar-app/snappy
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve
Ubuntu Calendar Developers Pending
Review via email: mp+303962@code.launchpad.net

Commit message

Snappy package.

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

PASSED: Continuous integration, rev:871
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-calendar-app-ci/30/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1318
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/295
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1318
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1182
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1182
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1182
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1162
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1162/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1162
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1162/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1162
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1162/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1162
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1162/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1162
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1162/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1162
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1162/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1162
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1162/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1162
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1162/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1162
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1162/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
872. By Renato Araujo Oliveira Filho

Auto detect library path.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'snapcraft.yaml'
2--- snapcraft.yaml 1970-01-01 00:00:00 +0000
3+++ snapcraft.yaml 2016-08-25 19:37:39 +0000
4@@ -0,0 +1,54 @@
5+name: ubuntu-calendar-app
6+version: 0.1
7+summary: Ubuntu calendar app
8+description: Ubuntu calendar app
9+confinement: strict # devmode # use "strict" to enforce system access only via declared interfaces
10+
11+apps:
12+ ubuntu-calendar-app:
13+ command: desktop-launch $SNAP/bin/ubuntu-calendar-app
14+
15+plugs:
16+ gsettings:
17+ interface: gsettings
18+ unity7:
19+ interface: unity7
20+ opengl:
21+ interface: opengl
22+ eds-calendar:
23+ interface: eds
24+ service: calendar
25+ address-book:
26+ interface: address-book
27+
28+parts:
29+ ubuntu-calendar-app:
30+ plugin: cmake
31+ configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
32+ source: .
33+ stage-packages:
34+ - qmlscene
35+ - qml-module-qt-labs-settings
36+ - qml-module-qtcontacts
37+ - qml-module-qtorganizer
38+ - qml-module-ubuntu-components
39+ - qml-module-ubuntu-onlineaccounts
40+ - qtdeclarative5-ubuntu-content1
41+ - qtdeclarative5-ubuntu-syncmonitor0.1
42+ - qtcontact5-galera
43+ - qtorganizer5-eds
44+ - suru-icon-theme
45+ stage:
46+ - -usr/share/pkgconfig/xkeyboard-config.pc
47+ - -usr/share/pkgconfig/shared-mime-info.pc
48+ snap:
49+ - -usr/lib/python3
50+ - -usr/share/doc
51+ - -usr/include
52+ after: [desktop/gtk3]
53+
54+ environment:
55+ plugin: copy
56+ files:
57+ ubuntu-calendar-app.wrapper: bin/ubuntu-calendar-app
58+ snappy-qt5.conf: etc/xdg/qtchooser/snappy-qt5.conf
59
60=== added file 'snappy-qt5.conf'
61--- snappy-qt5.conf 1970-01-01 00:00:00 +0000
62+++ snappy-qt5.conf 2016-08-25 19:37:39 +0000
63@@ -0,0 +1,2 @@
64+./usr/lib/x86_64-linux-gnu/qt5/bin
65+./usr/lib/x86_64-linux-gnu
66
67=== added file 'ubuntu-calendar-app.wrapper'
68--- ubuntu-calendar-app.wrapper 1970-01-01 00:00:00 +0000
69+++ ubuntu-calendar-app.wrapper 2016-08-25 19:37:39 +0000
70@@ -0,0 +1,35 @@
71+#!/bin/bash
72+if [ "$SNAP_ARCH" == "amd64" ]; then
73+ ARCH="x86_64-linux-gnu"
74+elif [ "$SNAP_ARCH" == "armhf" ]; then
75+ ARCH="arm-linux-gnueabihf"
76+else
77+ ARCH="$SNAP_ARCH-linux-gnu"
78+fi
79+export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH:$LD_LIBRARY_PATH
80+
81+# XKB config
82+export XKB_CONFIG_ROOT=$SNAP/usr/share/X11/xkb
83+
84+# Qt Platform to Mir
85+export QTCHOOSER_NO_GLOBAL_DIR=1
86+export QT_SELECT=snappy-qt5
87+
88+# Qt Libs
89+export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/qt5/libs:$LD_LIBRARY_PATH
90+export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/pulseaudio:$LD_LIBRARY_PATH
91+
92+# Qt Modules
93+export QT_PLUGIN_PATH=$SNAP/usr/lib/$ARCH/qt5/plugins
94+export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/usr/lib/$ARCH/qt5/qml
95+export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/lib/$ARCH
96+
97+# Necessary for the SDK to find the translations directory
98+export APP_DIR=$SNAP
99+
100+# Mesa Libs
101+export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/mesa:$LD_LIBRARY_PATH
102+export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/mesa-egl:$LD_LIBRARY_PATH
103+
104+exec $SNAP/usr/lib/$ARCH/qt5/bin/qmlscene $SNAP/usr/share/calendar-app/calendar.qml
105+

Subscribers

People subscribed via source and target branches

to status/vote changes: