Mir

Merge lp:~alan-griffiths/mir/create-accessory into lp:~mir-team/mir/trunk

Proposed by Alan Griffiths
Status: Merged
Approved by: Robert Ancell
Approved revision: no longer in the source branch.
Merged at revision: 498
Proposed branch: lp:~alan-griffiths/mir/create-accessory
Merge into: lp:~mir-team/mir/trunk
Diff against target: 73 lines (+10/-4)
6 files modified
debian/libmirclient-demos.examples (+3/-3)
examples/CMakeLists.txt (+1/-0)
src/CMakeLists.txt (+1/-0)
src/accessory/CMakeLists.txt (+3/-0)
src/shared/CMakeLists.txt (+0/-1)
tests/integration-tests/CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~alan-griffiths/mir/create-accessory
Reviewer Review Type Date Requested Status
Robert Ancell Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+153210@code.launchpad.net

Commit message

accessory: a place for that supplementary code, used mainly for convenience.

Description of the change

accessory: a place for that supplementary code, used mainly for convenience.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:498
http://jenkins.qa.ubuntu.com/job/mir-ci/72/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/73/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/72/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:499
http://jenkins.qa.ubuntu.com/job/mir-ci/74/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/75/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/74/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Sure

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/libmirclient-demos.examples'
2--- debian/libmirclient-demos.examples 2013-03-11 18:20:30 +0000
3+++ debian/libmirclient-demos.examples 2013-03-13 20:39:18 +0000
4@@ -2,6 +2,6 @@
5 examples/demo_client_accelerated.cpp
6 examples/demo_client_unaccelerated.c
7 examples/README
8-include/shared/mir/draw/graphics.h
9-include/shared/mir/draw/mir_image.h
10-src/shared/draw/graphics_utils.cpp
11+include/accessory/mir/draw/graphics.h
12+include/accessory/mir/draw/mir_image.h
13+src/accessory/draw/graphics_utils.cpp
14
15=== modified file 'examples/CMakeLists.txt'
16--- examples/CMakeLists.txt 2013-03-13 07:41:46 +0000
17+++ examples/CMakeLists.txt 2013-03-13 20:39:18 +0000
18@@ -83,6 +83,7 @@
19 )
20
21 include_directories(
22+ ${PROJECT_SOURCE_DIR}/include/accessory
23 ${PROJECT_SOURCE_DIR}/include/server
24 ${PROJECT_SOURCE_DIR}/include/client
25 ${GLESv2_INCLUDE_DIRS}
26
27=== added directory 'include/accessory'
28=== added directory 'include/accessory/mir'
29=== renamed directory 'include/shared/mir/draw' => 'include/accessory/mir/draw'
30=== modified file 'src/CMakeLists.txt'
31--- src/CMakeLists.txt 2013-03-13 07:41:46 +0000
32+++ src/CMakeLists.txt 2013-03-13 20:39:18 +0000
33@@ -4,6 +4,7 @@
34
35 add_subdirectory(server/)
36 add_subdirectory(client/)
37+add_subdirectory(accessory/)
38
39 set(
40 MIR_GENERATED_INCLUDE_DIRECTORIES
41
42=== added directory 'src/accessory'
43=== added file 'src/accessory/CMakeLists.txt'
44--- src/accessory/CMakeLists.txt 1970-01-01 00:00:00 +0000
45+++ src/accessory/CMakeLists.txt 2013-03-13 20:39:18 +0000
46@@ -0,0 +1,3 @@
47+include_directories(${PROJECT_SOURCE_DIR}/include/accessory)
48+
49+add_subdirectory(draw/)
50
51=== renamed directory 'src/shared/draw' => 'src/accessory/draw'
52=== modified file 'src/shared/CMakeLists.txt'
53--- src/shared/CMakeLists.txt 2013-03-11 17:42:55 +0000
54+++ src/shared/CMakeLists.txt 2013-03-13 20:39:18 +0000
55@@ -1,6 +1,5 @@
56 set(MIR_GENERATED_INCLUDE_DIRECTORIES)
57 add_subdirectory(protobuf/)
58-add_subdirectory(draw/)
59
60 set(
61 MIR_GENERATED_INCLUDE_DIRECTORIES
62
63=== modified file 'tests/integration-tests/CMakeLists.txt'
64--- tests/integration-tests/CMakeLists.txt 2013-03-13 07:41:46 +0000
65+++ tests/integration-tests/CMakeLists.txt 2013-03-13 20:39:18 +0000
66@@ -17,6 +17,8 @@
67 endif()
68
69 if (MIR_PLATFORM STREQUAL "android")
70+ include_directories(${PROJECT_SOURCE_DIR}/include/accessory)
71+
72 add_subdirectory(graphics/android)
73 endif()
74

Subscribers

People subscribed via source and target branches