Merge lp:~zeller-benjamin/notes-app/sdkcompat into lp:notes-app

[Benjamin Zeller]

Make notes 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 notes-apparmor.json => notes.apparmor (editor support)
- Automatically substitute click architecture in the manifest file

Make notes 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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/notes-app-ci/317/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-i386-ci/20
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/516
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/589
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12942
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3740
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3740/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notes-app-ci/317/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

289. By Benjamin Zeller on 2014-09-09

Make notes 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 notes-apparmor.json => notes.apparmor (editor support)
- Automatically substitute click architecture in the manifest file

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-20 16:52:42 +0000
+++ CMakeLists.txt	2014-09-09 09:16:59 +0000
@@ -27,8 +27,8 @@
     ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP})
 endif()
 
-option(INSTALL_TESTS "Install the tests on make install" on)
-option(CLICK_MODE "Installs to a contained location" off)
+option(INSTALL_TESTS "Install the tests on make install" off)
+option(CLICK_MODE "Installs to a contained location" on)
 
 if(CLICK_MODE)
     set(CMAKE_INSTALL_PREFIX "/")
@@ -43,6 +43,11 @@
 set(NOTES_APP notes-app)
 set(AUTOPILOT_DIR notes_app)
 set(ICON_FILE [e-mail])
+set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
+
+# make non compiled files visible in qtcreator
+file(GLOB_RECURSE NON_COMPILED_FILES *.qml *.js *.py *.svg *.png *.in *.json *.desktop *.pot *.apparmor qmldir)
+add_custom_target(NON_COMPILED_TARGET ALL SOURCES ${NON_COMPILED_FILES})
 
 if(NOT CLICK_MODE)
     set(NOTES_APP_DIR ${CMAKE_INSTALL_DATADIR}/${NOTES_APP})
 
=== modified file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	2013-09-23 16:29:47 +0000
+++ click/CMakeLists.txt	2014-09-09 09:16:59 +0000
@@ -2,9 +2,16 @@
     if(NOT BZR_REVNO)
         set(BZR_REVNO "trunk")
     endif(NOT BZR_REVNO)
+
+    execute_process(
+      COMMAND dpkg-architecture -qDEB_HOST_ARCH
+      OUTPUT_VARIABLE CLICK_ARCH
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
     configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
             DESTINATION ${CMAKE_INSTALL_PREFIX})
-    install(FILES notes-apparmor.json
+    install(FILES notes.apparmor
             DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif(CLICK_MODE)
 
=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-04-10 10:38:52 +0000
+++ click/manifest.json.in	2014-09-09 09:16:59 +0000
@@ -1,24 +1,23 @@
 {
-    "architecture": "armhf",
-    "description": 
-        "Note taking application for the Ubuntu platform",
-    "framework": "ubuntu-sdk-14.04-dev1", 
+    "architecture": "@CLICK_ARCH@",
+    "description": "Note taking application for the Ubuntu platform",
+    "framework": "ubuntu-sdk-14.04-dev1",
     "hooks": {
         "notes": {
-            "apparmor": "notes-apparmor.json", 
+            "apparmor": "notes.apparmor",
             "desktop": "@CMAKE_INSTALL_DATADIR@/applications/@DESKTOP_FILE@"
         }
-    }, 
+    },
     "icon": "notepad",
     "maintainer": "Ubuntu Developers <[e-mail]>",
-    "name": "com.ubuntu.notes", 
-    "title": "Notes", 
+    "name": "com.ubuntu.notes",
+    "title": "Notes",
     "version": "1.4.@BZR_REVNO@",
     "x-source": {
-        "vcs-bzr": "lp:notes-app", 
+        "vcs-bzr": "lp:notes-app",
         "vcs-bzr-revno": "@BZR_REVNO@"
     },
     "x-test": {
-	"autopilot": "@AUTOPILOT_DIR@"
+        "autopilot": "@AUTOPILOT_DIR@"
     }
 }
 
=== renamed file 'click/notes-apparmor.json' => 'click/notes.apparmor'
=== modified file 'debian/rules'
--- debian/rules	2014-04-10 10:38:52 +0000
+++ debian/rules	2014-09-09 09:16:59 +0000
@@ -13,6 +13,9 @@
 %:
 	dh $@ --parallel --with translations,python3
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DCLICK_MODE=OFF -DINSTALL_TESTS=ON
+
 override_dh_install:
 	dh_install --fail-missing
 
 
=== modified file 'src/NotesApp/Plugins/CMakeLists.txt'
--- src/NotesApp/Plugins/CMakeLists.txt	2013-05-07 15:45:23 +0000
+++ src/NotesApp/Plugins/CMakeLists.txt	2014-09-09 09:16:59 +0000
@@ -22,6 +22,9 @@
 endfunction(QUERY_QMAKE)
 query_qmake(QT_INSTALL_QML QT_IMPORTS_DIR)
 
+#make sure that the qmldir file is in the QML2_IMPORT_PATH when running from QtC
+file(COPY qmldir DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
 set(PLUGIN_DIR ${QT_IMPORTS_DIR}/NotesApp/Plugins)
 install(TARGETS notes-app-plugin DESTINATION ${PLUGIN_DIR})
 install(FILES qmldir DESTINATION ${PLUGIN_DIR})