← Back to branch summary

~ci-train-bot/mir/mir-ubuntu-artful-2983

~ci-train-bot/mir/mir-ubuntu-artful-2983

Viewing all changes in revision 227.2.6.

Committer: Kevin DuBois
Date: 2012-11-13 01:36:29 UTC
mfrom: (245 trunk)
mto: This revision was merged to the branch mainline in revision 246.
Revision ID: kevin.dubois@canonical.com-20121113013629-q4496w4mp5e33auk

merge in base branch. move the demo clients to a new directory, examples/

files added:
DEPENDENCIES

cmake/AndroidCrossCompile.cmake

cmake/AndroidFlags.cmake

cmake/Debian.cmake

debian

debian/changelog

debian/compat

debian/control

debian/copyright

debian/rules

debian/source

debian/source/format

debian/watch

examples

examples/CMakeLists.txt

include/mir/frontend/application_focus_mechanism.h

include/mir/frontend/application_focus_selection_strategy.h

include/mir/frontend/application_manager.h

include/mir/frontend/application_session.h

include/mir/frontend/application_session_container.h

include/mir/frontend/application_session_factory.h

include/mir/frontend/application_session_model.h

include/mir/frontend/registration_order_focus_selection_strategy.h

include/mir/frontend/single_visibility_focus_mechanism.h

include/mir/input/event_filter.h

include/mir/input/input_manager.h

include/mir_client/gbm/drm_fd_handler.h

include/mir_test/fake_event_hub.h

include/mir_test/mock_application_surface_organiser.h

include/mir_test/mock_event_filter.h

include/mir_test/wait_condition.h

src/frontend/application_manager.cpp

src/frontend/application_session.cpp

src/frontend/application_session_model.cpp

src/frontend/registration_order_focus_selection_strategy.cpp

src/frontend/single_visibility_focus_mechanism.cpp

src/input/android

src/input/android/CMakeLists.txt

src/input/android/android_input_constants.h

src/input/android/android_input_manager.cpp

src/input/android/android_input_manager.h

src/input/android/dummy_input_dispatcher_policy.h

src/input/android/dummy_input_reader_policy.h

src/input/android/event_filter_dispatcher_policy.cpp

src/input/android/event_filter_dispatcher_policy.h

src/input/event_filter_chain.cpp

src/input/event_filter_chain.h

tests/death-tests/test_application_manager_death.cpp

tests/integration-tests/frontend/test_application_manager.cpp

tests/integration-tests/input/CMakeLists.txt

tests/integration-tests/input/android

tests/integration-tests/input/android/CMakeLists.txt

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp

tests/unit-tests/client/mock_drm_fd_handler.h

tests/unit-tests/frontend/test_application_manager.cpp

tests/unit-tests/frontend/test_application_session.cpp

tests/unit-tests/frontend/test_application_session_model.cpp

tests/unit-tests/frontend/test_registration_order_focus_selection_strategy.cpp

tests/unit-tests/frontend/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/graphics/test_gl_renderer.cpp

tests/unit-tests/input/android

tests/unit-tests/input/android/CMakeLists.txt

tests/unit-tests/input/android/test_event_filter_chain.cpp

tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp

tests/utils/fake_event_hub.cpp

files removed:
cmake/android.toolchain.cmake

include/mir/frontend/application.h

include/mir/input/application_filter.h

include/mir/input/axis.h

include/mir/input/dispatcher.h

include/mir/input/evemu

include/mir/input/evemu/device.h

include/mir/input/event.h

include/mir/input/event_handler.h

include/mir/input/event_producer.h

include/mir/input/filter.h

include/mir/input/grab_filter.h

include/mir/input/logical_device.h

include/mir/input/position_info.h

include/mir/input/shell_filter.h

src/frontend/application.cpp

src/input/application_filter.cpp

src/input/axis.cpp

src/input/dispatcher.cpp

src/input/evemu

src/input/evemu/CMakeLists.txt

src/input/evemu/device.cpp

src/input/filter.cpp

src/input/grab_filter.cpp

src/input/position_info.cpp

src/input/shell_filter.cpp

tests/integration-tests/input/CMakeLists.txt

tests/integration-tests/input/input_dispatch_fixture.h

tests/integration-tests/input/mock_input_device.h

tests/integration-tests/input/mock_input_event.h

tests/integration-tests/input/test_input_dispatch.cpp

tests/integration-tests/input/test_input_dispatch1.cpp

tests/unit-tests/input/evemu

tests/unit-tests/input/evemu/CMakeLists.txt

tests/unit-tests/input/evemu/device.cpp

tests/unit-tests/input/test_grab_filter.cpp

files renamed:
tools/demo_client.c => examples/demo_client.c

tools/demo_client_accelerated.cpp => examples/demo_client_accelerated.cpp

tools/demo_client_unaccelerated.c => examples/demo_client_unaccelerated.c

files modified:
3rd_party/CMakeLists.txt

3rd_party/android-input/android/CMakeLists.txt

3rd_party/android-input/android/frameworks/base/libs/androidfw/InputDevice.cpp

3rd_party/android-input/android/frameworks/native/libs/utils/Looper.cpp

CMakeLists.txt

cross-compile.sh

include/mir/chrono/chrono.h

include/mir/frontend/application_proxy.h

include/mir/geometry/dimensions.h

include/mir/geometry/size.h

include/mir/graphics/buffer_initializer.h

include/mir/graphics/gl_renderer.h

include/mir/graphics/renderable.h

include/mir/process/process.h

include/mir/server_configuration.h

include/mir/surfaces/application_surface_organiser.h

include/mir/surfaces/surface.h

include/mir/surfaces/surface_controller.h

include/mir/thread/all.h

include/mir_client/android/android_client_buffer.h

include/mir_client/android/android_client_buffer_depository.h

include/mir_client/android/android_client_platform.h

include/mir_client/android/android_registrar.h

include/mir_client/android/android_registrar_gralloc.h

include/mir_client/android/mir_native_window.h

include/mir_client/client_platform.h

include/mir_client/gbm/gbm_client_buffer.h

include/mir_client/gbm/gbm_client_buffer_depository.h

include/mir_client/gbm/gbm_client_platform.h

include/mir_client/mir_client_surface.h

include/mir_client/mir_connection.h

include/mir_client/mir_surface.h

include/mir_test/gl_mock.h

include/mir_test/mock_android_registrar.h

include/mir_test/mock_buffer_initializer.h

src/CMakeLists.txt

src/client/CMakeLists.txt

src/client/android/android_client_buffer.cpp

src/client/android/android_client_buffer_depository.cpp

src/client/android/android_client_platform.cpp

src/client/android/android_registrar.cpp

src/client/android/mir_native_window.cpp

src/client/gbm/gbm_client_buffer.cpp

src/client/gbm/gbm_client_buffer_depository.cpp

src/client/gbm/gbm_client_platform.cpp

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_rpc_channel.cpp

src/client/mir_surface.cpp

src/compositor/compositor.cpp

src/frontend/CMakeLists.txt

src/frontend/application_proxy.cpp

src/frontend/protobuf_socket_communicator.cpp

src/graphics/gbm/gbm_buffer.cpp

src/graphics/gbm/gbm_buffer_allocator.cpp

src/graphics/gl_renderer.cpp

src/input/CMakeLists.txt

src/options/program_option.cpp

src/server_configuration.cpp

src/surfaces/surface.cpp

src/surfaces/surface_controller.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_test_framework.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/CMakeLists.txt

tests/integration-tests/frontend/CMakeLists.txt

tests/integration-tests/graphics/gbm/test_buffer_integration.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_android_client_depository.cpp

tests/unit-tests/client/test_android_native_window.cpp

tests/unit-tests/client/test_client_android_buffer.cpp

tests/unit-tests/client/test_client_android_registrar.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_client_platform.cpp

tests/unit-tests/client/test_gbm_client_buffer.cpp

tests/unit-tests/client/test_gbm_client_depository.cpp

tests/unit-tests/compositor/test_buffer_id.cpp

tests/unit-tests/compositor/test_compositor.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/egl_mock/gl_mock.cpp

tests/unit-tests/graphics/gbm/mock_drm.cpp

tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp

tests/unit-tests/input/CMakeLists.txt

tests/utils/CMakeLists.txt

tests/utils/android_graphics.cpp

tools/CMakeLists.txt

tools/buffer_render_target.cpp

tools/buffer_render_target.h

tools/render_surfaces.cpp

tools/render_to_fb.cpp

Show diffs side-by-side

added added

removed removed

3rd_party/CMakeLists.txt

3rd_party/android-input/android/CMakeLists.txt

3rd_party/android-input/android/frameworks/base/libs/androidfw/InputDevice.cpp

3rd_party/android-input/android/frameworks/native/libs/utils/Looper.cpp

cmake/AndroidCrossCompile.cmake

cmake/AndroidFlags.cmake

cmake/Debian.cmake

cmake/android.toolchain.cmake

cross-compile.sh

debian/changelog

debian/copyright

debian/source/format

examples/CMakeLists.txt

include/mir/chrono/chrono.h

include/mir/frontend/application.h

include/mir/frontend/application_focus_mechanism.h

include/mir/frontend/application_focus_selection_strategy.h

include/mir/frontend/application_manager.h

include/mir/frontend/application_proxy.h

include/mir/frontend/application_session.h

include/mir/frontend/application_session_container.h

include/mir/frontend/application_session_factory.h

include/mir/frontend/application_session_model.h

include/mir/frontend/registration_order_focus_selection_strategy.h

include/mir/frontend/single_visibility_focus_mechanism.h

include/mir/geometry/dimensions.h

include/mir/geometry/size.h

include/mir/graphics/buffer_initializer.h

include/mir/graphics/gl_renderer.h

include/mir/graphics/renderable.h

include/mir/input/application_filter.h

include/mir/input/axis.h

include/mir/input/dispatcher.h

include/mir/input/evemu/

include/mir/input/evemu/device.h

include/mir/input/event.h

include/mir/input/event_filter.h

include/mir/input/event_handler.h

include/mir/input/event_producer.h

include/mir/input/filter.h

include/mir/input/grab_filter.h

include/mir/input/input_manager.h

include/mir/input/logical_device.h

include/mir/input/position_info.h

include/mir/input/shell_filter.h

include/mir/process/process.h

include/mir/server_configuration.h

include/mir/surfaces/application_surface_organiser.h

include/mir/surfaces/surface.h

include/mir/surfaces/surface_controller.h

include/mir/thread/all.h

include/mir_client/android/android_client_buffer.h

include/mir_client/android/android_client_buffer_depository.h

include/mir_client/android/android_client_platform.h

include/mir_client/android/android_registrar.h

include/mir_client/android/android_registrar_gralloc.h

include/mir_client/android/mir_native_window.h

include/mir_client/client_platform.h

include/mir_client/gbm/drm_fd_handler.h

include/mir_client/gbm/gbm_client_buffer.h

include/mir_client/gbm/gbm_client_buffer_depository.h

include/mir_client/gbm/gbm_client_platform.h

include/mir_client/mir_client_surface.h

include/mir_client/mir_connection.h

include/mir_client/mir_surface.h

include/mir_test/fake_event_hub.h

include/mir_test/gl_mock.h

include/mir_test/mock_android_registrar.h

include/mir_test/mock_application_surface_organiser.h

include/mir_test/mock_buffer_initializer.h

include/mir_test/mock_event_filter.h

include/mir_test/wait_condition.h

src/CMakeLists.txt

src/client/CMakeLists.txt

src/client/android/android_client_buffer.cpp

src/client/android/android_client_buffer_depository.cpp

src/client/android/android_client_platform.cpp

src/client/android/android_registrar.cpp

src/client/android/mir_native_window.cpp

src/client/gbm/gbm_client_buffer.cpp

src/client/gbm/gbm_client_buffer_depository.cpp

src/client/gbm/gbm_client_platform.cpp

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_rpc_channel.cpp

src/client/mir_surface.cpp

src/compositor/compositor.cpp

src/frontend/CMakeLists.txt

src/frontend/application.cpp

src/frontend/application_manager.cpp

src/frontend/application_proxy.cpp

src/frontend/application_session.cpp

src/frontend/application_session_model.cpp

src/frontend/protobuf_socket_communicator.cpp

src/frontend/registration_order_focus_selection_strategy.cpp

src/frontend/single_visibility_focus_mechanism.cpp

src/graphics/gbm/gbm_buffer.cpp

src/graphics/gbm/gbm_buffer_allocator.cpp

src/graphics/gl_renderer.cpp

src/input/CMakeLists.txt

src/input/android/

src/input/android/CMakeLists.txt

src/input/android/android_input_constants.h

src/input/android/android_input_manager.cpp

src/input/android/android_input_manager.h

src/input/android/dummy_input_dispatcher_policy.h

src/input/android/dummy_input_reader_policy.h

src/input/android/event_filter_dispatcher_policy.cpp

src/input/android/event_filter_dispatcher_policy.h

src/input/application_filter.cpp

src/input/axis.cpp

src/input/dispatcher.cpp

src/input/evemu/

src/input/evemu/CMakeLists.txt

src/input/evemu/device.cpp

src/input/event_filter_chain.cpp

src/input/event_filter_chain.h

src/input/filter.cpp

src/input/grab_filter.cpp

src/input/position_info.cpp

src/input/shell_filter.cpp

src/options/program_option.cpp

src/server_configuration.cpp

src/surfaces/surface.cpp

src/surfaces/surface_controller.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_test_framework.cpp

tests/death-tests/test_application_manager_death.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/CMakeLists.txt

tests/integration-tests/frontend/CMakeLists.txt

tests/integration-tests/frontend/test_application_manager.cpp

tests/integration-tests/graphics/gbm/test_buffer_integration.cpp

tests/integration-tests/input/CMakeLists.txt

tests/integration-tests/input/CMakeLists.txt

tests/integration-tests/input/android/

tests/integration-tests/input/android/CMakeLists.txt

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp

tests/integration-tests/input/input_dispatch_fixture.h

tests/integration-tests/input/mock_input_device.h

tests/integration-tests/input/mock_input_event.h

tests/integration-tests/input/test_input_dispatch.cpp

tests/integration-tests/input/test_input_dispatch1.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/mock_drm_fd_handler.h

tests/unit-tests/client/test_android_client_depository.cpp

tests/unit-tests/client/test_android_native_window.cpp

tests/unit-tests/client/test_client_android_buffer.cpp

tests/unit-tests/client/test_client_android_registrar.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_client_platform.cpp

tests/unit-tests/client/test_gbm_client_buffer.cpp

tests/unit-tests/client/test_gbm_client_depository.cpp

tests/unit-tests/compositor/test_buffer_id.cpp

tests/unit-tests/compositor/test_compositor.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_application_manager.cpp

tests/unit-tests/frontend/test_application_session.cpp

tests/unit-tests/frontend/test_application_session_model.cpp

tests/unit-tests/frontend/test_registration_order_focus_selection_strategy.cpp

tests/unit-tests/frontend/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/egl_mock/gl_mock.cpp

tests/unit-tests/graphics/gbm/mock_drm.cpp

tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp

tests/unit-tests/graphics/test_gl_renderer.cpp

tests/unit-tests/input/CMakeLists.txt

tests/unit-tests/input/android/

tests/unit-tests/input/android/CMakeLists.txt

tests/unit-tests/input/android/test_event_filter_chain.cpp

tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp

tests/unit-tests/input/evemu/

tests/unit-tests/input/evemu/CMakeLists.txt

tests/unit-tests/input/evemu/device.cpp

tests/unit-tests/input/test_grab_filter.cpp

tests/utils/CMakeLists.txt

tests/utils/android_graphics.cpp

tests/utils/fake_event_hub.cpp

tools/CMakeLists.txt

tools/buffer_render_target.cpp

tools/buffer_render_target.h

tools/render_surfaces.cpp

tools/render_to_fb.cpp

Older »