address-book-app

Merge lp:~zeller-benjamin/address-book-app/sdkcompat into lp:address-book-app

  1. sdkcompat
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Needs review
Proposed branch: lp:~zeller-benjamin/address-book-app/sdkcompat
Merge into: lp:address-book-app
Diff against target: 99 lines (+23/-6)
4 files modified
CMakeLists.txt (+5/-2)
click/CMakeLists.txt (+12/-1)
click/manifest.json.in (+3/-3)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~zeller-benjamin/address-book-app/sdkcompat
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+233894@code.launchpad.net

Commit message

Make address-book app cmake project useable out of the Box with QtCreator
- Enable click mode by default
- Disable click mode in debian rules file
- Add variable UBUNTU_MANIFEST_PATH variable so QtC knows where to look
for the manifest file
- Rename address-book-apparmor.json => address-book.apparmor (editor support)
- Automatically substitute click architecture in the manifest file

Description of the change

Make address-book app cmake project useable out of the Box with QtCreator in devices and emulator,
there is still a problem with running it locally, because the QML plugin is in a nested
directory in the builddir, which is currently not supported.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/681/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4646
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5898
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5898/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12946
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2839
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3741
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3741/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/681/rebuild

review: Approve (continuous-integration)
Reply

Unmerged revisions

304. By Benjamin Zeller

Make address-book useable out of the Box

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-07-18 13:50:18 +0000
3+++ CMakeLists.txt 2014-09-09 09:46:12 +0000
4@@ -9,6 +9,9 @@
5 set(CMAKE_AUTOMOC ON)
6 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG")
7
8+# Tell QtCreator where the manifest file is located and how its named
9+set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
10+
11 # Standard install paths
12 include(GNUInstallDirs)
13 include(autopilot)
14@@ -38,9 +41,9 @@
15 # (regarding syntax consistency, see http://pad.lv/1181187)
16 set(GETTEXT_PACKAGE "address-book-app")
17
18-option(INSTALL_TESTS "Install the tests on make install" on)
19+option(INSTALL_TESTS "Install the tests on make install" off)
20 option(INSTALL_COMPONENTS "Install the Ubuntu contact components" on)
21-option(CLICK_MODE "Installs to a contained location" off)
22+option(CLICK_MODE "Installs to a contained location" on)
23 option(USE_XVFB "Use XVFB to run qml tests" on)
24
25 # Tests
26
27=== removed symlink 'address-book-apparmor.json'
28=== target was u'./click/address-book-apparmor.json'
29=== modified file 'click/CMakeLists.txt'
30--- click/CMakeLists.txt 2014-06-26 01:14:23 +0000
31+++ click/CMakeLists.txt 2014-09-09 09:46:12 +0000
32@@ -2,13 +2,24 @@
33 if(NOT BZR_REVNO)
34 set(BZR_REVNO "latest")
35 endif(NOT BZR_REVNO)
36+
37+ execute_process(
38+ COMMAND dpkg-architecture -qDEB_HOST_ARCH
39+ OUTPUT_VARIABLE CLICK_ARCH
40+ OUTPUT_STRIP_TRAILING_WHITESPACE
41+ )
42+
43 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
44 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
45 DESTINATION ${CMAKE_INSTALL_PREFIX})
46- install(FILES address-book-apparmor.json
47+ install(FILES address-book.apparmor
48 DESTINATION ${CMAKE_INSTALL_PREFIX})
49 install(FILES address-book-content.json
50 DESTINATION ${CMAKE_INSTALL_PREFIX})
51+
52+ # make the files visible in the qtcreator tree
53+ file(GLOB CLICK_FILES *.in *.json *.apparmor)
54+ add_custom_target(click_files ALL SOURCES ${CLICK_FILES})
55 else(CLICK_MODE)
56 install(FILES address-book-content.json
57 DESTINATION ${CMAKE_INSTALL_DATADIR}/content-hub/peers
58
59=== renamed file 'click/address-book-apparmor.json' => 'click/address-book.apparmor'
60=== modified file 'click/manifest.json.in'
61--- click/manifest.json.in 2014-07-09 16:42:19 +0000
62+++ click/manifest.json.in 2014-09-09 09:46:12 +0000
63@@ -1,10 +1,10 @@
64 {
65 "description": "Address Book application to manager contacts",
66 "framework": "ubuntu-sdk-14.10-qml-dev2",
67- "architecture": "armhf",
68+ "architecture": "@CLICK_ARCH@",
69 "hooks": {
70 "address-book": {
71- "apparmor": "address-book-apparmor.json",
72+ "apparmor": "address-book.apparmor",
73 "content-hub": "address-book-content.json",
74 "desktop": "@ADDRESS_BOOK_APP_DESKTOP_FILE@"
75 }
76@@ -18,4 +18,4 @@
77 "vcs-bzr": "lp:address-book-app",
78 "vcs-bzr-revno": "@BZR_REVNO@"
79 }
80-}
81\ No newline at end of file
82+}
83
84=== modified file 'debian/rules'
85--- debian/rules 2014-07-02 20:29:48 +0000
86+++ debian/rules 2014-09-09 09:46:12 +0000
87@@ -8,6 +8,9 @@
88 %:
89 dh $@ --parallel --fail-missing --with translations
90
91+override_dh_auto_configure:
92+ dh_auto_configure -- -DCLICK_MODE=OFF -DINSTALL_TESTS=ON
93+
94 override_dh_translations:
95 # Override dh_translations to work around http://pad.lv/1183262.
96 # Unfortunately, the default build directory is not exposed
97
98=== removed symlink 'manifest.json'
99=== target was u'./click/manifest.json.in'

Subscribers

People subscribed via source and target branches