Ubuntu Shorts App

Merge lp:~zeller-benjamin/ubuntu-rssreader-app/sdkcompat into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. sdkcompat
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 308
Merged at revision: 321
Proposed branch: lp:~zeller-benjamin/ubuntu-rssreader-app/sdkcompat
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 106 lines (+32/-5)
6 files modified
CMakeLists.txt (+9/-2)
article_items/CMakeLists.txt (+4/-0)
click/CMakeLists.txt (+9/-1)
click/manifest.json.in (+3/-2)
debian/rules (+3/-0)
feeds/CMakeLists.txt (+4/-0)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-rssreader-app/sdkcompat
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Ubuntu Shorts Developers Pending
Review via email: mp+233706@code.launchpad.net

Commit message

Make rss reader app cmake project useable out of the Box with QtCreator
- Enable click mode by default
- Hook names in the manifest file can not be variables (Bug:#1366775)
- Disable click mode in debian rules file
- Add variable UBUNTU_MANIFEST_PATH variable so QtC knows where to look
for the manifest file
- Rename apparmor.json to shorts.apparmor (editor support)
- Add qml and js files to custom targets, so they are visible in QtC

Description of the change

Make rss reader app cmake project useable out of the Box with QtCreator
- Enable click mode by default
- Hook names in the manifest file can not be variables (Bug:#1366775)
- Disable click mode in debian rules file
- Add variable UBUNTU_MANIFEST_PATH variable so QtC knows where to look
for the manifest file
- Rename apparmor.json to shorts.apparmor (editor support)
- Add qml and js files to custom targets, so they are visible in QtC

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:307
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/262/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1939
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1939/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/41

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

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

FAILED: Continuous integration, rev:307
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/269/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/470/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/48/console

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

review: Needs Fixing (continuous-integration)
lp:~zeller-benjamin/ubuntu-rssreader-app/sdkcompat updated
308. By Benjamin Zeller

Merge with trunk

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

PASSED: Continuous integration, rev:308
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/270/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/473
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/473/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/49

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

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Great! Thanks!

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

PASSED: Continuous integration, rev:307
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/271/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/475
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/475/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/50

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

review: Approve (continuous-integration)
Revision history for this message
Joey Chan (qqworini) wrote :

So .. Does this make Ctrl + F12 usable ? (ΰΉ‘Β΄Ϊ‘`ΰΉ‘)

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-09-18 20:48:36 +0000
3+++ CMakeLists.txt 2014-09-23 07:39:30 +0000
4@@ -7,7 +7,7 @@
5 include(GNUInstallDirs)
6
7 option(INSTALL_TESTS "Install the tests on make install" on)
8-option(CLICK_MODE "Installs to a contained location" off)
9+option(CLICK_MODE "Installs to a contained location" on)
10
11 set(APP_NAME shorts)
12 set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
13@@ -15,6 +15,7 @@
14 set(MAIN_QML shorts-app.qml)
15 set(ICON_FILE rssreader-app@30.png)
16 set(AUTOPILOT_DIR shorts_app)
17+set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
18
19 if(CLICK_MODE)
20 if(NOT DEFINED BZR_SOURCE)
21@@ -46,7 +47,11 @@
22
23 file(GLOB SRC_FILES
24 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
25- *.qml *.js *.png *.json)
26+ *.qml *.js *.json *.png)
27+
28+# make the files visible in the qtcreator tree
29+add_custom_target(shorts_QMlFiles ALL SOURCES ${SRC_FILES})
30+
31 install(DIRECTORY article_items feeds icons_tmp listview DESTINATION ${DATA_DIR})
32 install(FILES SavedTab.qml TopicTab.qml ShortsTab.qml
33 XmlNetwork.qml OrganicGrid.qml RssFeedPage.qml
34@@ -71,3 +76,5 @@
35 add_subdirectory(click)
36 add_subdirectory(po)
37 add_subdirectory(tests)
38+add_subdirectory(feeds)
39+add_subdirectory(article_items)
40
41=== added file 'article_items/CMakeLists.txt'
42--- article_items/CMakeLists.txt 1970-01-01 00:00:00 +0000
43+++ article_items/CMakeLists.txt 2014-09-23 07:39:30 +0000
44@@ -0,0 +1,4 @@
45+file(GLOB ARTICLE_ITEMS_QML_JS_FILES *.qml *.js)
46+
47+# make the files visible in the qtcreator tree
48+add_custom_target(ubuntu-rssreader-app_article_items_QMlFiles ALL SOURCES ${ARTICLE_ITEMS_QML_JS_FILES})
49
50=== modified file 'click/CMakeLists.txt'
51--- click/CMakeLists.txt 2014-01-31 21:23:34 +0000
52+++ click/CMakeLists.txt 2014-09-23 07:39:30 +0000
53@@ -3,6 +3,14 @@
54 set(BZR_REVNO "latest")
55 endif(NOT BZR_REVNO)
56 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
57- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json
58+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json shorts.apparmor
59 DESTINATION ${CMAKE_INSTALL_PREFIX})
60+
61+ # make the click files visible in qtcreator
62+ file(GLOB CLICK_FILES
63+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
64+ *.json *.json.in *.apparmor)
65+
66+ add_custom_target(com_ubuntu_shorts_CLICKFiles ALL SOURCES ${CLICK_FILES})
67+
68 endif(CLICK_MODE)
69
70=== modified file 'click/manifest.json.in'
71--- click/manifest.json.in 2014-08-05 14:52:07 +0000
72+++ click/manifest.json.in 2014-09-23 07:39:30 +0000
73@@ -1,9 +1,10 @@
74 {
75+ "architecture": "all",
76 "description": "Rss Reader application",
77 "framework": "ubuntu-sdk-14.10-qml-dev3",
78 "hooks": {
79- "@APP_NAME@": {
80- "apparmor": "apparmor.json",
81+ "shorts": {
82+ "apparmor": "shorts.apparmor",
83 "desktop": "@DESKTOP_FILE@"
84 }
85 },
86
87=== renamed file 'click/apparmor.json' => 'click/shorts.apparmor'
88=== modified file 'debian/rules'
89--- debian/rules 2014-01-31 21:23:34 +0000
90+++ debian/rules 2014-09-23 07:39:30 +0000
91@@ -6,3 +6,6 @@
92
93 %:
94 dh $@
95+
96+override_dh_auto_configure:
97+ dh_auto_configure -- -DCLICK_MODE=OFF
98
99=== added file 'feeds/CMakeLists.txt'
100--- feeds/CMakeLists.txt 1970-01-01 00:00:00 +0000
101+++ feeds/CMakeLists.txt 2014-09-23 07:39:30 +0000
102@@ -0,0 +1,4 @@
103+file(GLOB FEEDS_QML_JS_FILES *.qml *.js)
104+
105+# make the files visible in the qtcreator tree
106+add_custom_target(ubuntu-rssreader-app_feeds_QMlFiles ALL SOURCES ${FEEDS_QML_JS_FILES})

Subscribers

People subscribed via source and target branches