Mir

Merge lp:~alan-griffiths/mir/test-ABI-bump-libmirserver into lp:mir

  1. test-ABI-bump-libmirserver
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Rejected
Rejected by: Alan Griffiths
Proposed branch: lp:~alan-griffiths/mir/test-ABI-bump-libmirserver
Merge into: lp:mir
Diff against target: 167 lines (+8/-37)
5 files modified
CMakeLists.txt (+1/-1)
debian/control (+2/-2)
debian/libmirserver30.install (+1/-1)
src/server/CMakeLists.txt (+1/-1)
src/server/symbols.map (+3/-32)
To merge this branch: bzr merge lp:~alan-griffiths/mir/test-ABI-bump-libmirserver
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Alan Griffiths Disapprove
Review via email: mp+250177@code.launchpad.net

Commit message

*Test MP*

It looks as though bumping the mir server ABI breaks the maki when installed. This is just that change to see what happens.

Description of the change

*Test MP*

It looks as though bumping the mir server ABI breaks the maki when installed. This is just that change to see what happens.

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

Not intended to land

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

FAILED: Continuous integration, rev:2328
http://jenkins.qa.ubuntu.com/job/mir-ci/3009/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1343
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1300/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1006
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1006/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1300
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1300/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4332/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18167

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

See https://bugs.launchpad.net/mir/+bug/1423591 .

Unmerged revisions

2328. By Alan Griffiths

Just the libmirserver ABI bump

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 2015-02-13 06:12:34 +0000
3+++ CMakeLists.txt 2015-02-18 17:42:16 +0000
4@@ -27,7 +27,7 @@
5 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
6
7 set(MIR_VERSION_MAJOR 0)
8-set(MIR_VERSION_MINOR 12) # This should change at least with every MIRSERVER_ABI
9+set(MIR_VERSION_MINOR 13) # This should change at least with every MIRSERVER_ABI
10 set(MIR_VERSION_PATCH 0)
11
12 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
13
14=== modified file 'debian/control'
15--- debian/control 2015-02-18 03:04:18 +0000
16+++ debian/control 2015-02-18 17:42:16 +0000
17@@ -61,7 +61,7 @@
18
19 #TODO: Packaging infrastructure for better dependency generation,
20 # ala pkg-xorg's xviddriver:Provides and ABI detection.
21-Package: libmirserver29
22+Package: libmirserver30
23 Section: libs
24 Architecture: i386 amd64 armhf arm64
25 Multi-Arch: same
26@@ -127,7 +127,7 @@
27 Architecture: i386 amd64 armhf arm64
28 Multi-Arch: same
29 Pre-Depends: ${misc:Pre-Depends}
30-Depends: libmirserver29 (= ${binary:Version}),
31+Depends: libmirserver30 (= ${binary:Version}),
32 libmirplatform-dev (= ${binary:Version}),
33 libmircommon-dev (= ${binary:Version}),
34 libglm-dev,
35
36=== renamed file 'debian/libmirserver29.install' => 'debian/libmirserver30.install'
37--- debian/libmirserver29.install 2015-01-21 09:03:53 +0000
38+++ debian/libmirserver30.install 2015-02-18 17:42:16 +0000
39@@ -1,1 +1,1 @@
40-usr/lib/*/libmirserver.so.29
41+usr/lib/*/libmirserver.so.30
42
43=== modified file 'src/server/CMakeLists.txt'
44--- src/server/CMakeLists.txt 2015-02-13 06:12:34 +0000
45+++ src/server/CMakeLists.txt 2015-02-18 17:42:16 +0000
46@@ -106,7 +106,7 @@
47 ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
48 )
49
50-set(MIRSERVER_ABI 29) # Be sure to increment MIR_VERSION_MINOR at the same time
51+set(MIRSERVER_ABI 30) # Be sure to increment MIR_VERSION_MINOR at the same time
52 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
53
54 set_target_properties(
55
56=== modified file 'src/server/symbols.map'
57--- src/server/symbols.map 2015-02-13 06:12:34 +0000
58+++ src/server/symbols.map 2015-02-18 17:42:16 +0000
59@@ -1,4 +1,4 @@
60-MIR_SERVER_29 {
61+MIR_SERVER_30 {
62 global:
63 extern "C++" {
64 # Symbols not yet picked up by script
65@@ -213,6 +213,7 @@
66 mir::scene::SurfaceBufferAccess::?SurfaceBufferAccess*;
67 mir::scene::SurfaceBufferAccess::SurfaceBufferAccess*;
68 mir::scene::SurfaceBufferAccess::with_most_recent_buffer_do*;
69+ mir::scene::Surface::buffers_ready_for_compositor*;
70 mir::scene::Surface::client_size*;
71 mir::scene::Surface::compositor_snapshot*;
72 mir::scene::SurfaceConfigurator::attribute_set*;
73@@ -225,6 +226,7 @@
74 mir::scene::SurfaceCoordinator::operator*;
75 mir::scene::SurfaceCoordinator::raise*;
76 mir::scene::SurfaceCoordinator::remove_surface*;
77+ mir::scene::SurfaceCoordinator::surface_at*;
78 mir::scene::SurfaceCoordinator::?SurfaceCoordinator*;
79 mir::scene::SurfaceCoordinator::SurfaceCoordinator*;
80 mir::scene::SurfaceCreationParameters::of_buffer_usage*;
81@@ -377,9 +379,6 @@
82 mir::shell::FocusController::focussed_application*;
83 mir::shell::FocusController::operator*;
84 mir::shell::FocusController::set_focus_to*;
85- mir::shell::FocusSetter::FocusSetter*;
86- mir::shell::FocusSetter::operator*;
87- mir::shell::FocusSetter::set_focus_to*;
88 mir::shell::HostLifecycleEventListener::?HostLifecycleEventListener*;
89 mir::shell::HostLifecycleEventListener::HostLifecycleEventListener*;
90 mir::shell::HostLifecycleEventListener::lifecycle_event_occurred*;
91@@ -389,16 +388,6 @@
92 mir::shell::InputTargeter::?InputTargeter*;
93 mir::shell::InputTargeter::InputTargeter*;
94 mir::shell::InputTargeter::operator*;
95- mir::shell::SessionCoordinatorWrapper::add_prompt_provider_for*;
96- mir::shell::SessionCoordinatorWrapper::close_session*;
97- mir::shell::SessionCoordinatorWrapper::focus_next*;
98- mir::shell::SessionCoordinatorWrapper::focussed_application*;
99- mir::shell::SessionCoordinatorWrapper::handle_surface_created*;
100- mir::shell::SessionCoordinatorWrapper::open_session*;
101- mir::shell::SessionCoordinatorWrapper::SessionCoordinatorWrapper*;
102- mir::shell::SessionCoordinatorWrapper::set_focus_to*;
103- mir::shell::SessionCoordinatorWrapper::start_prompt_session_for*;
104- mir::shell::SessionCoordinatorWrapper::stop_prompt_session*;
105 mir::shell::Shell::add_prompt_provider_for*;
106 mir::shell::Shell::close_session*;
107 mir::shell::Shell::create_surface*;
108@@ -423,10 +412,6 @@
109 mir::shell::ShellWrapper::ShellWrapper*;
110 mir::shell::ShellWrapper::start_prompt_session_for*;
111 mir::shell::ShellWrapper::stop_prompt_session*;
112- mir::shell::SurfaceCoordinatorWrapper::add_surface*;
113- mir::shell::SurfaceCoordinatorWrapper::raise*;
114- mir::shell::SurfaceCoordinatorWrapper::remove_surface*;
115- mir::shell::SurfaceCoordinatorWrapper::SurfaceCoordinatorWrapper*;
116 mir::terminate_with_current_exception*;
117 mir::time::Alarm::?Alarm*;
118 mir::time::Alarm::Alarm*;
119@@ -497,11 +482,6 @@
120 non-virtual?thunk?to?mir::shell::FocusController::?FocusController*;
121 non-virtual?thunk?to?mir::shell::HostLifecycleEventListener::?HostLifecycleEventListener*;
122 non-virtual?thunk?to?mir::shell::InputTargeter::?InputTargeter*;
123- non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::close_session*;
124- non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::focus_next*;
125- non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::focussed_application*;
126- non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::open_session*;
127- non-virtual?thunk?to?mir::shell::SessionCoordinatorWrapper::set_focus_to*;
128 non-virtual?thunk?to?mir::shell::ShellWrapper::add_prompt_provider_for*;
129 non-virtual?thunk?to?mir::shell::ShellWrapper::close_session*;
130 non-virtual?thunk?to?mir::shell::ShellWrapper::create_surface*;
131@@ -515,9 +495,6 @@
132 non-virtual?thunk?to?mir::shell::ShellWrapper::set_surface_attribute*;
133 non-virtual?thunk?to?mir::shell::ShellWrapper::start_prompt_session_for*;
134 non-virtual?thunk?to?mir::shell::ShellWrapper::stop_prompt_session*;
135- non-virtual?thunk?to?mir::shell::SurfaceCoordinatorWrapper::add_surface*;
136- non-virtual?thunk?to?mir::shell::SurfaceCoordinatorWrapper::raise*;
137- non-virtual?thunk?to?mir::shell::SurfaceCoordinatorWrapper::remove_surface*;
138 non-virtual?thunk?to?mir::time::Alarm::?Alarm*;
139 non-virtual?thunk?to?mir::time::Timer::?Timer*;
140 typeinfo?for?mir::compositor::Compositor;
141@@ -566,13 +543,10 @@
142 typeinfo?for?mir::shell::AbstractShell;
143 typeinfo?for?mir::shell::DisplayLayout;
144 typeinfo?for?mir::shell::FocusController;
145- typeinfo?for?mir::shell::FocusSetter;
146 typeinfo?for?mir::shell::HostLifecycleEventListener;
147 typeinfo?for?mir::shell::InputTargeter;
148- typeinfo?for?mir::shell::SessionCoordinatorWrapper;
149 typeinfo?for?mir::shell::Shell;
150 typeinfo?for?mir::shell::ShellWrapper;
151- typeinfo?for?mir::shell::SurfaceCoordinatorWrapper;
152 typeinfo?for?mir::time::Alarm;
153 typeinfo?for?mir::time::Timer;
154 vtable?for?mir::compositor::Compositor;
155@@ -621,13 +595,10 @@
156 vtable?for?mir::shell::AbstractShell;
157 vtable?for?mir::shell::DisplayLayout;
158 vtable?for?mir::shell::FocusController;
159- vtable?for?mir::shell::FocusSetter;
160 vtable?for?mir::shell::HostLifecycleEventListener;
161 vtable?for?mir::shell::InputTargeter;
162- vtable?for?mir::shell::SessionCoordinatorWrapper;
163 vtable?for?mir::shell::Shell;
164 vtable?for?mir::shell::ShellWrapper;
165- vtable?for?mir::shell::SurfaceCoordinatorWrapper;
166 vtable?for?mir::time::Alarm;
167 vtable?for?mir::time::Timer;
168

Subscribers

People subscribed via source and target branches