Merge lp:~nskaggs/reminders-app/fix-cmake-build2 into lp:reminders-app

Proposed by Nicholas Skaggs
Status: Rejected
Rejected by: Nicholas Skaggs
Proposed branch: lp:~nskaggs/reminders-app/fix-cmake-build2
Merge into: lp:reminders-app
Diff against target: 12 lines (+2/-0)
1 file modified
CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~nskaggs/reminders-app/fix-cmake-build2
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Michael Zanetti Pending
David Planella Pending
Review via email: mp+205980@code.launchpad.net

This proposal supersedes a proposal from 2014-02-11.

Commit message

Fix cmake build

Description of the change

Cmake build fails in trunk, this should correct it allowing valid builds again. I believe the failure was introduced during the change to reminders from reminders-app.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote : Posted in a previous version of this proposal

Thanks Nick for looking into this.

To be able to review this, could you describe how exactly the build is failing and how to reproduce the build failure?

Running the following to create the package manually seems to work, and I haven't seen any build failures building from Qt Creator. However Jenkins probably does the build differently.

bzr branch lp:reminders-app
mkdir ../build-reminders
cd ../build-reminders
QT_SELECT=qt5 cmake ../reminders-app/ -DCLICK_MODE=1
make -j2
make install DESTDIR=install
click build install

review: Needs Information
Revision history for this message
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

Huh? This actually breaks compilation here as reminders.in is not in the repo any more. Looks like you have a dirty working dir.

We don't want to generate a script for calling qmlscene any more as reminders doesn't support being run by qmlscene. We need our own compiled binary.

review: Disapprove
Revision history for this message
Nicholas Skaggs (nskaggs) wrote : Posted in a previous version of this proposal

@dpm, I'm not sure why jenkins doesn't like to build it, I'll have to look deeper today. I did use this to build the latest reminders and push to the store.

@mzanetti, it's a 2 line change, nothing to do with qmlscene, etc. It adds back the configure step. If you are seeing more perhaps something is wrong with the branch.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Repulled trunk and remade changes. Things look the same here to me.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:62
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nskaggs/reminders-app/fix-cmake-build2/+merge/205980/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/206/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1253/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/206/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/206/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/206/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

@Nicholas: The configure change you reintroduced was to generate a script calling qmlscene reminders-app.qml. That's why I pointed out the above qmlscene thing.

Please make sure you don't have the "reminders.in" file around any more as that one is probably able to cause the issue you're seeing.

Unmerged revisions

62. By Nicholas Skaggs

fix cmake

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-02-05 10:14:57 +0000
3+++ CMakeLists.txt 2014-02-12 15:00:52 +0000
4@@ -37,6 +37,8 @@
5 set(DESKTOP_DIR ${DATA_DIR})
6 else(CLICK_MODE)
7 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
8+ configure_file(${APP_HARDCODE}.in
9+ ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
10 set(EXEC "reminders")
11 set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
12 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)

Subscribers

People subscribed via source and target branches