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

[Benjamin Zeller]

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

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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]

308. By Benjamin Zeller on 2014-09-23

Merge with trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Great! Thanks!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Joey Chan (qqworini)]

So .. Does this make Ctrl + F12 usable ? (๑´ڡ`๑)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-18 20:48:36 +0000
+++ CMakeLists.txt	2014-09-23 07:39:30 +0000
@@ -7,7 +7,7 @@
 include(GNUInstallDirs)
 
 option(INSTALL_TESTS "Install the tests on make install" on)
-option(CLICK_MODE "Installs to a contained location" off)
+option(CLICK_MODE "Installs to a contained location" on)
 
 set(APP_NAME shorts)
 set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
@@ -15,6 +15,7 @@
 set(MAIN_QML shorts-app.qml)
 set(ICON_FILE [e-mail])
 set(AUTOPILOT_DIR shorts_app)
+set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
 
 if(CLICK_MODE)
     if(NOT DEFINED BZR_SOURCE)
@@ -46,7 +47,11 @@
 
 file(GLOB SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     *.qml *.js *.png *.json)
+     *.qml *.js *.json *.png)
+
+# make the files visible in the qtcreator tree
+add_custom_target(shorts_QMlFiles ALL SOURCES ${SRC_FILES})
+
 install(DIRECTORY article_items feeds icons_tmp listview DESTINATION ${DATA_DIR})
 install(FILES SavedTab.qml TopicTab.qml ShortsTab.qml
     XmlNetwork.qml OrganicGrid.qml RssFeedPage.qml
@@ -71,3 +76,5 @@
 add_subdirectory(click)
 add_subdirectory(po)
 add_subdirectory(tests)
+add_subdirectory(feeds)
+add_subdirectory(article_items)
 
=== added file 'article_items/CMakeLists.txt'
--- article_items/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ article_items/CMakeLists.txt	2014-09-23 07:39:30 +0000
@@ -0,0 +1,4 @@
+file(GLOB ARTICLE_ITEMS_QML_JS_FILES *.qml *.js)
+
+# make the files visible in the qtcreator tree
+add_custom_target(ubuntu-rssreader-app_article_items_QMlFiles ALL SOURCES ${ARTICLE_ITEMS_QML_JS_FILES})
 
=== modified file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	2014-01-31 21:23:34 +0000
+++ click/CMakeLists.txt	2014-09-23 07:39:30 +0000
@@ -3,6 +3,14 @@
         set(BZR_REVNO "latest")
     endif(NOT BZR_REVNO)
     configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json shorts.apparmor
             DESTINATION ${CMAKE_INSTALL_PREFIX})
+
+    # make the click files visible in qtcreator
+    file(GLOB CLICK_FILES
+         RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+         *.json *.json.in *.apparmor)
+
+    add_custom_target(com_ubuntu_shorts_CLICKFiles ALL SOURCES ${CLICK_FILES})
+
 endif(CLICK_MODE)
 
=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-08-05 14:52:07 +0000
+++ click/manifest.json.in	2014-09-23 07:39:30 +0000
@@ -1,9 +1,10 @@
 {
+    "architecture": "all",
     "description": "Rss Reader application",
     "framework": "ubuntu-sdk-14.10-qml-dev3",
     "hooks": {
-        "@APP_NAME@": {
-            "apparmor": "apparmor.json",
+        "shorts": {
+            "apparmor": "shorts.apparmor",
             "desktop": "@DESKTOP_FILE@"
         }
     },
 
=== renamed file 'click/apparmor.json' => 'click/shorts.apparmor'
=== modified file 'debian/rules'
--- debian/rules	2014-01-31 21:23:34 +0000
+++ debian/rules	2014-09-23 07:39:30 +0000
@@ -6,3 +6,6 @@
 
 %:
 	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DCLICK_MODE=OFF
 
=== added file 'feeds/CMakeLists.txt'
--- feeds/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ feeds/CMakeLists.txt	2014-09-23 07:39:30 +0000
@@ -0,0 +1,4 @@
+file(GLOB FEEDS_QML_JS_FILES *.qml *.js)
+
+# make the files visible in the qtcreator tree
+add_custom_target(ubuntu-rssreader-app_feeds_QMlFiles ALL SOURCES ${FEEDS_QML_JS_FILES})