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

[Alberto Aguirre]

Remove the unused mirserver component

Remove the unused mirserver component

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:266
http://jenkins.qa.ubuntu.com/job/platform-api-ci/388/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/388/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:266
http://jenkins.qa.ubuntu.com/job/platform-api-ci/389/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/389/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

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)]

@Gerry,

Oh true, it merits a version bump.

CI now passed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:267
http://jenkins.qa.ubuntu.com/job/platform-api-ci/390/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/390/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

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)]

FAILED: Continuous integration, rev:268
http://jenkins.qa.ubuntu.com/job/platform-api-ci/391/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/391/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:268
http://jenkins.qa.ubuntu.com/job/platform-api-ci/392/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/392/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Yes!

review: Approve

[Kevin DuBois (kdub)]

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

review: Approve

[Alberto Aguirre (albaguirre)]

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

[Gerry Boland (gerboland)]

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)]

@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)]

PASSED: Continuous integration, rev:314
http://jenkins.qa.ubuntu.com/job/platform-api-ci/424/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/424/rebuild

review: Approve (continuous-integration)

[lp:~mir-team/platform-api/remove-mirserver]

315. By Alberto Aguirre on 2015-06-23

Update changelog

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:315
http://jenkins.qa.ubuntu.com/job/platform-api-ci/425/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/425/rebuild

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

Looks good to me :D

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-23 15:53:15 +0000
+++ debian/changelog	2015-06-23 15:53:15 +0000
@@ -1,6 +1,7 @@
 platform-api (3.0.0) UNRELEASED; urgency=medium
 
   * Remove deprecated ua_ui_* functions.
+  * Remove mirserver backend
 
  -- Robert Carr <[e-mail]>  Wed, 25 Mar 2015 16:00:34 -0700
 
 
=== modified file 'debian/ubuntu-application-api3-desktop.install'
--- debian/ubuntu-application-api3-desktop.install	2014-05-15 15:46:30 +0000
+++ debian/ubuntu-application-api3-desktop.install	2015-06-23 15:53:15 +0000
@@ -1,2 +1,1 @@
 usr/lib/*/libubuntu_application_api_desktop_mirclient.so.*
-usr/lib/*/libubuntu_application_api_desktop_mirserver.so.*
 
=== modified file 'debian/ubuntu-application-api3-touch.install'
--- debian/ubuntu-application-api3-touch.install	2014-05-15 15:46:30 +0000
+++ debian/ubuntu-application-api3-touch.install	2015-06-23 15:53:15 +0000
@@ -1,2 +1,1 @@
-usr/lib/*/libubuntu_application_api_touch_mirserver.so.*
 usr/lib/*/libubuntu_application_api_touch_mirclient.so.*
 
=== modified file 'src/ubuntu/application/common/CMakeLists.txt'
--- src/ubuntu/application/common/CMakeLists.txt	2014-05-15 14:56:16 +0000
+++ src/ubuntu/application/common/CMakeLists.txt	2015-06-23 15:53:15 +0000
@@ -3,6 +3,4 @@
 )
 
 add_subdirectory(application)
-add_subdirectory(mircommon)
 add_subdirectory(mirclient)
-add_subdirectory(mirserver)
 
=== modified file 'src/ubuntu/application/common/mirclient/CMakeLists.txt'
--- src/ubuntu/application/common/mirclient/CMakeLists.txt	2015-06-23 15:53:15 +0000
+++ src/ubuntu/application/common/mirclient/CMakeLists.txt	2015-06-23 15:53:15 +0000
@@ -1,6 +1,10 @@
 set(SOURCES
   ubuntu_application_api_mirclient.cpp
   application_instance_mirclient.cpp
+  application_id_mir.cpp
+  application_options_mir.cpp
+  application_description_mir.cpp
+  lifecycle_delegate_mir.cpp
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
 
=== renamed file 'src/ubuntu/application/common/mircommon/application_description_mir.cpp' => 'src/ubuntu/application/common/mirclient/application_description_mir.cpp'
=== renamed file 'src/ubuntu/application/common/mircommon/application_description_mir_priv.h' => 'src/ubuntu/application/common/mirclient/application_description_mir_priv.h'
=== renamed file 'src/ubuntu/application/common/mircommon/application_id_mir.cpp' => 'src/ubuntu/application/common/mirclient/application_id_mir.cpp'
=== renamed file 'src/ubuntu/application/common/mircommon/application_id_mir_priv.h' => 'src/ubuntu/application/common/mirclient/application_id_mir_priv.h'
=== renamed file 'src/ubuntu/application/common/mircommon/application_options_mir.cpp' => 'src/ubuntu/application/common/mirclient/application_options_mir.cpp'
=== renamed file 'src/ubuntu/application/common/mircommon/application_options_mir_priv.h' => 'src/ubuntu/application/common/mirclient/application_options_mir_priv.h'
=== renamed file 'src/ubuntu/application/common/mircommon/lifecycle_delegate_mir.cpp' => 'src/ubuntu/application/common/mirclient/lifecycle_delegate_mir.cpp'
=== renamed file 'src/ubuntu/application/common/mircommon/lifecycle_delegate_mir_priv.h' => 'src/ubuntu/application/common/mirclient/lifecycle_delegate_mir_priv.h'
=== modified file 'src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp'
--- src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp	2015-06-23 15:53:15 +0000
+++ src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp	2015-06-23 15:53:15 +0000
@@ -17,8 +17,8 @@
  */
 
 #include "application_instance_mirclient_priv.h"
-#include "mircommon/lifecycle_delegate_mir_priv.h"
-#include "mircommon/application_id_mir_priv.h"
+#include "lifecycle_delegate_mir_priv.h"
+#include "application_id_mir_priv.h"
 
 #include <ubuntu/application/lifecycle_delegate.h>
 #include <ubuntu/application/sensors/accelerometer.h>
 
=== removed directory 'src/ubuntu/application/common/mircommon'
=== removed file 'src/ubuntu/application/common/mircommon/CMakeLists.txt'
--- src/ubuntu/application/common/mircommon/CMakeLists.txt	2015-06-23 15:53:15 +0000
+++ src/ubuntu/application/common/mircommon/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-set(SOURCES
-  application_id_mir.cpp
-  application_options_mir.cpp
-  application_description_mir.cpp
-  lifecycle_delegate_mir.cpp
-  )
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC --std=c++11")
-
-include_directories(
-  ${MIRCLIENT_INCLUDE_DIRS}
-  )
-
-add_library(
-  ubuntu_application_api_mircommon STATIC
-  ${SOURCES}
-  )
-
-target_link_libraries(
-  ubuntu_application_api_mircommon
-
-  ${LINK_LIBRARIES}
-  )
 
=== removed directory 'src/ubuntu/application/common/mirserver'
=== removed file 'src/ubuntu/application/common/mirserver/CMakeLists.txt'
--- src/ubuntu/application/common/mirserver/CMakeLists.txt	2014-11-14 16:05:29 +0000
+++ src/ubuntu/application/common/mirserver/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-set(SOURCES
-  ubuntu_application_api_mirserver.cpp
-)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
-
-include_directories(
-    ${CMAKE_BINARY_DIR}/include
-)
-
-add_library(
-    ubuntu_application_api_mirserver STATIC
-    ${SOURCES}
-)
-
-target_link_libraries(
-    ubuntu_application_api_mirserver
-)
 
=== removed file 'src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp'
--- src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp	2015-06-23 15:53:15 +0000
+++ src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2013-2014 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-// C APIs
-#include <ubuntu/application/init.h>
-#include <ubuntu/application/instance.h>
-
-extern "C"
-{
-void u_application_init(void *args)
-{
-    (void) args;
-}
-
-void u_application_finish()
-{
-}
-
-UApplicationInstance* u_application_instance_new_from_description_with_options(UApplicationDescription* u_description, UApplicationOptions* u_options)
-{
-    (void) u_description;
-    (void) u_options;
-    return NULL;
-}
-
-void
-u_application_instance_ref(UApplicationInstance *u_instance)
-{
-    (void) u_instance;
-}
-
-void
-u_application_instance_unref(UApplicationInstance *u_instance)
-{
-    (void) u_instance;
-}
-
-void
-u_application_instance_destroy(UApplicationInstance *instance)
-{
-    (void) instance;
-}
-
-void
-u_application_instance_run(UApplicationInstance *instance)
-{
-    // TODO<papi>: What is this supposed to do? Seems to be no-op on hybris.
-    (void) instance;
-}
-
-MirConnection*
-u_application_instance_get_mir_connection(UApplicationInstance *instance)
-{
-    (void) instance;
-    return nullptr;
-}
-}
 
=== modified file 'src/ubuntu/application/desktop/CMakeLists.txt'
--- src/ubuntu/application/desktop/CMakeLists.txt	2014-06-24 19:59:46 +0000
+++ src/ubuntu/application/desktop/CMakeLists.txt	2015-06-23 15:53:15 +0000
@@ -8,31 +8,11 @@
   ubuntu_application_sensors_desktop.cpp
 )
 
-add_library(
-  ubuntu_application_api_desktop_mirserver MODULE
-
-  module.cpp
-  module_version.h
-  ubuntu_application_sensors_desktop.cpp
-)
-
 target_link_libraries(
   ubuntu_application_api_desktop_mirclient
 
   "-Wl,--whole-archive"
   ubuntu_application_api_mirclient
-  ubuntu_application_api_mircommon
-  ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
-  "-Wl,--no-whole-archive"
-  #TODO: Alarms
-)
-
-target_link_libraries(
-  ubuntu_application_api_desktop_mirserver
-
-  "-Wl,--whole-archive"
-  ubuntu_application_api_mirserver
-  ubuntu_application_api_mircommon
   ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
   "-Wl,--no-whole-archive"
   #TODO: Alarms
@@ -45,22 +25,9 @@
   SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
 )
 
-set_target_properties(
-  ubuntu_application_api_desktop_mirserver
-  PROPERTIES
-  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
-  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
-)
 install(
   TARGETS ubuntu_application_api_desktop_mirclient
   # this is not a development library to compile against, users should always
   # specify the SONAME; so don't build a *.so
   LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
 )
-
-install(
-  TARGETS ubuntu_application_api_desktop_mirserver
-  # this is not a development library to compile against, users should always
-  # specify the SONAME; so don't build a *.so
-  LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
-)
 
=== modified file 'src/ubuntu/application/touch/CMakeLists.txt'
--- src/ubuntu/application/touch/CMakeLists.txt	2014-05-26 12:56:45 +0000
+++ src/ubuntu/application/touch/CMakeLists.txt	2015-06-23 15:53:15 +0000
@@ -9,31 +9,11 @@
   module_version.h
 )
 
-add_library(
-  ubuntu_application_api_touch_mirserver MODULE
-
-  module.cpp
-  module_version.h
-)
-
 target_link_libraries(
   ubuntu_application_api_touch_mirclient
 
   "-Wl,--whole-archive"
   ubuntu_application_api_mirclient
-  ubuntu_application_api_mircommon
-  ubuntu_application_api_hybris
-  ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
-  "-Wl,--no-whole-archive"
-  #TODO: Alarms
-)
-
-target_link_libraries(
-  ubuntu_application_api_touch_mirserver
-
-  "-Wl,--whole-archive"
-  ubuntu_application_api_mirserver
-  ubuntu_application_api_mircommon
   ubuntu_application_api_hybris
   ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
   "-Wl,--no-whole-archive"
@@ -47,22 +27,9 @@
   SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
 )
 
-set_target_properties(
-  ubuntu_application_api_touch_mirserver
-  PROPERTIES
-  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
-  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
-)
 install(
   TARGETS ubuntu_application_api_touch_mirclient
   # this is not a development library to compile against, users should always
   # specify the SONAME; so don't build a *.so
   LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
 )
-
-install(
-  TARGETS ubuntu_application_api_touch_mirserver
-  # this is not a development library to compile against, users should always
-  # specify the SONAME; so don't build a *.so
-  LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
-)