Merge lp:~alan-griffiths/mir/fix-libmirplatform into lp:mir

[Alan Griffiths]

platform: link the platform objects into the mirplatform shared library and not the libraries that link against it. (Partial fix for lp:1347522)

platform: link the platform objects into the mirplatform shared library and not the libraries that link against it

This isn't a fix for everything in the linked bug, but does get the .../platform/... code into libmirplatform instead of a mixture of other libraries.

E.g.

$ nm -Co lib/libmir*.so | grep "[BT] mir::options::" | cut --fields=1 --delimiter=: | uniq -c
     18 lib/libmirplatform.so

vs:

$ nm -Co lib/libmir*.so | grep "[BT] mir::options::" | cut --fields=1 --delimiter=: | uniq -c
     18 lib/libmirserver.so

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1803
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2226/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1067
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1073
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1058/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/748
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/748/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/749
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/749/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3684
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3684/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2174/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10360

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2226/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> Unpacking libmircommon-dev:armhf (0.6.0bzr1803pkg0utopic3684+autopilot0) ...
> dpkg: error processing archive /home/phablet/archive/libmircommon-dev_0.6.0bzr1803pkg0utopic3684+autopilot0_armhf.deb (--install):
> trying to overwrite '/usr/include/mircommon/mir/variable_length_array.h', which is also in package > mircommon-dev:armhf 0.5.0+14.10.20140724-0ubuntu1

Arghhh!!

I think see bug 1297100 in action: nobody wants that -dev package to run tests!!! (Not sure why its here before installing the tests either.)

[Alan Griffiths (alan-griffiths)]

> > Unpacking libmircommon-dev:armhf (0.6.0bzr1803pkg0utopic3684+autopilot0) ...
> > dpkg: error processing archive /home/phablet/archive/libmircommon-
> dev_0.6.0bzr1803pkg0utopic3684+autopilot0_armhf.deb (--install):
> > trying to overwrite '/usr/include/mircommon/mir/variable_length_array.h',
> which is also in package > mircommon-dev:armhf 0.5.0+14.10.20140724-0ubuntu1
>
> Arghhh!!
>
> I think see bug 1297100 in action: nobody wants that -dev package to run
> tests!!! (Not sure why its here before installing the tests either.)

Actually, it's lp:1348518 and should be fixed by lp:~afrantzis/mir/fix-mircommon-debian-replaces

[Alan Griffiths (alan-griffiths)]

> Actually, it's lp:1348518 and should be fixed by lp:~afrantzis/mir/fix-
> mircommon-debian-replaces

Actually, lp:1348515 is more precise. (So many bugs in such a "simple" file!)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1805
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2240/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1094
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1085
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/762
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/762/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/763
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/763/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/20
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2205
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10445

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2240/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm (had to look up that syntax though, must have been 'fun' to search for....)

review: Approve

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/920/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1112
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1097/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/304
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/304/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-autolanding/304
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-autolanding/304/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/32
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/32/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2217/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10512

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/platform/CMakeLists.txt'
--- src/platform/CMakeLists.txt	2014-07-25 14:11:38 +0000
+++ src/platform/CMakeLists.txt	2014-07-25 14:11:38 +0000
@@ -1,15 +1,16 @@
 include_directories(${PROJECT_SOURCE_DIR}/include/platform)
-include_directories(${UDEV_INCLUDE_DIRS})
 
 add_library(
   mirplatform SHARED
   shared_library_loader.cpp
+  $<TARGET_OBJECTS:mirplatformgraphicscommon>
+  $<TARGET_OBJECTS:miroptions>
 )
 
-target_link_libraries(
-  mirplatform
-  mirplatformgraphicscommon
+target_link_libraries(mirplatform
   mircommon
+  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
+  ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
 )
 
 install(TARGETS mirplatform LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

=== modified file 'src/platform/graphics/CMakeLists.txt'
--- src/platform/graphics/CMakeLists.txt	2014-07-14 10:57:28 +0000
+++ src/platform/graphics/CMakeLists.txt	2014-07-25 14:11:38 +0000
@@ -16,18 +16,11 @@
   tessellation_helpers.cpp
 )
 
-add_library(
-  mirplatformgraphicscommon STATIC
+add_library(mirplatformgraphicscommon OBJECT
 
   ${GRAPHICS_SOURCES}
 )
 
-target_link_libraries(
-  mirplatformgraphicscommon
-
-  ${EGL_LDFLAGS} ${EGL_LIBRARIES}
-)
-
 if (MIR_BUILD_PLATFORM_ANDROID)
   add_subdirectory(android/)
 endif()

=== modified file 'src/platform/options/CMakeLists.txt'
--- src/platform/options/CMakeLists.txt	2014-03-06 06:05:17 +0000
+++ src/platform/options/CMakeLists.txt	2014-07-25 14:11:38 +0000
@@ -5,8 +5,7 @@
   default_configuration.cpp
 )
 
-add_library(
-  miroptions STATIC
+add_library(miroptions OBJECT
 
   ${CHOICE_SOURCES}
 )

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2014-07-23 16:53:13 +0000
+++ src/server/CMakeLists.txt	2014-07-25 14:11:38 +0000
@@ -40,7 +40,6 @@
 )
 
 list(APPEND MIRSERVER_ARCHIVES
-  miroptions
   mircompositor
   mirfrontend
   mirgraphics