mediaplayer-app

Merge lp:~artmello/mediaplayer-app/mediaplayer-app-changes_snapcraft into lp:mediaplayer-app

  1. mediaplayer-app-changes_snapcraft
  2. Merge into trunk
Proposed by Arthur Mello
Status: Approved
Approved by: Jim Hodapp
Approved revision: 423
Proposed branch: lp:~artmello/mediaplayer-app/mediaplayer-app-changes_snapcraft
Merge into: lp:mediaplayer-app
Prerequisite: lp:~phablet-team/mediaplayer-app/snap-it-up
Diff against target: 53 lines (+8/-12)
2 files modified
mediaplayer-app.wrapper (+1/-9)
snapcraft.yaml (+7/-3)
To merge this branch: bzr merge lp:~artmello/mediaplayer-app/mediaplayer-app-changes_snapcraft
Reviewer Review Type Date Requested Status
Jim Hodapp (community) code Approve
system-apps-ci-bot continuous-integration Approve
Review via email: mp+306942@code.launchpad.net

Commit message

Instead of using a wrapper use desktop-launch on snap pkg
Rename copy plugin to dump on snapcraft.yaml

Description of the change

Instead of using a wrapper use desktop-launch on snap pkg
Rename copy plugin to dump on snapcraft.yaml

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:422
https://jenkins.canonical.com/system-apps/job/lp-mediaplayer-app-ci/18/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1646
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/392
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1646
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1492
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1492/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1492
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1492/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1492
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1492/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1492
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1492/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1492
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1492/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1492
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1492/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1492
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1492/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1492
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1492/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1492
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1492/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Reply
Revision history for this message
Jim Hodapp (jhodapp) :
review: Needs Information
Reply
lp:~artmello/mediaplayer-app/mediaplayer-app-changes_snapcraft updated
423. By Arthur Mello

Add again the mediaplayer-app.wrapper to handle a missing var
Remove unnecessary info from snapcraft.yaml

Revision history for this message
Arthur Mello (artmello) wrote :

I verified the env variables that are set by the desktop-launch script. It was almost the same as the one that we were setting on the wrapper. Only one that is missing is QML2IMPORT_PATH, so I keep the wrapper to set that.

It seems during my tests that setting the paths on organize with the dump plugin is enough to correct place them on the final snap. So I remove the stage/snap sets

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

PASSED: Continuous integration, rev:423
https://jenkins.canonical.com/system-apps/job/lp-mediaplayer-app-ci/19/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1684
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/400
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1684
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1530
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1530/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1530
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1530/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1530
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1530/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1530
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1530/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1530
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1530/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1530
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1530/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1530
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1530/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1530
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1530/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1530
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1530/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Reply
Revision history for this message
Jim Hodapp (jhodapp) wrote :

LGTM

review: Approve (code)
Reply
Revision history for this message
Jim Hodapp (jhodapp) wrote :

Any plans to land this MR still Arthur?

Reply

Unmerged revisions

423. By Arthur Mello

Add again the mediaplayer-app.wrapper to handle a missing var
Remove unnecessary info from snapcraft.yaml

422. By Arthur Mello

Instead of using a wrapper use desktop-launch on snap pkg
Rename copy plugin to dump on snapcraft.yaml

421. By Arthur Mello

Merge with lp:~phablet-team/mediaplayer-app/snap-it-up

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mediaplayer-app.wrapper'
2--- mediaplayer-app.wrapper 2016-09-06 19:22:48 +0000
3+++ mediaplayer-app.wrapper 2016-09-29 20:22:20 +0000
4@@ -8,16 +8,8 @@
5 ARCH="$SNAP_ARCH-linux-gnu"
6 fi
7
8-export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH:$LD_LIBRARY_PATH
9-
10-# Qt Libs
11-export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/qt5/libs:$LD_LIBRARY_PATH
12-
13 # Qt Modules
14-export QT_PLUGIN_PATH=$SNAP/usr/lib/$ARCH/qt5/plugins
15 export QML2IMPORT_PATH=$SNAP/usr/share/mediaplayer-app/qml/
16 export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/usr/lib/$ARCH/qt5/qml/
17
18-echo QT_PLUGIN_PATH=$QT_PLUGIN_PATH
19-
20-exec "$SNAP/usr/bin/mediaplayer-app" "$@"
21+exec "$SNAP/bin/desktop-launch" "mediaplayer-app" "$@"
22
23=== modified file 'snapcraft.yaml'
24--- snapcraft.yaml 2016-09-08 20:56:15 +0000
25+++ snapcraft.yaml 2016-09-29 20:22:20 +0000
26@@ -5,11 +5,12 @@
27 A QML media player that can play audio/video sources.
28 Please find the source at:
29 https://code.launchpad.net/mediaplayer-app
30+grade: stable
31 confinement: strict
32
33 apps:
34 mediaplayer-app:
35- command: usr/bin/mediaplayer-app
36+ command: bin/mediaplayer-app
37 plugs: [mpris]
38
39 parts:
40@@ -63,8 +64,11 @@
41 snap:
42 - $unwanted
43
44+ after: [desktop-qt5]
45+
46 environment:
47- plugin: copy
48- files:
49+ source: .
50+ plugin: dump
51+ organize:
52 mediaplayer-app.wrapper: bin/mediaplayer-app
53 debian/copyright: usr/share/doc/mediaplayer-app/copyright

Subscribers

People subscribed via source and target branches