Mir

Merge lp:~alan-griffiths/mir/fix-bug-1152688 into lp:~mir-team/mir/trunk

  1. fix-bug-1152688
  2. Merge into trunk
Proposed by Alan Griffiths
Status: Superseded
Proposed branch: lp:~alan-griffiths/mir/fix-bug-1152688
Merge into: lp:~mir-team/mir/trunk
Diff against target: 824 lines (+170/-153)
43 files modified
CMakeLists.txt (+1/-1)
examples/CMakeLists.txt (+5/-1)
include/test/mir_test/fake_event_hub_input_configuration.h (+1/-1)
src/CMakeLists.txt (+2/-89)
src/client/CMakeLists.txt (+4/-4)
src/server/CMakeLists.txt (+89/-0)
src/shared/CMakeLists.txt (+8/-0)
tests/CMakeLists.txt (+4/-0)
tests/behavior-tests/session_management_context.cpp (+1/-1)
tests/behavior-tests/session_manager_steps.cpp (+1/-1)
tests/integration-tests/CMakeLists.txt (+0/-1)
tests/integration-tests/client/test_client_render.cpp (+2/-2)
tests/integration-tests/cucumber/test_session_management_context.cpp (+1/-1)
tests/integration-tests/graphics/android/test_buffer_integration.cpp (+3/-3)
tests/integration-tests/graphics/gbm/test_buffer_integration.cpp (+3/-3)
tests/integration-tests/input/android/test_android_cursor_listener.cpp (+2/-2)
tests/integration-tests/input/android/test_android_input_manager.cpp (+2/-2)
tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp (+3/-3)
tests/mir_test_doubles/test_protobuf_socket_server.cpp (+1/-1)
tests/unit-tests/compositor/test_temporary_buffers.cpp (+1/-1)
tests/unit-tests/frontend/test_application_mediator.cpp (+1/-1)
tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp (+1/-1)
tests/unit-tests/graphics/android/test_android_alloc_adaptor_native_win.cpp (+1/-1)
tests/unit-tests/graphics/android/test_android_buffer.cpp (+1/-1)
tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp (+1/-1)
tests/unit-tests/graphics/android/test_android_fb.cpp (+2/-2)
tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp (+1/-1)
tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp (+3/-3)
tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp (+2/-2)
tests/unit-tests/graphics/gbm/test_gbm_display.cpp (+2/-2)
tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp (+2/-2)
tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp (+1/-1)
tests/unit-tests/graphics/gbm/test_kms_output.cpp (+2/-2)
tests/unit-tests/graphics/gbm/test_kms_page_flipper.cpp (+4/-4)
tests/unit-tests/input/android/test_android_input_lexicon.cpp (+1/-1)
tests/unit-tests/input/android/test_android_input_manager.cpp (+4/-4)
tests/unit-tests/input/android/test_android_input_reader_policy.cpp (+1/-1)
tests/unit-tests/input/android/test_android_pointer_controller.cpp (+1/-1)
tests/unit-tests/input/android/test_event_filter_chain.cpp (+1/-1)
tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp (+1/-1)
tests/unit-tests/shell/test_application_session.cpp (+1/-1)
tests/unit-tests/shell/test_session_manager.cpp (+1/-1)
tests/unit-tests/surfaces/test_proxy_surface.cpp (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-bug-1152688
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Mir development team Pending
Review via email: mp+152730@code.launchpad.net

Commit message

all: shift code around to clearly segregate code for server and client (and shared, and test)

Description of the change

all: shift code around to clearly segregate code for server and client (and shared, and test)

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Hmm why does bzr mv src/draw src/shared/draw look like delete and add?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-03-07 13:51:41 +0000
3+++ CMakeLists.txt 2013-03-11 17:44:19 +0000
4@@ -67,7 +67,7 @@
5
6 enable_testing()
7
8-include_directories(include/)
9+include_directories(include/shared)
10
11 # Check for boost
12 find_package(Boost 1.48.0 COMPONENTS chrono date_time filesystem system thread program_options regex REQUIRED)
13
14=== modified file 'examples/CMakeLists.txt'
15--- examples/CMakeLists.txt 2013-03-06 12:25:34 +0000
16+++ examples/CMakeLists.txt 2013-03-11 17:44:19 +0000
17@@ -55,7 +55,11 @@
18
19 )
20
21-include_directories(${GLESv2_INCLUDE_DIRS})
22+include_directories(
23+ ${PROJECT_SOURCE_DIR}/include/server
24+ ${PROJECT_SOURCE_DIR}/include/client
25+ ${GLESv2_INCLUDE_DIRS}
26+)
27
28 set(RENDER_TO_FB_SOURCES render_to_fb.cpp)
29 add_executable(render_to_fb ${RENDER_TO_FB_SOURCES})
30
31=== added directory 'include/client'
32=== renamed directory 'include/mir_toolkit' => 'include/client/mir_toolkit'
33=== added directory 'include/server'
34=== renamed directory 'include/mir' => 'include/server/mir'
35=== added directory 'include/shared'
36=== added directory 'include/shared/mir'
37=== renamed directory 'include/mir/draw' => 'include/shared/mir/draw'
38=== renamed directory 'include/mir/geometry' => 'include/shared/mir/geometry'
39=== renamed directory 'include/mir/protobuf' => 'include/shared/mir/protobuf'
40=== added directory 'include/shared/mir_toolkit'
41=== renamed directory 'include/mir_toolkit/input' => 'include/shared/mir_toolkit/input'
42=== added directory 'include/test'
43=== renamed directory 'include/mir_test' => 'include/test/mir_test'
44=== modified file 'include/test/mir_test/fake_event_hub_input_configuration.h'
45--- include/mir_test/fake_event_hub_input_configuration.h 2013-03-06 17:01:51 +0000
46+++ include/test/mir_test/fake_event_hub_input_configuration.h 2013-03-11 17:44:19 +0000
47@@ -19,7 +19,7 @@
48 #ifndef MIR_TEST_DOUBLES_FAKE_EVENT_HUB_INPUT_CONFIGURATION_H_
49 #define MIR_TEST_DOUBLES_FAKE_EVENT_HUB_INPUT_CONFIGURATION_H_
50
51-#include "src/input/android/default_android_input_configuration.h"
52+#include "src/server/input/android/default_android_input_configuration.h"
53
54 #include <utils/StrongPointer.h>
55
56
57=== renamed directory 'include/mir_test_cucumber' => 'include/test/mir_test_cucumber'
58=== renamed directory 'include/mir_test_doubles' => 'include/test/mir_test_doubles'
59=== renamed directory 'include/mir_test_framework' => 'include/test/mir_test_framework'
60=== modified file 'src/CMakeLists.txt'
61--- src/CMakeLists.txt 2013-03-06 12:25:34 +0000
62+++ src/CMakeLists.txt 2013-03-11 17:44:19 +0000
63@@ -1,96 +1,9 @@
64 set(MIR_GENERATED_INCLUDE_DIRECTORIES)
65-add_subdirectory(protobuf/)
66+add_subdirectory(shared/)
67 include_directories(${MIR_GENERATED_INCLUDE_DIRECTORIES})
68
69-add_subdirectory(compositor/)
70-add_subdirectory(draw/)
71-add_subdirectory(graphics/)
72-add_subdirectory(input/)
73-add_subdirectory(logging/)
74-add_subdirectory(surfaces/)
75-add_subdirectory(options/)
76+add_subdirectory(server/)
77 add_subdirectory(client/)
78-add_subdirectory(frontend/)
79-add_subdirectory(shell/)
80-
81-configure_file(
82- ${CMAKE_CURRENT_SOURCE_DIR}/mirserver.pc.in
83- ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
84-)
85-
86-set(
87- SRCS
88- display_server.cpp
89- default_server_configuration.cpp
90-)
91-
92-set(MIRSERVER_LINKAGE SHARED)
93-
94-add_library(mirserver ${MIRSERVER_LINKAGE}
95- ${SRCS}
96-)
97-
98-add_executable(
99- mirds
100-
101- main.cpp
102-)
103-
104-set_target_properties(mirds PROPERTIES OUTPUT_NAME mir)
105-
106-list(APPEND MIRSERVER_ARCHIVES
107- miroptions
108- mircompositor
109- mirfrontend
110- mirgraphics
111- mirinput
112- mirsurfaces
113-)
114-
115-list(APPEND MIRSERVER_LINKS
116- mirplatformgraphics
117- mirprotobuf
118- 3rd_party
119- ${Boost_LIBRARIES}
120-)
121-
122-if(${MIRSERVER_LINKAGE} STREQUAL SHARED)
123- target_link_libraries(mirserver
124- LINK_PRIVATE
125- -Wl,-whole-archive
126- ${MIRSERVER_ARCHIVES}
127- -Wl,-no-whole-archive
128- LINK_PUBLIC
129- ${MIRSERVER_LINKS}
130- )
131- install(TARGETS mirserver
132- LIBRARY DESTINATION lib
133- )
134-else()
135- target_link_libraries(mirserver
136- LINK_PUBLIC
137- ${MIRSERVER_ARCHIVES}
138- ${MIRSERVER_LINKS}
139- )
140-endif()
141-
142-set_target_properties(mirserver PROPERTIES
143- VERSION ${MIR_VERSION_MAJOR}.${MIR_VERSION_MINOR}.${MIR_VERSION_PATCH}
144- SOVERSION ${MIR_VERSION_MAJOR}
145-)
146-
147-target_link_libraries(mirds
148- mirserver
149- ${Boost_LIBRARIES}
150-)
151-
152-install(TARGETS mirds
153- RUNTIME DESTINATION bin
154-)
155-
156-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
157- DESTINATION lib/pkgconfig
158-)
159
160 set(
161 MIR_GENERATED_INCLUDE_DIRECTORIES
162
163=== modified file 'src/client/CMakeLists.txt'
164--- src/client/CMakeLists.txt 2013-03-04 15:54:45 +0000
165+++ src/client/CMakeLists.txt 2013-03-11 17:44:19 +0000
166@@ -20,7 +20,7 @@
167 endif()
168
169 include_directories(
170- ${CMAKE_CURRENT_SOURCE_DIR}
171+ ${PROJECT_SOURCE_DIR}/include/client
172 ${DRM_INCLUDE_DIRS}
173 )
174
175@@ -106,9 +106,9 @@
176 set(
177 CLIENT_PUBLIC_HEADERS
178
179- ${CMAKE_SOURCE_DIR}/include/mir_toolkit/mir_client_library.h
180- ${CMAKE_SOURCE_DIR}/include/mir_toolkit/mir_client_library_lightdm.h
181- ${CMAKE_SOURCE_DIR}/include/mir_toolkit/mir_client_library_drm.h
182+ ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_client_library.h
183+ ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_client_library_lightdm.h
184+ ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_client_library_drm.h
185 )
186
187 set_target_properties(
188
189=== added directory 'src/server'
190=== added file 'src/server/CMakeLists.txt'
191--- src/server/CMakeLists.txt 1970-01-01 00:00:00 +0000
192+++ src/server/CMakeLists.txt 2013-03-11 17:44:19 +0000
193@@ -0,0 +1,89 @@
194+include_directories(${PROJECT_SOURCE_DIR}/include/server)
195+
196+add_subdirectory(compositor/)
197+add_subdirectory(graphics/)
198+add_subdirectory(input/)
199+add_subdirectory(logging/)
200+add_subdirectory(surfaces/)
201+add_subdirectory(options/)
202+add_subdirectory(frontend/)
203+add_subdirectory(shell/)
204+
205+configure_file(
206+ ${CMAKE_CURRENT_SOURCE_DIR}/mirserver.pc.in
207+ ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
208+)
209+
210+set(
211+ SRCS
212+ display_server.cpp
213+ default_server_configuration.cpp
214+)
215+
216+set(MIRSERVER_LINKAGE SHARED)
217+
218+add_library(mirserver ${MIRSERVER_LINKAGE}
219+ ${SRCS}
220+)
221+
222+add_executable(
223+ mirds
224+
225+ main.cpp
226+)
227+
228+set_target_properties(mirds PROPERTIES OUTPUT_NAME mir)
229+
230+list(APPEND MIRSERVER_ARCHIVES
231+ miroptions
232+ mircompositor
233+ mirfrontend
234+ mirgraphics
235+ mirinput
236+ mirsurfaces
237+)
238+
239+list(APPEND MIRSERVER_LINKS
240+ mirplatformgraphics
241+ mirprotobuf
242+ 3rd_party
243+ ${Boost_LIBRARIES}
244+)
245+
246+if(${MIRSERVER_LINKAGE} STREQUAL SHARED)
247+ target_link_libraries(mirserver
248+ LINK_PRIVATE
249+ -Wl,-whole-archive
250+ ${MIRSERVER_ARCHIVES}
251+ -Wl,-no-whole-archive
252+ LINK_PUBLIC
253+ ${MIRSERVER_LINKS}
254+ )
255+ install(TARGETS mirserver
256+ LIBRARY DESTINATION lib
257+ )
258+else()
259+ target_link_libraries(mirserver
260+ LINK_PUBLIC
261+ ${MIRSERVER_ARCHIVES}
262+ ${MIRSERVER_LINKS}
263+ )
264+endif()
265+
266+set_target_properties(mirserver PROPERTIES
267+ VERSION ${MIR_VERSION_MAJOR}.${MIR_VERSION_MINOR}.${MIR_VERSION_PATCH}
268+ SOVERSION ${MIR_VERSION_MAJOR}
269+)
270+
271+target_link_libraries(mirds
272+ mirserver
273+ ${Boost_LIBRARIES}
274+)
275+
276+install(TARGETS mirds
277+ RUNTIME DESTINATION bin
278+)
279+
280+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
281+ DESTINATION lib/pkgconfig
282+)
283
284=== renamed directory 'src/compositor' => 'src/server/compositor'
285=== renamed file 'src/default_server_configuration.cpp' => 'src/server/default_server_configuration.cpp'
286=== renamed file 'src/display_server.cpp' => 'src/server/display_server.cpp'
287=== renamed directory 'src/frontend' => 'src/server/frontend'
288=== renamed directory 'src/graphics' => 'src/server/graphics'
289=== renamed directory 'src/input' => 'src/server/input'
290=== renamed directory 'src/logging' => 'src/server/logging'
291=== renamed file 'src/main.cpp' => 'src/server/main.cpp'
292=== renamed file 'src/mirserver.pc.in' => 'src/server/mirserver.pc.in'
293=== renamed directory 'src/options' => 'src/server/options'
294=== renamed directory 'src/shell' => 'src/server/shell'
295=== renamed directory 'src/surfaces' => 'src/server/surfaces'
296=== added directory 'src/shared'
297=== added file 'src/shared/CMakeLists.txt'
298--- src/shared/CMakeLists.txt 1970-01-01 00:00:00 +0000
299+++ src/shared/CMakeLists.txt 2013-03-11 17:44:19 +0000
300@@ -0,0 +1,8 @@
301+set(MIR_GENERATED_INCLUDE_DIRECTORIES)
302+add_subdirectory(protobuf/)
303+add_subdirectory(draw/)
304+
305+set(
306+ MIR_GENERATED_INCLUDE_DIRECTORIES
307+ ${MIR_GENERATED_INCLUDE_DIRECTORIES}
308+ PARENT_SCOPE)
309
310=== renamed directory 'src/draw' => 'src/shared/draw'
311=== renamed directory 'src/protobuf' => 'src/shared/protobuf'
312=== modified file 'tests/CMakeLists.txt'
313--- tests/CMakeLists.txt 2013-03-07 12:58:52 +0000
314+++ tests/CMakeLists.txt 2013-03-11 17:44:19 +0000
315@@ -20,6 +20,10 @@
316 add_definitions(-DMIR_DEATH_TESTS_ENABLED)
317 endif(MIR_ENABLE_DEATH_TESTS)
318
319+include_directories(${PROJECT_SOURCE_DIR}/include/server)
320+include_directories(${PROJECT_SOURCE_DIR}/include/client)
321+include_directories(${PROJECT_SOURCE_DIR}/include/test)
322+
323 if (MIR_PLATFORM STREQUAL "android")
324 include_directories( ${LIBHARDWARE_INCLUDE_DIRS} ${ANDROID_UI_INCLUDE_DIRS})
325 endif()
326
327=== modified file 'tests/behavior-tests/session_management_context.cpp'
328--- tests/behavior-tests/session_management_context.cpp 2013-03-06 12:54:33 +0000
329+++ tests/behavior-tests/session_management_context.cpp 2013-03-11 17:44:19 +0000
330@@ -16,7 +16,7 @@
331 * Authored by: Robert Carr <robert.carr@canonical.com>
332 */
333
334-#include "session_management_context.h"
335+#include "mir_test_cucumber/session_management_context.h"
336
337 #include "mir/shell/surface.h"
338 #include "mir/shell/surface_creation_parameters.h"
339
340=== modified file 'tests/behavior-tests/session_manager_steps.cpp'
341--- tests/behavior-tests/session_manager_steps.cpp 2013-01-24 19:16:18 +0000
342+++ tests/behavior-tests/session_manager_steps.cpp 2013-03-11 17:44:19 +0000
343@@ -16,7 +16,7 @@
344 * Authored by: Robert Carr <robert.carr@canonical.com>
345 */
346
347-#include "session_management_context.h"
348+#include "mir_test_cucumber/session_management_context.h"
349
350 #include <gtest/gtest.h>
351 #include <cucumber-cpp/defs.hpp>
352
353=== modified file 'tests/integration-tests/CMakeLists.txt'
354--- tests/integration-tests/CMakeLists.txt 2013-03-07 10:50:43 +0000
355+++ tests/integration-tests/CMakeLists.txt 2013-03-11 17:44:19 +0000
356@@ -1,5 +1,4 @@
357 include_directories(${CMAKE_SOURCE_DIR})
358-include_directories(${PROJECT_SOURCE_DIR}/include/mir_test_cucumber)
359
360 set(
361 INTEGRATION_TESTS_SRCS
362
363=== modified file 'tests/integration-tests/client/test_client_render.cpp'
364--- tests/integration-tests/client/test_client_render.cpp 2013-02-26 16:48:46 +0000
365+++ tests/integration-tests/client/test_client_render.cpp 2013-03-11 17:44:19 +0000
366@@ -23,8 +23,8 @@
367 #include "mir/compositor/buffer_ipc_package.h"
368 #include "src/frontend/protobuf_socket_communicator.h"
369 #include "mir/frontend/resource_cache.h"
370-#include "src/graphics/android/android_buffer.h"
371-#include "src/graphics/android/android_alloc_adaptor.h"
372+#include "src/server/graphics/android/android_buffer.h"
373+#include "src/server/graphics/android/android_alloc_adaptor.h"
374
375 #include "mir_test/draw/android_graphics.h"
376 #include "mir_test/draw/patterns.h"
377
378=== modified file 'tests/integration-tests/cucumber/test_session_management_context.cpp'
379--- tests/integration-tests/cucumber/test_session_management_context.cpp 2013-03-06 16:48:33 +0000
380+++ tests/integration-tests/cucumber/test_session_management_context.cpp 2013-03-11 17:44:19 +0000
381@@ -16,7 +16,7 @@
382 * Authored by: Robert Carr <robert.carr@canonical.com>
383 */
384
385-#include "session_management_context.h"
386+#include "mir_test_cucumber/session_management_context.h"
387 #include "mir/server_configuration.h"
388 #include "mir/shell/session_store.h"
389 #include "mir/shell/session.h"
390
391=== modified file 'tests/integration-tests/graphics/android/test_buffer_integration.cpp'
392--- tests/integration-tests/graphics/android/test_buffer_integration.cpp 2013-02-28 18:09:16 +0000
393+++ tests/integration-tests/graphics/android/test_buffer_integration.cpp 2013-03-11 17:44:19 +0000
394@@ -16,9 +16,9 @@
395 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
396 */
397
398-#include "src/graphics/android/android_platform.h"
399-#include "src/graphics/android/android_buffer_allocator.h"
400-#include "src/graphics/android/android_display.h"
401+#include "src/server/graphics/android/android_platform.h"
402+#include "src/server/graphics/android/android_buffer_allocator.h"
403+#include "src/server/graphics/android/android_display.h"
404 #include "mir/graphics/buffer_initializer.h"
405 #include "mir/graphics/null_display_report.h"
406 #include "mir/compositor/swapper_factory.h"
407
408=== modified file 'tests/integration-tests/graphics/gbm/test_buffer_integration.cpp'
409--- tests/integration-tests/graphics/gbm/test_buffer_integration.cpp 2013-02-28 18:58:05 +0000
410+++ tests/integration-tests/graphics/gbm/test_buffer_integration.cpp 2013-03-11 17:44:19 +0000
411@@ -16,9 +16,9 @@
412 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
413 */
414
415-#include "src/graphics/gbm/gbm_platform.h"
416-#include "src/graphics/gbm/gbm_display.h"
417-#include "src/graphics/gbm/gbm_buffer_allocator.h"
418+#include "src/server/graphics/gbm/gbm_platform.h"
419+#include "src/server/graphics/gbm/gbm_display.h"
420+#include "src/server/graphics/gbm/gbm_buffer_allocator.h"
421 #include "mir/compositor/buffer_basic.h"
422 #include "mir/compositor/buffer_id.h"
423 #include "mir/compositor/buffer_properties.h"
424
425=== modified file 'tests/integration-tests/input/android/test_android_cursor_listener.cpp'
426--- tests/integration-tests/input/android/test_android_cursor_listener.cpp 2013-03-06 15:30:12 +0000
427+++ tests/integration-tests/input/android/test_android_cursor_listener.cpp 2013-03-11 17:44:19 +0000
428@@ -18,8 +18,8 @@
429 */
430
431 #include "mir/input/event_filter.h"
432-#include "src/input/android/android_input_manager.h"
433-#include "src/input/android/default_android_input_configuration.h"
434+#include "src/server/input/android/android_input_manager.h"
435+#include "src/server/input/android/default_android_input_configuration.h"
436 #include "mir/input/cursor_listener.h"
437
438 #include "mir_test/fake_shared.h"
439
440=== modified file 'tests/integration-tests/input/android/test_android_input_manager.cpp'
441--- tests/integration-tests/input/android/test_android_input_manager.cpp 2013-03-06 15:30:12 +0000
442+++ tests/integration-tests/input/android/test_android_input_manager.cpp 2013-03-11 17:44:19 +0000
443@@ -18,8 +18,8 @@
444 */
445
446 #include "mir/input/event_filter.h"
447-#include "src/input/android/default_android_input_configuration.h"
448-#include "src/input/android/android_input_manager.h"
449+#include "src/server/input/android/default_android_input_configuration.h"
450+#include "src/server/input/android/android_input_manager.h"
451
452 #include "mir_test/fake_shared.h"
453 #include "mir_test/fake_event_hub.h"
454
455=== modified file 'tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp'
456--- tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp 2013-02-05 18:12:46 +0000
457+++ tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp 2013-03-11 17:44:19 +0000
458@@ -17,9 +17,9 @@
459 * Daniel d'Andrada <daniel.dandrada@canonical.com>
460 */
461 #include "mir/input/event_filter.h"
462-#include "src/input/android/event_filter_dispatcher_policy.h"
463-#include "src/input/android/rudimentary_input_reader_policy.h"
464-#include "src/input/android/android_input_constants.h"
465+#include "src/server/input/android/event_filter_dispatcher_policy.h"
466+#include "src/server/input/android/rudimentary_input_reader_policy.h"
467+#include "src/server/input/android/android_input_constants.h"
468
469 #include "mir_test/fake_shared.h"
470 #include "mir_test/fake_event_hub.h"
471
472=== modified file 'tests/mir_test_doubles/test_protobuf_socket_server.cpp'
473--- tests/mir_test_doubles/test_protobuf_socket_server.cpp 2013-01-02 15:51:50 +0000
474+++ tests/mir_test_doubles/test_protobuf_socket_server.cpp 2013-03-11 17:44:19 +0000
475@@ -17,7 +17,7 @@
476 */
477
478 #include "mir_test/test_protobuf_server.h"
479-#include "src/frontend/protobuf_socket_communicator.h"
480+#include "src/server/frontend/protobuf_socket_communicator.h"
481
482 namespace mt = mir::test;
483 namespace mtd = mir::test::doubles;
484
485=== modified file 'tests/unit-tests/compositor/test_temporary_buffers.cpp'
486--- tests/unit-tests/compositor/test_temporary_buffers.cpp 2013-01-30 18:34:43 +0000
487+++ tests/unit-tests/compositor/test_temporary_buffers.cpp 2013-03-11 17:44:19 +0000
488@@ -16,7 +16,7 @@
489 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
490 */
491
492-#include "src/compositor/temporary_buffers.h"
493+#include "src/server/compositor/temporary_buffers.h"
494 #include "mir_test_doubles/mock_buffer.h"
495 #include "mir_test_doubles/stub_buffer.h"
496 #include "mir_test_doubles/mock_swapper.h"
497
498=== modified file 'tests/unit-tests/frontend/test_application_mediator.cpp'
499--- tests/unit-tests/frontend/test_application_mediator.cpp 2013-03-06 12:54:33 +0000
500+++ tests/unit-tests/frontend/test_application_mediator.cpp 2013-03-11 17:44:19 +0000
501@@ -32,7 +32,7 @@
502 #include "mir_test_doubles/null_buffer_bundle.h"
503 #include "mir_test_doubles/null_display.h"
504
505-#include "src/surfaces/proxy_surface.h"
506+#include "src/server/surfaces/proxy_surface.h"
507
508 #include <gtest/gtest.h>
509 #include <gmock/gmock.h>
510
511=== modified file 'tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp'
512--- tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp 2013-02-19 17:31:04 +0000
513+++ tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp 2013-03-11 17:44:19 +0000
514@@ -16,7 +16,7 @@
515 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
516 */
517
518-#include "src/graphics/android/android_alloc_adaptor.h"
519+#include "src/server/graphics/android/android_alloc_adaptor.h"
520
521 #include "mir_test_doubles/mock_android_alloc_device.h"
522 #include "mir_test_doubles/mock_alloc_adaptor.h"
523
524=== modified file 'tests/unit-tests/graphics/android/test_android_alloc_adaptor_native_win.cpp'
525--- tests/unit-tests/graphics/android/test_android_alloc_adaptor_native_win.cpp 2013-01-10 16:40:10 +0000
526+++ tests/unit-tests/graphics/android/test_android_alloc_adaptor_native_win.cpp 2013-03-11 17:44:19 +0000
527@@ -16,7 +16,7 @@
528 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
529 */
530
531-#include "src/graphics/android/android_buffer_handle_default.h"
532+#include "src/server/graphics/android/android_buffer_handle_default.h"
533 #include "mir/compositor/buffer_ipc_package.h"
534 #include "mir_test_doubles/mock_alloc_adaptor.h"
535 #include "mir_test_doubles/mock_android_alloc_device.h"
536
537=== modified file 'tests/unit-tests/graphics/android/test_android_buffer.cpp'
538--- tests/unit-tests/graphics/android/test_android_buffer.cpp 2012-12-19 16:01:00 +0000
539+++ tests/unit-tests/graphics/android/test_android_buffer.cpp 2013-03-11 17:44:19 +0000
540@@ -16,7 +16,7 @@
541 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
542 */
543
544-#include "src/graphics/android/android_buffer.h"
545+#include "src/server/graphics/android/android_buffer.h"
546 #include "mir/compositor/buffer_ipc_package.h"
547 #include "mir_test_doubles/mock_alloc_adaptor.h"
548
549
550=== modified file 'tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp'
551--- tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp 2012-12-19 16:01:00 +0000
552+++ tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp 2013-03-11 17:44:19 +0000
553@@ -16,7 +16,7 @@
554 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
555 */
556
557-#include "src/graphics/android/android_buffer_allocator.h"
558+#include "src/server/graphics/android/android_buffer_allocator.h"
559
560 #include <gtest/gtest.h>
561
562
563=== modified file 'tests/unit-tests/graphics/android/test_android_fb.cpp'
564--- tests/unit-tests/graphics/android/test_android_fb.cpp 2013-01-21 16:02:54 +0000
565+++ tests/unit-tests/graphics/android/test_android_fb.cpp 2013-03-11 17:44:19 +0000
566@@ -16,8 +16,8 @@
567 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
568 */
569
570-#include "src/graphics/android/android_display.h"
571-#include "src/graphics/android/android_framebuffer_window_query.h"
572+#include "src/server/graphics/android/android_display.h"
573+#include "src/server/graphics/android/android_framebuffer_window_query.h"
574 #include "mir_test/egl_mock.h"
575
576 #include <gtest/gtest.h>
577
578=== modified file 'tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp'
579--- tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp 2012-10-30 12:28:28 +0000
580+++ tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp 2013-03-11 17:44:19 +0000
581@@ -16,7 +16,7 @@
582 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
583 */
584
585-#include "src/graphics/android/android_framebuffer_window.h"
586+#include "src/server/graphics/android/android_framebuffer_window.h"
587
588 #include "mir_test/egl_mock.h"
589
590
591=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp'
592--- tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp 2013-02-28 18:09:16 +0000
593+++ tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp 2013-03-11 17:44:19 +0000
594@@ -21,9 +21,9 @@
595 #include "mock_drm.h"
596 #include "mock_gbm.h"
597
598-#include "src/graphics/gbm/gbm_platform.h"
599-#include "src/graphics/gbm/gbm_buffer.h"
600-#include "src/graphics/gbm/gbm_buffer_allocator.h"
601+#include "src/server/graphics/gbm/gbm_platform.h"
602+#include "src/server/graphics/gbm/gbm_buffer.h"
603+#include "src/server/graphics/gbm/gbm_buffer_allocator.h"
604 #include "mir/graphics/buffer_initializer.h"
605 #include "mir/compositor/buffer_ipc_package.h"
606 #include "mir/compositor/buffer_properties.h"
607
608=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp'
609--- tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp 2013-02-28 18:09:16 +0000
610+++ tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp 2013-03-11 17:44:19 +0000
611@@ -17,9 +17,9 @@
612 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
613 */
614
615-#include "src/graphics/gbm/gbm_platform.h"
616+#include "src/server/graphics/gbm/gbm_platform.h"
617 #include "mir/compositor/graphic_buffer_allocator.h"
618-#include "src/graphics/gbm/gbm_buffer_allocator.h"
619+#include "src/server/graphics/gbm/gbm_buffer_allocator.h"
620 #include "mir/compositor/buffer_properties.h"
621
622 #include "mock_drm.h"
623
624=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_display.cpp'
625--- tests/unit-tests/graphics/gbm/test_gbm_display.cpp 2013-03-01 16:18:33 +0000
626+++ tests/unit-tests/graphics/gbm/test_gbm_display.cpp 2013-03-11 17:44:19 +0000
627@@ -16,8 +16,8 @@
628 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
629 */
630 #include <boost/throw_exception.hpp>
631-#include "src/graphics/gbm/gbm_platform.h"
632-#include "src/graphics/gbm/gbm_display.h"
633+#include "src/server/graphics/gbm/gbm_platform.h"
634+#include "src/server/graphics/gbm/gbm_display.h"
635 #include "mir/logging/display_report.h"
636 #include "mir/logging/logger.h"
637
638
639=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp'
640--- tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp 2013-02-28 18:09:16 +0000
641+++ tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp 2013-03-11 17:44:19 +0000
642@@ -19,8 +19,8 @@
643 #include <boost/throw_exception.hpp>
644 #include "mir/graphics/display_configuration.h"
645 #include "mir/graphics/display.h"
646-#include "src/graphics/gbm/gbm_platform.h"
647-#include "src/graphics/gbm/kms_display_configuration.h"
648+#include "src/server/graphics/gbm/gbm_platform.h"
649+#include "src/server/graphics/gbm/kms_display_configuration.h"
650
651 #include "mir_test/egl_mock.h"
652 #include "mir_test/gl_mock.h"
653
654=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp'
655--- tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp 2013-02-28 18:09:16 +0000
656+++ tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp 2013-03-11 17:44:19 +0000
657@@ -18,7 +18,7 @@
658
659 #include "mir/graphics/display.h"
660 #include "mir/graphics/display_buffer.h"
661-#include "src/graphics/gbm/gbm_platform.h"
662+#include "src/server/graphics/gbm/gbm_platform.h"
663
664 #include "mir_test/egl_mock.h"
665 #include "mir_test/gl_mock.h"
666
667=== modified file 'tests/unit-tests/graphics/gbm/test_kms_output.cpp'
668--- tests/unit-tests/graphics/gbm/test_kms_output.cpp 2013-02-08 17:56:11 +0000
669+++ tests/unit-tests/graphics/gbm/test_kms_output.cpp 2013-03-11 17:44:19 +0000
670@@ -16,8 +16,8 @@
671 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
672 */
673
674-#include "src/graphics/gbm/kms_output.h"
675-#include "src/graphics/gbm/page_flipper.h"
676+#include "src/server/graphics/gbm/kms_output.h"
677+#include "src/server/graphics/gbm/page_flipper.h"
678
679 #include "mir_test/fake_shared.h"
680
681
682=== modified file 'tests/unit-tests/graphics/gbm/test_kms_page_flipper.cpp'
683--- tests/unit-tests/graphics/gbm/test_kms_page_flipper.cpp 2013-03-01 16:18:33 +0000
684+++ tests/unit-tests/graphics/gbm/test_kms_page_flipper.cpp 2013-03-11 17:44:19 +0000
685@@ -16,12 +16,12 @@
686 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
687 */
688
689-#include "src/graphics/gbm/kms_page_flipper.h"
690+#include "src/server/graphics/gbm/kms_page_flipper.h"
691
692 #include "mock_drm.h"
693-#include "include/mir_test_doubles/mock_display_report.h"
694-#include "include/mir/graphics/null_display_report.h"
695-#include "include/mir_test/fake_shared.h"
696+#include "mir_test_doubles/mock_display_report.h"
697+#include "mir/graphics/null_display_report.h"
698+#include "mir_test/fake_shared.h"
699
700 #include <gtest/gtest.h>
701 #include <gmock/gmock.h>
702
703=== modified file 'tests/unit-tests/input/android/test_android_input_lexicon.cpp'
704--- tests/unit-tests/input/android/test_android_input_lexicon.cpp 2013-03-04 19:44:25 +0000
705+++ tests/unit-tests/input/android/test_android_input_lexicon.cpp 2013-03-11 17:44:19 +0000
706@@ -15,7 +15,7 @@
707 *
708 * Authored by: Robert Carr <robert.carr@canonical.com>
709 */
710-#include "src/input/android/android_input_lexicon.h"
711+#include "src/server/input/android/android_input_lexicon.h"
712 // Is this the right place for this header? Will eventually be included by clients.
713 #include "mir_toolkit/input/event.h"
714
715
716=== modified file 'tests/unit-tests/input/android/test_android_input_manager.cpp'
717--- tests/unit-tests/input/android/test_android_input_manager.cpp 2013-03-06 17:01:51 +0000
718+++ tests/unit-tests/input/android/test_android_input_manager.cpp 2013-03-11 17:44:19 +0000
719@@ -16,10 +16,10 @@
720 * Authored by: Robert Carr <robert.carr@canonical.com>
721 */
722
723-#include "src/input/android/android_input_manager.h"
724-#include "src/input/android/android_input_configuration.h"
725-#include "src/input/android/android_input_thread.h"
726-#include "src/input/android/android_input_constants.h"
727+#include "src/server/input/android/android_input_manager.h"
728+#include "src/server/input/android/android_input_configuration.h"
729+#include "src/server/input/android/android_input_thread.h"
730+#include "src/server/input/android/android_input_constants.h"
731
732 #include "mir_test_doubles/mock_viewable_area.h"
733 #include "mir_test/fake_shared.h"
734
735=== modified file 'tests/unit-tests/input/android/test_android_input_reader_policy.cpp'
736--- tests/unit-tests/input/android/test_android_input_reader_policy.cpp 2013-01-18 10:01:05 +0000
737+++ tests/unit-tests/input/android/test_android_input_reader_policy.cpp 2013-03-11 17:44:19 +0000
738@@ -19,7 +19,7 @@
739 #include "mir_test_doubles/mock_viewable_area.h"
740 #include "mir_test/fake_shared.h"
741
742-#include "src/input/android/android_input_reader_policy.h"
743+#include "src/server/input/android/android_input_reader_policy.h"
744 #include "mir/geometry/rectangle.h"
745
746 #include <gtest/gtest.h>
747
748=== modified file 'tests/unit-tests/input/android/test_android_pointer_controller.cpp'
749--- tests/unit-tests/input/android/test_android_pointer_controller.cpp 2013-01-18 10:01:05 +0000
750+++ tests/unit-tests/input/android/test_android_pointer_controller.cpp 2013-03-11 17:44:19 +0000
751@@ -16,7 +16,7 @@
752 * Authored by: Robert Carr <robert.carr@canonical.com>
753 */
754
755-#include "src/input/android/android_pointer_controller.h"
756+#include "src/server/input/android/android_pointer_controller.h"
757
758 #include "mir_test_doubles/mock_viewable_area.h"
759 #include "mir_test/event_factory.h"
760
761=== modified file 'tests/unit-tests/input/android/test_event_filter_chain.cpp'
762--- tests/unit-tests/input/android/test_event_filter_chain.cpp 2013-01-18 10:09:43 +0000
763+++ tests/unit-tests/input/android/test_event_filter_chain.cpp 2013-03-11 17:44:19 +0000
764@@ -16,7 +16,7 @@
765 * Authored by: Robert Carr <robert.carr@canonical.com>
766 */
767
768-#include "src/input/event_filter_chain.h"
769+#include "src/server/input/event_filter_chain.h"
770 #include "mir_test_doubles/mock_event_filter.h"
771
772 #include <androidfw/Input.h>
773
774=== modified file 'tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp'
775--- tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp 2013-01-18 10:01:05 +0000
776+++ tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp 2013-03-11 17:44:19 +0000
777@@ -17,7 +17,7 @@
778 */
779
780 #include "mir/input/event_filter.h"
781-#include "src/input/android/event_filter_dispatcher_policy.h"
782+#include "src/server/input/android/event_filter_dispatcher_policy.h"
783
784 #include "mir_test/fake_shared.h"
785 #include "mir_test_doubles/mock_event_filter.h"
786
787=== modified file 'tests/unit-tests/shell/test_application_session.cpp'
788--- tests/unit-tests/shell/test_application_session.cpp 2013-03-06 12:54:33 +0000
789+++ tests/unit-tests/shell/test_application_session.cpp 2013-03-11 17:44:19 +0000
790@@ -22,7 +22,7 @@
791 #include "mir_test/fake_shared.h"
792 #include "mir_test_doubles/mock_surface_factory.h"
793
794-#include "src/surfaces/proxy_surface.h"
795+#include "src/server/surfaces/proxy_surface.h"
796
797 #include <gmock/gmock.h>
798 #include <gtest/gtest.h>
799
800=== modified file 'tests/unit-tests/shell/test_session_manager.cpp'
801--- tests/unit-tests/shell/test_session_manager.cpp 2013-03-06 18:12:43 +0000
802+++ tests/unit-tests/shell/test_session_manager.cpp 2013-03-11 17:44:19 +0000
803@@ -29,7 +29,7 @@
804 #include "mir_test_doubles/mock_surface_factory.h"
805 #include "mir_test_doubles/null_buffer_bundle.h"
806
807-#include "src/surfaces/proxy_surface.h"
808+#include "src/server/surfaces/proxy_surface.h"
809
810 #include <gmock/gmock.h>
811 #include <gtest/gtest.h>
812
813=== modified file 'tests/unit-tests/surfaces/test_proxy_surface.cpp'
814--- tests/unit-tests/surfaces/test_proxy_surface.cpp 2013-03-06 12:54:33 +0000
815+++ tests/unit-tests/surfaces/test_proxy_surface.cpp 2013-03-11 17:44:19 +0000
816@@ -16,7 +16,7 @@
817 * Authored by: Alan Griffiths <alan@octopull.co.uk>
818 */
819
820-#include "src/surfaces/proxy_surface.h"
821+#include "src/server/surfaces/proxy_surface.h"
822 #include "mir/surfaces/surface.h"
823 #include "mir/shell/surface_creation_parameters.h"
824 #include "mir/surfaces/surface_stack_model.h"

Subscribers

People subscribed via source and target branches