Mir

Merge lp:~mir-team/mir/fix-1368354 into lp:mir

  1. fix-1368354
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 1912
Proposed branch: lp:~mir-team/mir/fix-1368354
Merge into: lp:mir
Diff against target: 113 lines (+18/-1)
5 files modified
client-ABI-sha1sums (+1/-0)
common-ABI-sha1sums (+2/-0)
platform-ABI-sha1sums (+7/-0)
server-ABI-sha1sums (+7/-0)
src/client/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~mir-team/mir/fix-1368354
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+234384@code.launchpad.net

Commit message

reintroduce the headers needed by platform-api

fix: lp: #1368354

Description of the change

reintroduce the headers needed by platform-api

fix: lp: #1368354

So platform-api has 2 components: a server component and a client component.

As far as I know, The server component is mostly 'dead code' that should be removed. Once the server component is removed, we can:

re-privatize these headers:
include/common/mir/input/input_platform.h
include/common/mir/input/input_receiver_thread.h
include/platform/mir/graphics/basic_platform.h
include/platform/mir/graphics/graphic_buffer_allocator.h
include/platform/mir/graphics/platform.h

delete these headers (via lp:~vanvugt/mir/drop-dead-internals)
include/platform/mir/graphics/internal_client.h
include/platform/mir/graphics/internal_surface.h

So the plan is:
1) get platform api buildable
2) clean the downstream
3) reprivatize and delete what we can from mir

NOTE: include/client/mir/client/private.h is needed by the client component to provide some clipboard functionality, we probably have to keep this in the public headers

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

PASSED: Continuous integration, rev:1916
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2703/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1733
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1712
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1225
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1225/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/649
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/649/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2751
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13100

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2703/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Thanks for doing this.

It seems like it's almost all temporary changes that we seek to undo later when platform-api is fixed. So why not just fix platform-api first?

review: Needs Information
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Eeek. I just tried cleaning up lp:platform-api and it's quite non-trivial. Let's go with your approach...

Tested and verified this branch allows platform-api to build.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client-ABI-sha1sums'
2--- client-ABI-sha1sums 2014-09-10 12:50:53 +0000
3+++ client-ABI-sha1sums 2014-09-11 20:53:48 +0000
4@@ -1,3 +1,4 @@
5+b64b3ca16e4130c838bdca248189f8055804c849 include/client/mir/client/private.h
6 cbe1e3ccfea6ab5865510f4f598ec11571fcc852 include/client/mir_toolkit/mir_client_library_debug.h
7 b53736bcb22ddc09aab8275cfdd05c109fdd0f12 include/client/mir_toolkit/mir_client_library_drm.h
8 1522a5fcdb01c0d9a990364539c4f1255853eef7 include/client/mir_toolkit/mir_client_library.h
9
10=== modified file 'common-ABI-sha1sums'
11--- common-ABI-sha1sums 2014-09-10 13:31:06 +0000
12+++ common-ABI-sha1sums 2014-09-11 20:53:48 +0000
13@@ -6,6 +6,8 @@
14 5161774957e3ca4f5fa4e7db025d0978d2bbef06 include/common/mir/geometry/rectangles.h
15 42646c2367b9821e3aa71feff6e31cf50526acaa include/common/mir/geometry/size.h
16 e1be9faee8b844ca2ce617f8fd82c9ee08d56bed include/common/mir/graphics/native_buffer.h
17+dcf8b8982f138bdde39a241825c610e955cd5e33 include/common/mir/input/input_platform.h
18+208cd6aed5ef5f8f39b3eb86604e4133cb840485 include/common/mir/input/input_receiver_thread.h
19 be7d58c9fde2ce91cc66dd6144b76e08b536266b include/common/mir/int_wrapper.h
20 48015c67ddc4998ed5a2e8bb04ff3a4bfdd6a613 include/common/mir/time/clock.h
21 9907751d046e4aea81881cf19e5df52c7a6a813e include/common/mir_toolkit/client_types.h
22
23=== added directory 'include/client/mir'
24=== added directory 'include/client/mir/client'
25=== renamed file 'src/include/client/mir/client/private.h' => 'include/client/mir/client/private.h'
26=== added directory 'include/common/mir/input'
27=== renamed file 'src/include/common/mir/input/input_platform.h' => 'include/common/mir/input/input_platform.h'
28=== renamed file 'src/include/common/mir/input/input_receiver_thread.h' => 'include/common/mir/input/input_receiver_thread.h'
29=== renamed file 'src/include/platform/mir/graphics/basic_platform.h' => 'include/platform/mir/graphics/basic_platform.h'
30=== renamed file 'src/include/platform/mir/graphics/graphic_buffer_allocator.h' => 'include/platform/mir/graphics/graphic_buffer_allocator.h'
31=== renamed file 'src/include/platform/mir/graphics/internal_client.h' => 'include/platform/mir/graphics/internal_client.h'
32=== renamed file 'src/include/platform/mir/graphics/internal_surface.h' => 'include/platform/mir/graphics/internal_surface.h'
33=== renamed file 'src/include/platform/mir/graphics/platform.h' => 'include/platform/mir/graphics/platform.h'
34=== modified file 'platform-ABI-sha1sums'
35--- platform-ABI-sha1sums 2014-09-10 13:31:06 +0000
36+++ platform-ABI-sha1sums 2014-09-11 20:53:48 +0000
37@@ -6,6 +6,8 @@
38 5161774957e3ca4f5fa4e7db025d0978d2bbef06 include/common/mir/geometry/rectangles.h
39 42646c2367b9821e3aa71feff6e31cf50526acaa include/common/mir/geometry/size.h
40 e1be9faee8b844ca2ce617f8fd82c9ee08d56bed include/common/mir/graphics/native_buffer.h
41+dcf8b8982f138bdde39a241825c610e955cd5e33 include/common/mir/input/input_platform.h
42+208cd6aed5ef5f8f39b3eb86604e4133cb840485 include/common/mir/input/input_receiver_thread.h
43 be7d58c9fde2ce91cc66dd6144b76e08b536266b include/common/mir/int_wrapper.h
44 48015c67ddc4998ed5a2e8bb04ff3a4bfdd6a613 include/common/mir/time/clock.h
45 9907751d046e4aea81881cf19e5df52c7a6a813e include/common/mir_toolkit/client_types.h
46@@ -15,6 +17,7 @@
47 99ef5f3bf548508fae24c60f74be1dea018a6e8c include/common/mir_toolkit/mesa/native_display.h
48 101017c17714a57db57d79b7b5e7df40a3568236 include/common/mir_toolkit/mir_native_buffer.h
49 871e609c0fed0d566ddbaaa8ac2d7cd5c06dd09a include/platform/mir/abnormal_exit.h
50+e9e97ba2db4c6aeb269630547bf5a558da17d896 include/platform/mir/graphics/basic_platform.h
51 54328767ca330ba166160a486bd0688406ab0222 include/platform/mir/graphics/buffer.h
52 5875f13f5b029a4b5291e9baec3ae434b72be27c include/platform/mir/graphics/buffer_id.h
53 748f5c2aab11189aa02c4a89ab900561548e7304 include/platform/mir/graphics/buffer_properties.h
54@@ -25,6 +28,10 @@
55 815405c5aee8000bc18c1c9480bac620a451b416 include/platform/mir/graphics/event_handler_register.h
56 5dc095474ef3e294c0aa4008e9ed997bdb21d34c include/platform/mir/graphics/gl_config.h
57 d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce include/platform/mir/graphics/gl_context.h
58+979d2c1ac723ccef538d9a378228a02b0f173bd7 include/platform/mir/graphics/graphic_buffer_allocator.h
59+f90a35371e236a6cfec8e9a8474dbb3305c7621e include/platform/mir/graphics/internal_client.h
60+c9730cac4a3a101f9706ec6f444958abe047fd88 include/platform/mir/graphics/internal_surface.h
61+656a7e1ae3b246930431a6174526fbdc2c76649e include/platform/mir/graphics/platform.h
62 15f201741a465de33e55ffc1ea775b507a5be950 include/platform/mir/graphics/renderable.h
63 b0014e8c4f44f831c9d178f995efb172417aaee4 include/platform/mir/options/configuration.h
64 47007c783c174f8e94d332c4b13c6b01358b48fb include/platform/mir/options/default_configuration.h
65
66=== modified file 'server-ABI-sha1sums'
67--- server-ABI-sha1sums 2014-09-10 13:31:06 +0000
68+++ server-ABI-sha1sums 2014-09-11 20:53:48 +0000
69@@ -6,6 +6,8 @@
70 5161774957e3ca4f5fa4e7db025d0978d2bbef06 include/common/mir/geometry/rectangles.h
71 42646c2367b9821e3aa71feff6e31cf50526acaa include/common/mir/geometry/size.h
72 e1be9faee8b844ca2ce617f8fd82c9ee08d56bed include/common/mir/graphics/native_buffer.h
73+dcf8b8982f138bdde39a241825c610e955cd5e33 include/common/mir/input/input_platform.h
74+208cd6aed5ef5f8f39b3eb86604e4133cb840485 include/common/mir/input/input_receiver_thread.h
75 be7d58c9fde2ce91cc66dd6144b76e08b536266b include/common/mir/int_wrapper.h
76 48015c67ddc4998ed5a2e8bb04ff3a4bfdd6a613 include/common/mir/time/clock.h
77 9907751d046e4aea81881cf19e5df52c7a6a813e include/common/mir_toolkit/client_types.h
78@@ -15,6 +17,7 @@
79 99ef5f3bf548508fae24c60f74be1dea018a6e8c include/common/mir_toolkit/mesa/native_display.h
80 101017c17714a57db57d79b7b5e7df40a3568236 include/common/mir_toolkit/mir_native_buffer.h
81 871e609c0fed0d566ddbaaa8ac2d7cd5c06dd09a include/platform/mir/abnormal_exit.h
82+e9e97ba2db4c6aeb269630547bf5a558da17d896 include/platform/mir/graphics/basic_platform.h
83 54328767ca330ba166160a486bd0688406ab0222 include/platform/mir/graphics/buffer.h
84 5875f13f5b029a4b5291e9baec3ae434b72be27c include/platform/mir/graphics/buffer_id.h
85 748f5c2aab11189aa02c4a89ab900561548e7304 include/platform/mir/graphics/buffer_properties.h
86@@ -25,6 +28,10 @@
87 815405c5aee8000bc18c1c9480bac620a451b416 include/platform/mir/graphics/event_handler_register.h
88 5dc095474ef3e294c0aa4008e9ed997bdb21d34c include/platform/mir/graphics/gl_config.h
89 d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce include/platform/mir/graphics/gl_context.h
90+979d2c1ac723ccef538d9a378228a02b0f173bd7 include/platform/mir/graphics/graphic_buffer_allocator.h
91+f90a35371e236a6cfec8e9a8474dbb3305c7621e include/platform/mir/graphics/internal_client.h
92+c9730cac4a3a101f9706ec6f444958abe047fd88 include/platform/mir/graphics/internal_surface.h
93+656a7e1ae3b246930431a6174526fbdc2c76649e include/platform/mir/graphics/platform.h
94 15f201741a465de33e55ffc1ea775b507a5be950 include/platform/mir/graphics/renderable.h
95 b0014e8c4f44f831c9d178f995efb172417aaee4 include/platform/mir/options/configuration.h
96 47007c783c174f8e94d332c4b13c6b01358b48fb include/platform/mir/options/default_configuration.h
97
98=== modified file 'src/client/CMakeLists.txt'
99--- src/client/CMakeLists.txt 2014-09-10 13:27:58 +0000
100+++ src/client/CMakeLists.txt 2014-09-11 20:53:48 +0000
101@@ -99,7 +99,7 @@
102 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
103
104 install(
105- DIRECTORY ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit
106+ DIRECTORY ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit ${CMAKE_SOURCE_DIR}/include/client/mir
107 DESTINATION "include/mirclient"
108 )
109
110
111=== removed directory 'src/include/client'
112=== removed directory 'src/include/client/mir'
113=== removed directory 'src/include/client/mir/client'

Subscribers

People subscribed via source and target branches