Merge lp:~zeller-benjamin/ubuntu-clock-app/sdkcompat2 into lp:ubuntu-clock-app

[Benjamin Zeller]

- Add support for UBUNTU_MANIFEST_PATH
- Let cmake set the architecture of the manifest file automatically

- Add support for UBUNTU_MANIFEST_PATH
- Let cmake set the architecture of the manifest file automatically

[lp:~zeller-benjamin/ubuntu-clock-app/sdkcompat2]

89. By Benjamin Zeller on 2014-09-08

Fix manifest file

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

FAILED: Continuous integration, rev:89
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/447/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/239
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/94

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:89
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/449/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/241
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/96

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Works beautifully! Thanks a lot for this. One less thing change to when running on device or emulator :-)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-26 11:20:26 +0000
+++ CMakeLists.txt	2014-09-08 07:40:24 +0000
@@ -1,7 +1,7 @@
 project(com.ubuntu.clock C CXX)
 cmake_minimum_required(VERSION 2.8.9)
 
-set (UBUNTU_PROJECT_TYPE "ClickApp" CACHE INTERNAL "Tells QtCreator this is a Click application project")
+set (UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
 
 find_package(Qt5Core)
@@ -53,12 +53,19 @@
             OUTPUT_VARIABLE QT_IMPORTS_DIR 
             OUTPUT_STRIP_TRAILING_WHITESPACE 
     )
-set(MODULE_PATH ${QT_IMPORTS_DIR}/ClockApp)
+  set(MODULE_PATH ${QT_IMPORTS_DIR}/ClockApp)
 endif(CLICK_MODE)
 
 if(${CLICK_MODE})
   message("-- Configuring manifest.json")
-  configure_file(manifest.json manifest.json)
+ 
+  execute_process(
+    COMMAND dpkg-architecture -qDEB_HOST_ARCH
+    OUTPUT_VARIABLE CLICK_ARCH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+
+  configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
   install(FILES "${APP_HARDCODE}.json" DESTINATION ${CMAKE_INSTALL_PREFIX})
 else(CLICK_MODE)

=== renamed file 'manifest.json' => 'manifest.json.in'
--- manifest.json	2014-09-01 19:43:33 +0000
+++ manifest.json.in	2014-09-08 07:40:24 +0000
@@ -2,7 +2,7 @@
     "name": "com.ubuntu.clock",
     "description": "A sophisticated clock app for Ubuntu Touch",
     "framework": "ubuntu-sdk-14.10-dev2",
-    "architecture": "armhf",
+    "architecture": "@CLICK_ARCH@",
     "title": "Clock",
     "icon": "[e-mail]",
     "hooks": {