platform-api

Merge lp:~mir-team/platform-api/remove-mirserver into lp:platform-api

  1. remove-mirserver
  2. Merge into trunk
Proposed by Alberto Aguirre on 2015-06-18
Status: Merged
Approved by: Alberto Aguirre on 2015-06-24
Approved revision: 315
Merged at revision: 304
Proposed branch: lp:~mir-team/platform-api/remove-mirserver
Merge into: lp:platform-api
Prerequisite: lp:~mir-team/platform-api/delete-deprecations
Diff against target: 322 lines (+7/-185)
11 files modified
debian/changelog (+1/-0)
debian/ubuntu-application-api3-desktop.install (+0/-1)
debian/ubuntu-application-api3-touch.install (+0/-1)
src/ubuntu/application/common/CMakeLists.txt (+0/-2)
src/ubuntu/application/common/mirclient/CMakeLists.txt (+4/-0)
src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp (+2/-2)
src/ubuntu/application/common/mircommon/CMakeLists.txt (+0/-23)
src/ubuntu/application/common/mirserver/CMakeLists.txt (+0/-18)
src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp (+0/-72)
src/ubuntu/application/desktop/CMakeLists.txt (+0/-33)
src/ubuntu/application/touch/CMakeLists.txt (+0/-33)
To merge this branch: bzr merge lp:~mir-team/platform-api/remove-mirserver
Reviewer Review Type Date Requested Status
Robert Carr (community) Approve on 2015-06-24
PS Jenkins bot continuous-integration 2015-06-18 Approve on 2015-06-23
Kevin DuBois 2015-06-18 Pending
Alan Griffiths 2015-06-18 Pending
Gerry Boland 2015-06-18 Pending
Review via email: mp+262284@code.launchpad.net

This proposal supersedes a proposal from 2014-11-06.

Commit Message

Remove the unused mirserver component

Description of the Change

Remove the unused mirserver component

Rebased on top of lp:~mir-team/platform-api/delete-deprecations, hopefully to land together once and for all :)

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

Lots of red, nice :)

armhf CI fail appears unrelated:
1/1 Test #1: test_ua_sensors_mock .............***Failed 2.01 sec
unsure how this change impacted it.

Since you're removing a feature from the library, think we'd better bump the version numbers.

review: Needs Fixing
Alberto Aguirre (albaguirre) wrote : Posted in a previous version of this proposal

@Gerry,

Oh true, it merits a version bump.

CI now passed.

PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

Please update the lib versions in CMakeLists.txt to match the debian version. Also these should match:
src/ubuntu/application/base_module.h
src/ubuntu/application/desktop/module_version.h
src/ubuntu/application/testbackend/module_version.h
src/ubuntu/application/touch/module_version.h

review: Needs Fixing
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Alan Griffiths (alan-griffiths) wrote : Posted in a previous version of this proposal

Yes!

review: Approve
Kevin DuBois (kdub) wrote : Posted in a previous version of this proposal

I had a branch of similar nature, this one looks good by me.

review: Approve
Alberto Aguirre (albaguirre) wrote : Posted in a previous version of this proposal

@Kevin, IT IS your branch :) (see r265)

Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

Delayed, but finally getting to test this.
First off, I'm having to rebuild qtubuntu to have it work with this. I wasn't expecting an ABI change due to this MR. Expected?

Now I'm getting
Ubuntu Platform API: Unable to load selected module. -- Aborting
and adding dlerror() I get:
libubuntu_platform_hardware_api.so.2: cannot open shared object file: No such file or directory

Not sure where that version 2 is coming from, as you building v3.

Just bumping the so versions isn't enough sadly, as the debian packaging specifies version 2 everywhere. You either need to bump all the packaging to version 3 (and hit everything that depends on version 2) or else just make this a minor version bump.

review: Needs Fixing
Alberto Aguirre (albaguirre) wrote : Posted in a previous version of this proposal

@Gerry,

Yes, after talking to ricmm, we would need to build all 14-15 rev deps on a major rev bump, so we'll stash this for now until an actual api change warrants a 3.0 bump.

Instead, we'll just stub out the mirserver backend so we can do a minor rev bump:
https://code.launchpad.net/~mir-team/platform-api/stub-mirserver/+merge/241820

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~mir-team/platform-api/remove-mirserver updated on 2015-06-23
315. By Alberto Aguirre on 2015-06-23

Update changelog

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Robert Carr (robertcarr) wrote :

Looks good to me :D

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-06-23 15:53:15 +0000
3+++ debian/changelog 2015-06-23 15:53:15 +0000
4@@ -1,6 +1,7 @@
5 platform-api (3.0.0) UNRELEASED; urgency=medium
6
7 * Remove deprecated ua_ui_* functions.
8+ * Remove mirserver backend
9
10 -- Robert Carr <robert.carr@canonical.com> Wed, 25 Mar 2015 16:00:34 -0700
11
12
13=== modified file 'debian/ubuntu-application-api3-desktop.install'
14--- debian/ubuntu-application-api3-desktop.install 2014-05-15 15:46:30 +0000
15+++ debian/ubuntu-application-api3-desktop.install 2015-06-23 15:53:15 +0000
16@@ -1,2 +1,1 @@
17 usr/lib/*/libubuntu_application_api_desktop_mirclient.so.*
18-usr/lib/*/libubuntu_application_api_desktop_mirserver.so.*
19
20=== modified file 'debian/ubuntu-application-api3-touch.install'
21--- debian/ubuntu-application-api3-touch.install 2014-05-15 15:46:30 +0000
22+++ debian/ubuntu-application-api3-touch.install 2015-06-23 15:53:15 +0000
23@@ -1,2 +1,1 @@
24-usr/lib/*/libubuntu_application_api_touch_mirserver.so.*
25 usr/lib/*/libubuntu_application_api_touch_mirclient.so.*
26
27=== modified file 'src/ubuntu/application/common/CMakeLists.txt'
28--- src/ubuntu/application/common/CMakeLists.txt 2014-05-15 14:56:16 +0000
29+++ src/ubuntu/application/common/CMakeLists.txt 2015-06-23 15:53:15 +0000
30@@ -3,6 +3,4 @@
31 )
32
33 add_subdirectory(application)
34-add_subdirectory(mircommon)
35 add_subdirectory(mirclient)
36-add_subdirectory(mirserver)
37
38=== modified file 'src/ubuntu/application/common/mirclient/CMakeLists.txt'
39--- src/ubuntu/application/common/mirclient/CMakeLists.txt 2015-06-23 15:53:15 +0000
40+++ src/ubuntu/application/common/mirclient/CMakeLists.txt 2015-06-23 15:53:15 +0000
41@@ -1,6 +1,10 @@
42 set(SOURCES
43 ubuntu_application_api_mirclient.cpp
44 application_instance_mirclient.cpp
45+ application_id_mir.cpp
46+ application_options_mir.cpp
47+ application_description_mir.cpp
48+ lifecycle_delegate_mir.cpp
49 )
50
51 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
52
53=== renamed file 'src/ubuntu/application/common/mircommon/application_description_mir.cpp' => 'src/ubuntu/application/common/mirclient/application_description_mir.cpp'
54=== renamed file 'src/ubuntu/application/common/mircommon/application_description_mir_priv.h' => 'src/ubuntu/application/common/mirclient/application_description_mir_priv.h'
55=== renamed file 'src/ubuntu/application/common/mircommon/application_id_mir.cpp' => 'src/ubuntu/application/common/mirclient/application_id_mir.cpp'
56=== renamed file 'src/ubuntu/application/common/mircommon/application_id_mir_priv.h' => 'src/ubuntu/application/common/mirclient/application_id_mir_priv.h'
57=== renamed file 'src/ubuntu/application/common/mircommon/application_options_mir.cpp' => 'src/ubuntu/application/common/mirclient/application_options_mir.cpp'
58=== renamed file 'src/ubuntu/application/common/mircommon/application_options_mir_priv.h' => 'src/ubuntu/application/common/mirclient/application_options_mir_priv.h'
59=== renamed file 'src/ubuntu/application/common/mircommon/lifecycle_delegate_mir.cpp' => 'src/ubuntu/application/common/mirclient/lifecycle_delegate_mir.cpp'
60=== renamed file 'src/ubuntu/application/common/mircommon/lifecycle_delegate_mir_priv.h' => 'src/ubuntu/application/common/mirclient/lifecycle_delegate_mir_priv.h'
61=== modified file 'src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp'
62--- src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp 2015-06-23 15:53:15 +0000
63+++ src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp 2015-06-23 15:53:15 +0000
64@@ -17,8 +17,8 @@
65 */
66
67 #include "application_instance_mirclient_priv.h"
68-#include "mircommon/lifecycle_delegate_mir_priv.h"
69-#include "mircommon/application_id_mir_priv.h"
70+#include "lifecycle_delegate_mir_priv.h"
71+#include "application_id_mir_priv.h"
72
73 #include <ubuntu/application/lifecycle_delegate.h>
74 #include <ubuntu/application/sensors/accelerometer.h>
75
76=== removed directory 'src/ubuntu/application/common/mircommon'
77=== removed file 'src/ubuntu/application/common/mircommon/CMakeLists.txt'
78--- src/ubuntu/application/common/mircommon/CMakeLists.txt 2015-06-23 15:53:15 +0000
79+++ src/ubuntu/application/common/mircommon/CMakeLists.txt 1970-01-01 00:00:00 +0000
80@@ -1,23 +0,0 @@
81-set(SOURCES
82- application_id_mir.cpp
83- application_options_mir.cpp
84- application_description_mir.cpp
85- lifecycle_delegate_mir.cpp
86- )
87-
88-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC --std=c++11")
89-
90-include_directories(
91- ${MIRCLIENT_INCLUDE_DIRS}
92- )
93-
94-add_library(
95- ubuntu_application_api_mircommon STATIC
96- ${SOURCES}
97- )
98-
99-target_link_libraries(
100- ubuntu_application_api_mircommon
101-
102- ${LINK_LIBRARIES}
103- )
104
105=== removed directory 'src/ubuntu/application/common/mirserver'
106=== removed file 'src/ubuntu/application/common/mirserver/CMakeLists.txt'
107--- src/ubuntu/application/common/mirserver/CMakeLists.txt 2014-11-14 16:05:29 +0000
108+++ src/ubuntu/application/common/mirserver/CMakeLists.txt 1970-01-01 00:00:00 +0000
109@@ -1,18 +0,0 @@
110-set(SOURCES
111- ubuntu_application_api_mirserver.cpp
112-)
113-
114-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
115-
116-include_directories(
117- ${CMAKE_BINARY_DIR}/include
118-)
119-
120-add_library(
121- ubuntu_application_api_mirserver STATIC
122- ${SOURCES}
123-)
124-
125-target_link_libraries(
126- ubuntu_application_api_mirserver
127-)
128
129=== removed file 'src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp'
130--- src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp 2015-06-23 15:53:15 +0000
131+++ src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp 1970-01-01 00:00:00 +0000
132@@ -1,72 +0,0 @@
133-/*
134- * Copyright (C) 2013-2014 Canonical Ltd
135- *
136- * This program is free software: you can redistribute it and/or modify
137- * it under the terms of the GNU Lesser General Public License version 3 as
138- * published by the Free Software Foundation.
139- *
140- * This program is distributed in the hope that it will be useful,
141- * but WITHOUT ANY WARRANTY; without even the implied warranty of
142- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
143- * GNU Lesser General Public License for more details.
144- *
145- * You should have received a copy of the GNU Lesser General Public License
146- * along with this program. If not, see <http://www.gnu.org/licenses/>.
147- *
148- * Authored by: Robert Carr <robert.carr@canonical.com>
149- */
150-
151-// C APIs
152-#include <ubuntu/application/init.h>
153-#include <ubuntu/application/instance.h>
154-
155-extern "C"
156-{
157-void u_application_init(void *args)
158-{
159- (void) args;
160-}
161-
162-void u_application_finish()
163-{
164-}
165-
166-UApplicationInstance* u_application_instance_new_from_description_with_options(UApplicationDescription* u_description, UApplicationOptions* u_options)
167-{
168- (void) u_description;
169- (void) u_options;
170- return NULL;
171-}
172-
173-void
174-u_application_instance_ref(UApplicationInstance *u_instance)
175-{
176- (void) u_instance;
177-}
178-
179-void
180-u_application_instance_unref(UApplicationInstance *u_instance)
181-{
182- (void) u_instance;
183-}
184-
185-void
186-u_application_instance_destroy(UApplicationInstance *instance)
187-{
188- (void) instance;
189-}
190-
191-void
192-u_application_instance_run(UApplicationInstance *instance)
193-{
194- // TODO<papi>: What is this supposed to do? Seems to be no-op on hybris.
195- (void) instance;
196-}
197-
198-MirConnection*
199-u_application_instance_get_mir_connection(UApplicationInstance *instance)
200-{
201- (void) instance;
202- return nullptr;
203-}
204-}
205
206=== modified file 'src/ubuntu/application/desktop/CMakeLists.txt'
207--- src/ubuntu/application/desktop/CMakeLists.txt 2014-06-24 19:59:46 +0000
208+++ src/ubuntu/application/desktop/CMakeLists.txt 2015-06-23 15:53:15 +0000
209@@ -8,31 +8,11 @@
210 ubuntu_application_sensors_desktop.cpp
211 )
212
213-add_library(
214- ubuntu_application_api_desktop_mirserver MODULE
215-
216- module.cpp
217- module_version.h
218- ubuntu_application_sensors_desktop.cpp
219-)
220-
221 target_link_libraries(
222 ubuntu_application_api_desktop_mirclient
223
224 "-Wl,--whole-archive"
225 ubuntu_application_api_mirclient
226- ubuntu_application_api_mircommon
227- ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
228- "-Wl,--no-whole-archive"
229- #TODO: Alarms
230-)
231-
232-target_link_libraries(
233- ubuntu_application_api_desktop_mirserver
234-
235- "-Wl,--whole-archive"
236- ubuntu_application_api_mirserver
237- ubuntu_application_api_mircommon
238 ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
239 "-Wl,--no-whole-archive"
240 #TODO: Alarms
241@@ -45,22 +25,9 @@
242 SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
243 )
244
245-set_target_properties(
246- ubuntu_application_api_desktop_mirserver
247- PROPERTIES
248- VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
249- SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
250-)
251 install(
252 TARGETS ubuntu_application_api_desktop_mirclient
253 # this is not a development library to compile against, users should always
254 # specify the SONAME; so don't build a *.so
255 LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
256 )
257-
258-install(
259- TARGETS ubuntu_application_api_desktop_mirserver
260- # this is not a development library to compile against, users should always
261- # specify the SONAME; so don't build a *.so
262- LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
263-)
264
265=== modified file 'src/ubuntu/application/touch/CMakeLists.txt'
266--- src/ubuntu/application/touch/CMakeLists.txt 2014-05-26 12:56:45 +0000
267+++ src/ubuntu/application/touch/CMakeLists.txt 2015-06-23 15:53:15 +0000
268@@ -9,31 +9,11 @@
269 module_version.h
270 )
271
272-add_library(
273- ubuntu_application_api_touch_mirserver MODULE
274-
275- module.cpp
276- module_version.h
277-)
278-
279 target_link_libraries(
280 ubuntu_application_api_touch_mirclient
281
282 "-Wl,--whole-archive"
283 ubuntu_application_api_mirclient
284- ubuntu_application_api_mircommon
285- ubuntu_application_api_hybris
286- ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
287- "-Wl,--no-whole-archive"
288- #TODO: Alarms
289-)
290-
291-target_link_libraries(
292- ubuntu_application_api_touch_mirserver
293-
294- "-Wl,--whole-archive"
295- ubuntu_application_api_mirserver
296- ubuntu_application_api_mircommon
297 ubuntu_application_api_hybris
298 ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
299 "-Wl,--no-whole-archive"
300@@ -47,22 +27,9 @@
301 SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
302 )
303
304-set_target_properties(
305- ubuntu_application_api_touch_mirserver
306- PROPERTIES
307- VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
308- SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
309-)
310 install(
311 TARGETS ubuntu_application_api_touch_mirclient
312 # this is not a development library to compile against, users should always
313 # specify the SONAME; so don't build a *.so
314 LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
315 )
316-
317-install(
318- TARGETS ubuntu_application_api_touch_mirserver
319- # this is not a development library to compile against, users should always
320- # specify the SONAME; so don't build a *.so
321- LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
322-)

Subscribers

People subscribed via source and target branches