Merge lp:~alan-griffiths/mir/privatize-PrivateProtobuf into lp:mir

[Alan Griffiths]

frontend: privatize the support for "PrivateProtobuf"

frontend: privatize the support for "PrivateProtobuf"

This support was temporarily added to allow downstream to prototype additions to the Mir protocol. It is no longer being used[*] and will likely not be needed in the foreseeable future.

As a first step to eventual removal this MP removes the public header files used to support it.

* Once lp:~alan-griffiths/platform-api/delete-dead-code-that-uses-Mir-PrivateProtobuf-API lands. ;)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1976
http://jenkins.qa.ubuntu.com/job/mir-ci/1753/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2049
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2056
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1986
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/923
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/923/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2994
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14274

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1753/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Kevin DuBois (kdub)]

looks good, although if you remove an api no one was supposed to use, is it a client abi break? :) (I'm fine not incrementing)

review: Approve

[Daniel van Vugt (vanvugt)]

Sure.

The requisite ABI bumps for the 0.9 series are all being proposed separately. And I'm assuming that the removal of:
   include/client/mir/client/private.h
is not a break at all if nobody's using it.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/mir-autolanding/752/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2042
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-autolanding/22
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-autolanding/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/979
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/979/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3049
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14582

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

lp:platform-api -c 278 is good enough

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'client-ABI-sha1sums'
--- client-ABI-sha1sums	2014-09-30 06:11:33 +0000
+++ client-ABI-sha1sums	2014-10-07 14:41:53 +0000
@@ -1,4 +1,3 @@
-b64b3ca16e4130c838bdca248189f8055804c849  include/client/mir/client/private.h
 cbe1e3ccfea6ab5865510f4f598ec11571fcc852  include/client/mir_toolkit/mir_client_library_debug.h
 b53736bcb22ddc09aab8275cfdd05c109fdd0f12  include/client/mir_toolkit/mir_client_library_drm.h
 1522a5fcdb01c0d9a990364539c4f1255853eef7  include/client/mir_toolkit/mir_client_library.h

=== removed directory 'include/client/mir'
=== removed directory 'include/client/mir/client'
=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums	2014-10-06 03:02:44 +0000
+++ server-ABI-sha1sums	2014-10-07 14:41:53 +0000
@@ -51,15 +51,9 @@
 ef0b6f26fb40a72e4a4744e4d9c4bd044142de47  include/server/mir/default_server_configuration.h
 af1ff0714be973ac76d56006a2e5991f68cd1dec  include/server/mir/display_server.h
 a35c5495d8fd28fc0e375b17495fc5caab51b329  include/server/mir/emergency_cleanup.h
-65db331f1c0e956eced5c9fc73a2b2122dbc8dc7  include/server/mir/frontend/connection_creator.h
-e6e92642301fc9bb85e1d38087a5dd84e5d30fd7  include/server/mir/frontend/connections.h
 938de641cb0e01e1098b007b39b151a7dfe4adc1  include/server/mir/frontend/display_changer.h
 46b9a4c7794c29b4bd7822671f9626fc8fc33333  include/server/mir/frontend/event_sink.h
-bdb89184f400bb04625db5835d38576f99f52684  include/server/mir/frontend/fd_sets.h
-4f1303065e300d26acb148c3dd9f7183dc3c4443  include/server/mir/frontend/message_processor.h
 59d6703def2a0ff840e5eb75390a5af76fd93f58  include/server/mir/frontend/prompt_session.h
-cb1f73934d150f21e60d4d8de3f15918d993dd98  include/server/mir/frontend/protobuf_connection_creator.h
-7fc88a2e39f6b87ecbd89a264612138e8fcfb10a  include/server/mir/frontend/protobuf_message_sender.h
 fae0008af826abbc4b4324d49e9c03d43b08765a  include/server/mir/frontend/screencast.h
 b729a7710c37d9f1fba56a6f8e8eae1c2559f57a  include/server/mir/frontend/session_authorizer.h
 34ce482df448fd2fc5f0c4ae5ac8b7fecbd228c9  include/server/mir/frontend/session_credentials.h
@@ -68,7 +62,6 @@
 68468aa2298c4e2cdc1bbb7cb5f250a914ae16c9  include/server/mir/frontend/shell.h
 f67b9788943a4b9121b3891dfbe979d57922ea78  include/server/mir/frontend/surface.h
 618b43a84cce0ad671ed68fe2ba796fbc7b79e31  include/server/mir/frontend/surface_id.h
-5aa4c4db5468d9b9fe8e98a64444538aadd6e17b  include/server/mir/frontend/template_protobuf_message_processor.h
 f95c2bddf13d15993ef5d6a0ad7b9106ae550b87  include/server/mir/input/composite_event_filter.h
 67719acb03b35d383dfefd65e8dfb872c42bcc11  include/server/mir/input/cursor_images.h
 cef18b7215fbe00550d18c0aa0f79b641cff494e  include/server/mir/input/cursor_listener.h

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2014-09-30 06:11:33 +0000
+++ src/client/CMakeLists.txt	2014-10-07 14:41:53 +0000
@@ -20,6 +20,7 @@
   ${PROTOBUF_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/include/client
+  ${PROJECT_SOURCE_DIR}/src/include/client
   ${DRM_INCLUDE_DIRS}
 )
 
@@ -104,7 +105,7 @@
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 install(
-  DIRECTORY ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit ${CMAKE_SOURCE_DIR}/include/client/mir
+  DIRECTORY ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit
   DESTINATION "include/mirclient"
 )
 

=== added directory 'src/include/client'
=== added directory 'src/include/client/mir'
=== added directory 'src/include/client/mir/client'
=== renamed file 'include/client/mir/client/private.h' => 'src/include/client/mir/client/private.h'
=== renamed file 'include/server/mir/frontend/connection_creator.h' => 'src/include/server/mir/frontend/connection_creator.h'
=== renamed file 'include/server/mir/frontend/connections.h' => 'src/include/server/mir/frontend/connections.h'
=== renamed file 'include/server/mir/frontend/fd_sets.h' => 'src/include/server/mir/frontend/fd_sets.h'
=== renamed file 'include/server/mir/frontend/message_processor.h' => 'src/include/server/mir/frontend/message_processor.h'
=== renamed file 'include/server/mir/frontend/protobuf_connection_creator.h' => 'src/include/server/mir/frontend/protobuf_connection_creator.h'
=== renamed file 'include/server/mir/frontend/protobuf_message_sender.h' => 'src/include/server/mir/frontend/protobuf_message_sender.h'
=== renamed file 'include/server/mir/frontend/template_protobuf_message_processor.h' => 'src/include/server/mir/frontend/template_protobuf_message_processor.h'
=== modified file 'src/server/symbols.map'
--- src/server/symbols.map	2014-10-03 17:01:08 +0000
+++ src/server/symbols.map	2014-10-07 14:41:53 +0000
@@ -117,21 +117,6 @@
     mir::DisplayServer::stop*;
     mir::EmergencyCleanup::operator*;
     mir::frontend::as_internal_surface*;
-    mir::frontend::ConnectionCreator::?ConnectionCreator*;
-    mir::frontend::ConnectionCreator::ConnectionCreator*;
-    mir::frontend::ConnectionCreator::create_connection_for*;
-    mir::frontend::ConnectionCreator::operator*;
-    mir::frontend::detail::Invocation::id*;
-    mir::frontend::detail::Invocation::method_name*;
-    mir::frontend::detail::Invocation::parameters*;
-    mir::frontend::detail::MessageProcessor::client_pid*;
-    mir::frontend::detail::MessageProcessor::dispatch*;
-    mir::frontend::detail::MessageProcessor::?MessageProcessor*;
-    mir::frontend::detail::MessageProcessor::MessageProcessor*;
-    mir::frontend::detail::MessageProcessor::operator*;
-    mir::frontend::detail::ProtobufMessageSender::?ProtobufMessageSender*;
-    mir::frontend::detail::ProtobufMessageSender::ProtobufMessageSender*;
-    mir::frontend::detail::ProtobufMessageSender::send_response*;
     mir::frontend::DisplayChanger::active_configuration*;
     mir::frontend::DisplayChanger::configure*;
     mir::frontend::DisplayChanger::?DisplayChanger*;
@@ -146,10 +131,6 @@
     mir::frontend::PromptSession::operator*;
     mir::frontend::PromptSession::?PromptSession*;
     mir::frontend::PromptSession::PromptSession*;
-    mir::frontend::ProtobufConnectionCreator::create_connection_for*;
-    mir::frontend::ProtobufConnectionCreator::create_processor*;
-    mir::frontend::ProtobufConnectionCreator::?ProtobufConnectionCreator*;
-    mir::frontend::ProtobufConnectionCreator::ProtobufConnectionCreator*;
     mir::frontend::Screencast::capture*;
     mir::frontend::Screencast::create_session*;
     mir::frontend::Screencast::destroy_session*;
@@ -549,14 +530,9 @@
     non-virtual?thunk?to?mir::DefaultServerConfiguration::the_touch_visualizer*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::wrap_session_coordinator*;
     non-virtual?thunk?to?mir::DefaultServerConfiguration::wrap_surface_coordinator*;
-    non-virtual?thunk?to?mir::frontend::ConnectionCreator::?ConnectionCreator*;
-    non-virtual?thunk?to?mir::frontend::detail::MessageProcessor::?MessageProcessor*;
-    non-virtual?thunk?to?mir::frontend::detail::ProtobufMessageSender::?ProtobufMessageSender*;
     non-virtual?thunk?to?mir::frontend::DisplayChanger::?DisplayChanger*;
     non-virtual?thunk?to?mir::frontend::EventSink::?EventSink*;
     non-virtual?thunk?to?mir::frontend::PromptSession::?PromptSession*;
-    non-virtual?thunk?to?mir::frontend::ProtobufConnectionCreator::create_connection_for*;
-    non-virtual?thunk?to?mir::frontend::ProtobufConnectionCreator::create_processor*;
     non-virtual?thunk?to?mir::frontend::Screencast::?Screencast*;
     non-virtual?thunk?to?mir::frontend::SessionAuthorizer::?SessionAuthorizer*;
     non-virtual?thunk?to?mir::frontend::Session::?Session*;
@@ -612,14 +588,9 @@
     typeinfo?for?mir::DefaultServerConfiguration;
     typeinfo?for?mir::DisplayServer;
     typeinfo?for?mir::EmergencyCleanup;
-    typeinfo?for?mir::frontend::ConnectionCreator;
-    typeinfo?for?mir::frontend::detail::Invocation;
-    typeinfo?for?mir::frontend::detail::MessageProcessor;
-    typeinfo?for?mir::frontend::detail::ProtobufMessageSender;
     typeinfo?for?mir::frontend::DisplayChanger;
     typeinfo?for?mir::frontend::EventSink;
     typeinfo?for?mir::frontend::PromptSession;
-    typeinfo?for?mir::frontend::ProtobufConnectionCreator;
     typeinfo?for?mir::frontend::Screencast;
     typeinfo?for?mir::frontend::Session;
     typeinfo?for?mir::frontend::SessionAuthorizer;
@@ -674,14 +645,9 @@
     vtable?for?mir::DefaultServerConfiguration;
     vtable?for?mir::DisplayServer;
     vtable?for?mir::EmergencyCleanup;
-    vtable?for?mir::frontend::ConnectionCreator;
-    vtable?for?mir::frontend::detail::Invocation;
-    vtable?for?mir::frontend::detail::MessageProcessor;
-    vtable?for?mir::frontend::detail::ProtobufMessageSender;
     vtable?for?mir::frontend::DisplayChanger;
     vtable?for?mir::frontend::EventSink;
     vtable?for?mir::frontend::PromptSession;
-    vtable?for?mir::frontend::ProtobufConnectionCreator;
     vtable?for?mir::frontend::Screencast;
     vtable?for?mir::frontend::Session;
     vtable?for?mir::frontend::SessionAuthorizer;

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2014-10-06 03:02:44 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2014-10-07 14:41:53 +0000
@@ -2,19 +2,13 @@
 
 include_directories(
   ${CMAKE_SOURCE_DIR}
-  ${PROTOBUF_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_BINARY_DIR})
+)
 
 add_definitions(
   -DMIR_PLATFORM_DRIVER_BINARY="${MIR_PLATFORM_DRIVER_BINARY}"
   -DMIR_CLIENT_DRIVER_BINARY="${MIR_CLIENT_DRIVER_BINARY}"
 )
 
-protobuf_generate_cpp(
-  GENERATED_PROTOBUF_SRCS GENERATED_PROTOBUF_HDRS
-  test_protobuf.proto
-)
-
 set(
   SOURCES
 
@@ -38,7 +32,6 @@
   test_server_disconnect.cpp
   test_client_library_drm.cpp
   test_prompt_session_client_api.cpp
-  test_protobuf.cpp
   test_client_screencast.cpp
   test_client_cursor_api.cpp
   test_large_messages.cpp
@@ -50,8 +43,6 @@
   test_client_input.cpp
   test_server_startup.cpp
   test_unresponsive_client.cpp
-  ${GENERATED_PROTOBUF_SRCS}
-  ${GENERATED_PROTOBUF_HDRS}
 )
 
 if (MIR_TEST_PLATFORM STREQUAL "mesa")

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2014-10-06 18:26:45 +0000
+++ tests/integration-tests/CMakeLists.txt	2014-10-07 14:41:53 +0000
@@ -2,15 +2,23 @@
 
 include_directories(
   ${CMAKE_SOURCE_DIR}
+  ${PROTOBUF_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/src/include/platform
   ${PROJECT_SOURCE_DIR}/src/include/server
   ${PROJECT_SOURCE_DIR}/src/include/client
 )
 
+protobuf_generate_cpp(
+  GENERATED_PROTOBUF_SRCS GENERATED_PROTOBUF_HDRS
+  test_protobuf.proto
+)
+
 set(
   INTEGRATION_TESTS_SRCS
   test_surface_stack_with_compositor.cpp
   test_client_surface_swap_buffers.cpp
+  test_protobuf.cpp
   test_surfaceloop.cpp
   test_stale_frames.cpp
   test_error_reporting.cpp
@@ -25,6 +33,8 @@
   test_session.cpp
   session_management.cpp
   surface_composition.cpp
+  ${GENERATED_PROTOBUF_SRCS}
+  ${GENERATED_PROTOBUF_HDRS}
 )
 
 add_subdirectory(client/)

=== renamed file 'tests/acceptance-tests/test_protobuf.cpp' => 'tests/integration-tests/test_protobuf.cpp'
=== renamed file 'tests/acceptance-tests/test_protobuf.proto' => 'tests/integration-tests/test_protobuf.proto'