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

Proposed by Gary.Wang on 2016-07-13
Status: Merged
Approved by: Kyle Nitzsche on 2016-07-13
Approved revision: 52
Merged at revision: 52
Proposed branch: lp:~gary-wzl77/day-scope/arch_and_shadow_build
Merge into: lp:day-scope
Diff against target: 69 lines (+15/-9)
2 files modified
CMakeLists.txt (+14/-8)
manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~gary-wzl77/day-scope/arch_and_shadow_build
Reviewer Review Type Date Requested Status
Kyle Nitzsche 2016-07-13 Approve on 2016-07-13
Review via email: mp+299903@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
Kyle Nitzsche (knitzsche) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1set(VERSION "1.5")1set(VERSION "1.5.2")
22
3# Supress qDebug() output3# Supress qDebug() output
4ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )4ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
@@ -6,6 +6,13 @@
6project(day CXX)6project(day CXX)
7cmake_minimum_required(VERSION 2.8.12)7cmake_minimum_required(VERSION 2.8.12)
88
9# This command figures out the target architecture and puts it into the manifest file
10execute_process(
11 COMMAND dpkg-architecture -qDEB_HOST_ARCH
12 OUTPUT_VARIABLE ARCH
13 OUTPUT_STRIP_TRAILING_WHITESPACE
14)
15
9set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pedantic -Wall -Wextra -s")16set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pedantic -Wall -Wextra -s")
10set(UBUNTU_PROJECT_TYPE "Scope" CACHE INTERNAL "Tells QtCreator this is a Scope project")17set(UBUNTU_PROJECT_TYPE "Scope" CACHE INTERNAL "Tells QtCreator this is a Scope project")
1118
@@ -32,7 +39,6 @@
32set(GETTEXT_DOMAIN ${SCOPE_NAME})39set(GETTEXT_DOMAIN ${SCOPE_NAME})
33set(AUTHOR "Canonical Ltd.")40set(AUTHOR "Canonical Ltd.")
34set(MAINTAINER "Kyle Nitzsche <kyle.nitzsche@canonical.com>")41set(MAINTAINER "Kyle Nitzsche <kyle.nitzsche@canonical.com>")
35set(ARCH "armhf")
3642
37# AUTOPILOT GENERIC TESTS CONTROL ===============================43# AUTOPILOT GENERIC TESTS CONTROL ===============================
38# These settings control whether generic autopilot tests are run44# These settings control whether generic autopilot tests are run
@@ -75,12 +81,12 @@
75)81)
7682
77configure_file (83configure_file (
78 "manifest.json.in"84 "${CMAKE_CURRENT_SOURCE_DIR}/manifest.json.in"
79 "manifest.json"85 "${CMAKE_CURRENT_BINARY_DIR}/manifest.json"
80)86)
81configure_file (87configure_file (
82 "security.json.in"88 "${CMAKE_CURRENT_SOURCE_DIR}/security.json.in"
83 "${PKG_PREFIX}.${PKG}_${APP}.security.json"89 "${CMAKE_CURRENT_BINARY_DIR}/${PKG_PREFIX}.${PKG}_${APP}.security.json"
84)90)
8591
86add_subdirectory(tests)92add_subdirectory(tests)
@@ -89,5 +95,5 @@
89add_subdirectory(data)95add_subdirectory(data)
90add_subdirectory(po)96add_subdirectory(po)
9197
92install(FILES manifest.json DESTINATION "/")98install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION "/")
93install(FILES "${PKG_PREFIX}.${PKG}_${APP}.security.json" DESTINATION "/")99install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PKG_PREFIX}.${PKG}_${APP}.security.json" DESTINATION "/")
94100
=== 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 @@
2 "name": "${PKG_PREFIX}.${PKG}",2 "name": "${PKG_PREFIX}.${PKG}",
3 "description": "${DISPLAY_DESC}",3 "description": "${DISPLAY_DESC}",
4 "framework": "ubuntu-sdk-15.04.4",4 "framework": "ubuntu-sdk-15.04.4",
5 "architecture": "armhf",5 "architecture": "${ARCH}",
6 "title": "${DISPLAY_NAME}",6 "title": "${DISPLAY_NAME}",
7 "hooks": {7 "hooks": {
8 "${SCOPE_NAME}": {8 "${SCOPE_NAME}": {

Subscribers

People subscribed via source and target branches

to all changes: