Merge lp:~albaguirre/mir/bump-server-abi into lp:mir

[Alberto Aguirre]

Bump server ABI to 39

The interface mir::input::InputDeviceHub has been modified.

[lp:~albaguirre/mir/bump-server-abi]

3371. By Alberto Aguirre on 2016-03-07

Remove whitespace fixes in debian/changelog

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3370
https://mir-jenkins.ubuntu.com/job/mir-ci/511/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/362
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/392
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/384
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/384
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/371
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/371/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/371
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/371/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/371
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/371/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/371
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/371/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/371
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/371/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/511/rebuild

review: Approve (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3371
https://mir-jenkins.ubuntu.com/job/mir-ci/512/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/363
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/393
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/385
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/385
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/372
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/372/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/372
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/372/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/372
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/372/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/372
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/372/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/372
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/372/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/512/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> The interface mir::input::InputDeviceHub has been modified.

That is we've added...

    virtual void for_each_input_device(std::function<void(std::shared_ptr<Device>const& device)> const& callback) = 0;

...to the end of the vtab.

That would only be an issue for client code that implement this interface. AFAICT the only client that does this is TestInputDeviceHub in our own acceptance tests.

Further, the *only* use of this function (including in tests) is in SessionMediator::connect() - so I'm not convinced this should be part of the public API.

Maybe the right solution is to remove this function and restore the ABI?

review: Needs Information

[Alan Griffiths (alan-griffiths)]

> That would only be an issue for client code that implement this interface.
> AFAICT the only client that does this is TestInputDeviceHub in our own
> acceptance tests.

Sorry, I lost track of my own investigation: that's MockInputDeviceHub used in test_session_mediator.cpp - a unit test.

There's no way for clients to override the InputDeviceHub implementation, (or to use MockInputDeviceHub), so this "ABI break" is a false positive.

review: Disapprove

[Alberto Aguirre (albaguirre)]

OK, let's stash it for later use when server ABI is broken for good.

Unmerged revisions

3371. By Alberto Aguirre on 2016-03-07

Remove whitespace fixes in debian/changelog

3370. By Alberto Aguirre on 2016-03-07

Bump server ABI

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-01 12:45:49 +0000
+++ CMakeLists.txt	2016-03-07 20:53:47 +0000
@@ -28,7 +28,7 @@
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 20)
+set(MIR_VERSION_MINOR 21)
 set(MIR_VERSION_PATCH 0)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-01 06:11:43 +0000
+++ debian/changelog	2016-03-07 20:53:47 +0000
@@ -1,3 +1,22 @@
+mir (0.21.0) UNRELEASED; urgency=medium
+
+  * New upstream release 0.21 (https://launchpad.net/mir/+milestone/0.21)
+    - ABI Summary:
+      . mirclient ABI unchanged at 9
+      . mirserver ABI bumped to 39
+      . mircommon ABI unchanged at 5
+      . mirplatform ABI unchanged at 11
+      . mirprotobuf ABI unchanged at 3
+      . mirplatformgraphics ABI unchanged at 8
+      . mirclientplatform ABI bumped to 5
+      . mirinputplatform ABI unchanged at 5
+    - Enhancements:
+      . Placeholder
+    - Bug fixes:
+      . Placeholder
+
+ -- Alberto Aguirre <[e-mail]>  Mon, 07 Mar 2016 14:11:16 -0600
+
 mir (0.20.1+16.04.20160225.1-0ubuntu1) xenial; urgency=medium
 
   [ Kevin DuBois ]

=== modified file 'debian/control'
--- debian/control	2016-03-04 18:16:57 +0000
+++ debian/control	2016-03-07 20:53:47 +0000
@@ -67,7 +67,7 @@
 
 #TODO: Packaging infrastructure for better dependency generation,
 #      ala pkg-xorg's xviddriver:Provides and ABI detection.
-Package: libmirserver38
+Package: libmirserver39
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -133,7 +133,7 @@
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver38 (= ${binary:Version}),
+Depends: libmirserver39 (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,

=== renamed file 'debian/libmirserver38.install' => 'debian/libmirserver39.install'
--- debian/libmirserver38.install	2016-02-24 03:55:11 +0000
+++ debian/libmirserver39.install	2016-03-07 20:53:47 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.38
+usr/lib/*/libmirserver.so.39

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2016-02-24 03:55:11 +0000
+++ src/server/CMakeLists.txt	2016-03-07 20:53:47 +0000
@@ -123,7 +123,7 @@
   ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
 )
 
-set(MIRSERVER_ABI 38) # Be sure to increment MIR_VERSION_MINOR at the same time
+set(MIRSERVER_ABI 39) # Be sure to increment MIR_VERSION_MINOR at the same time
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
 set_target_properties(

=== modified file 'src/server/symbols.map'
--- src/server/symbols.map	2016-03-01 14:58:13 +0000
+++ src/server/symbols.map	2016-03-07 20:53:47 +0000
@@ -1,4 +1,4 @@
-MIR_SERVER_0.20 {
+MIR_SERVER_0.21 {
  global:
   extern "C++" {
 # Symbols not yet picked up by script
@@ -8,7 +8,7 @@
     VTT?for?mir::shell::SystemCompositorWindowManager;
 
 # The following symbols come from running a script over the generated docs. Vis:
-# ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mirserver public" | sed "s/mirserver public: /    /" | sort  
+# ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mirserver public" | sed "s/mirserver public: /    /" | sort
     mir::check_for_termination_exception*;
     mir::clear_termination_exception*;
     mir::compositor::Compositor::Compositor*;