Merge lp:~gary-wzl77/day-scope/arch_and_shadow_build into lp:day-scope

[Gary.Wang]

1.detect arch when cmake to make sure click package name correct.
2.do not generate file in build-in source folder when shadow build.

1.detect arch when cmake to make sure click package name correct.
2.do not generate file in build-in source folder when shadow build.

[Kyle Nitzsche (knitzsche)]

LGTM

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-11 00:51:35 +0000
+++ CMakeLists.txt	2016-07-13 03:58:57 +0000
@@ -1,4 +1,4 @@
-set(VERSION "1.5")
+set(VERSION "1.5.2")
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
@@ -6,6 +6,13 @@
 project(day CXX)
 cmake_minimum_required(VERSION 2.8.12)
 
+# This command figures out the target architecture and puts it into the manifest file
+execute_process(
+  COMMAND dpkg-architecture -qDEB_HOST_ARCH
+  OUTPUT_VARIABLE ARCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pedantic -Wall -Wextra -s")
 set(UBUNTU_PROJECT_TYPE "Scope" CACHE INTERNAL "Tells QtCreator this is a Scope project")
 
@@ -32,7 +39,6 @@
 set(GETTEXT_DOMAIN ${SCOPE_NAME})
 set(AUTHOR "Canonical Ltd.")
 set(MAINTAINER "Kyle Nitzsche <[e-mail]>")
-set(ARCH "armhf")
 
 # AUTOPILOT GENERIC TESTS CONTROL ===============================
 # These settings control whether generic autopilot tests are run
@@ -75,12 +81,12 @@
 )
 
 configure_file (
-    "manifest.json.in"
-    "manifest.json"
+    "${CMAKE_CURRENT_SOURCE_DIR}/manifest.json.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/manifest.json"
 )
 configure_file (
-    "security.json.in"
-    "${PKG_PREFIX}.${PKG}_${APP}.security.json"
+    "${CMAKE_CURRENT_SOURCE_DIR}/security.json.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/${PKG_PREFIX}.${PKG}_${APP}.security.json"
 )
 
 add_subdirectory(tests)
@@ -89,5 +95,5 @@
 add_subdirectory(data)
 add_subdirectory(po)
 
-install(FILES manifest.json DESTINATION "/")
-install(FILES "${PKG_PREFIX}.${PKG}_${APP}.security.json" DESTINATION "/")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION "/")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PKG_PREFIX}.${PKG}_${APP}.security.json" DESTINATION "/")
 
=== modified file 'manifest.json.in'
--- manifest.json.in	2016-07-11 00:51:35 +0000
+++ manifest.json.in	2016-07-13 03:58:57 +0000
@@ -2,7 +2,7 @@
     "name": "${PKG_PREFIX}.${PKG}",
     "description": "${DISPLAY_DESC}",
     "framework": "ubuntu-sdk-15.04.4",
-    "architecture": "armhf",
+    "architecture": "${ARCH}",
     "title": "${DISPLAY_NAME}",
     "hooks": {
         "${SCOPE_NAME}": {