Merge lp:~zeller-benjamin/ubuntu-weather-app/sdkcompat into lp:ubuntu-weather-app/obsolete.trunk

[Benjamin Zeller]

Make Weather 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
- 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 weather.apparmor (editor support)
- Make sure qml/js files are shown in the project tree

Make Weather 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
- 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 weather.apparmor (editor support)
- Make sure qml/js files are shown in the project tree

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

FAILED: Continuous integration, rev:361
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/262/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/95/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/68/console

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

review: Needs Fixing (continuous-integration)

[lp:~zeller-benjamin/ubuntu-weather-app/sdkcompat]

362. By Benjamin Zeller on 2014-09-09

Added missing file

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

PASSED: Continuous integration, rev:362
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/264/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/97
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/97/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/70

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Looks okay for me, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-13 07:04:41 +0000
+++ CMakeLists.txt	2014-09-09 06:12:45 +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 weather)
 set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
@@ -15,6 +15,7 @@
 set(MAIN_QML ubuntu-weather-app.qml)
 set(ICON_FILE [e-mail])
 set(AUTOPILOT_DIR ubuntu_weather_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)
@@ -65,6 +66,10 @@
 # Tests
 enable_testing()
 
+file(GLOB QML_JS_FILES *.qml *.js)
+add_custom_target(ubuntu-weather-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
+
 add_subdirectory(click)
 add_subdirectory(po)
 add_subdirectory(tests)
+add_subdirectory(components)

=== modified file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	2014-01-31 21:06:15 +0000
+++ click/CMakeLists.txt	2014-09-09 06:12:45 +0000
@@ -3,6 +3,13 @@
         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 weather.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_weather_CLICKFiles ALL SOURCES ${CLICK_FILES})
 endif(CLICK_MODE)

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-08-13 07:04:41 +0000
+++ click/manifest.json.in	2014-09-09 06:12:45 +0000
@@ -1,9 +1,10 @@
 {
+    "architecture": "all",
     "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
     "framework": "ubuntu-sdk-14.10-qml-dev3",
     "hooks": {
-        "@APP_NAME@": {
-            "apparmor": "apparmor.json",
+        "weather": {
+            "apparmor": "weather.apparmor",
             "desktop": "@DESKTOP_FILE@"
         }
     },

=== renamed file 'click/apparmor.json' => 'click/weather.apparmor'
=== added file 'components/CMakeLists.txt'
--- components/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ components/CMakeLists.txt	2014-09-09 06:12:45 +0000
@@ -0,0 +1,2 @@
+file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
+add_custom_target(ubuntu-weather-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})

=== modified file 'debian/rules'
--- debian/rules	2014-01-31 21:06:15 +0000
+++ debian/rules	2014-09-09 06:12:45 +0000
@@ -6,3 +6,6 @@
 
 %:
 	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DCLICK_MODE=OFF