Ubuntu File Manager App

Merge lp://staging/~nskaggs/ubuntu-filemanager-app/fix-armhf-build into lp://staging/ubuntu-filemanager-app

fix-armhf-build
Merge into trunk

Proposed by Nicholas Skaggs on 2014-03-18

Status:

Merged

Approved by:

Nicholas Skaggs on 2014-03-26

Approved revision:

145

Merged at revision:

148

Proposed branch:

lp://staging/~nskaggs/ubuntu-filemanager-app/fix-armhf-build

Merge into:

lp://staging/ubuntu-filemanager-app

Diff against target:

38 lines (+5/-4)

1 file modified

CMakeLists.txt (+5/-4)

To merge this branch:

bzr merge lp://staging/~nskaggs/ubuntu-filemanager-app/fix-armhf-build

Related bugs:

Bug #1282500: Cmake file does not add the icon in the click package	High	Fix Released
Bug #1288885: App cannot be started on clean Trusty desktop	Undecided	Fix Released
Bug #1294301: Cmake generated click doesn't work	Critical	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-03-26
Dimitri John Ledkov		2014-03-20	Pending
Ubuntu File Manager Developers		2014-03-18	Pending
Review via email: mp+211621@code.staging.launchpad.net

Commit message

Get cmake building properly

Description of the change

Get cmake building properly

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-03-18:

#

FAILED: Continuous integration, rev:141
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/141/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1790
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/141
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/141
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/91

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/141/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-03-20:

#

Trying to get all the scattered cmake fixes in one place from:

https://code.launchpad.net/~vthompson/ubuntu-filemanager-app/fix-1282500/+merge/208916
https://code.launchpad.net/~popey/ubuntu-filemanager-app/fix-1288885/+merge/210173

and perhaps elsewhere.

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-03-20:

#

FAILED: Continuous integration, rev:142
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/145/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1827
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/145
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/145
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/95

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/145/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-03-20:

#

FAILED: Continuous integration, rev:143
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/146/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1828
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/146
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/146
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/96

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/146/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-03-20:

#

PASSED: Continuous integration, rev:143
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/148/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1831
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/148
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/148
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/98

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/148/rebuild

review: Approve (continuous-integration)

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-03-20:

#

Still need to include the plugin as part of the build so the resulting click package is sound.

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-03-21:

#

We have a proper build of the plugin now

https://launchpad.net/~ubuntu-touch-coreapps-drivers/+archive/daily/+build/5813020

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-03-26:

#

Merging everything, minus the plugin as it will be delayed.

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-03-26:

#

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/51/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1863
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-autolanding/51
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-autolanding/51
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-autolanding/38

review: Needs Fixing (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) on 2014-03-26:

#

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Nicholas Skaggs

Ubuntu File Manager Developers

keshavbhatt