Merge lp:~dpm/ubuntu-filemanager-app/click-everywhere into lp:ubuntu-filemanager-app

Proposed by David Planella on 2014-04-24
Status: Merged
Approved by: Nicholas Skaggs on 2014-04-24
Approved revision: 164
Merged at revision: 163
Proposed branch: lp:~dpm/ubuntu-filemanager-app/click-everywhere
Merge into: lp:ubuntu-filemanager-app
Prerequisite: lp:~dpm/ubuntu-filemanager-app/fix-libname
Diff against target: 37 lines (+8/-4)
2 files modified
CMakeLists.txt (+5/-1)
manifest.json (+3/-3)
To merge this branch: bzr merge lp:~dpm/ubuntu-filemanager-app/click-everywhere
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve on 2014-04-24
Carlos Jose Mazieri 2014-04-24 Approve on 2014-04-24
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-04-24
Review via email: mp+217056@code.launchpad.net

Commit message

Make the click build to work with both Qt Creator and click-buddy

Now you should be able to build the package on either:

1) Qt Creator

- Remember to 1) go to the Projects tab 2) click on the "Build" subtab of the "UbuntuSDK for armhf..." tab 3) Then go to the "CMake arguments" text field and add "-DCLICK_MODE=on" without the quotes

2) Click-buddy

$ click-buddy --dir . --arch armhf --framework ubuntu-sdk-14.04

Description of the change

Make the click build to work with both Qt Creator and click-buddy

To post a comment you must log in.
Nicholas Skaggs (nskaggs) wrote :

Whoa, so the BZR_REVNO issue is the only one issue? If so, this is awesome! We'll need to fix the other apps as well.

Great.

review: Approve
Nicholas Skaggs (nskaggs) wrote :

I can't speak fully to qtcreator, but certainly this fixes the issues with building clicks.

review: Approve

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-04-09 21:28:47 +0000
3+++ CMakeLists.txt 2014-04-24 14:15:46 +0000
4@@ -39,7 +39,11 @@
5 set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
6 set(DESKTOP_DIR ${DATA_DIR})
7 set(URLS_DIR ${DATA_DIR})
8- install(FILES manifest.json apparmor.json DESTINATION ${CMAKE_INSTALL_PREFIX})
9+ if(NOT BZR_REVNO)
10+ set(BZR_REVNO "latest")
11+ endif(NOT BZR_REVNO)
12+ configure_file(manifest.json ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
13+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json DESTINATION ${CMAKE_INSTALL_PREFIX})
14 else(CLICK_MODE)
15 execute_process(
16 COMMAND qmake -query QT_INSTALL_QML
17
18=== modified file 'manifest.json'
19--- manifest.json 2014-04-15 08:19:12 +0000
20+++ manifest.json 2014-04-24 14:15:46 +0000
21@@ -13,12 +13,12 @@
22 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
23 "name": "com.ubuntu.filemanager",
24 "title": "File Manager",
25- "version": "0.3",
26+ "version": "0.3.@BZR_REVNO@",
27 "x-source": {
28 "vcs-bzr": "lp:ubuntu-filemanager-app",
29- "vcs-bzr-revno": "latest"
30+ "vcs-bzr-revno": "@BZR_REVNO@"
31 },
32 "x-test": {
33 "autopilot": "ubuntu_filemanager_app"
34 }
35-}
36\ No newline at end of file
37+}

Subscribers

People subscribed via source and target branches