Merge lp:~alan-griffiths/mir/miromnibus into lp:mir

[Alan Griffiths]

Added a "mir-all-bare" shared library so that unit_tests and integration_tests do not need to duplicate all the Mir code.

Added a "mir-all-bare" shared library so that unit_tests and integration_tests do not need to duplicate all the Mir code in the executables.

[lp:~alan-griffiths/mir/miromnibus]

1868. By Alan Griffiths on 2014-08-26

A bit less duplication

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1867
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2514/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1480
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1459/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1036/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/396/console

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

review: Needs Fixing (continuous-integration)

[lp:~alan-griffiths/mir/miromnibus]

1869. By Alan Griffiths on 2014-08-27

Install libmiromnibus.so in mir/tools

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1869
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2519/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1482
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1488
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1466/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1041/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/403
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/403/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2550/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12192

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

review: Needs Fixing (continuous-integration)

[lp:~alan-griffiths/mir/miromnibus]

1870. By Alan Griffiths on 2014-08-27

install(TARGETS miromnibus was inside wrong condition

1871. By Alan Griffiths on 2014-08-27

merge lp:~mir-team/mir/development-branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1871
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2520/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1483/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1489/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1467/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1042/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/404
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/404/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2551/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12198

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> bzr: ERROR: Invalid http response for http://bazaar.launchpad.net/~mir-team/mir/development-branch/.bzr/branch-format: Unable to handle http code 502: Bad Gateway

Triggering rebuild

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1871
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2523/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1486
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1492
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1470/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1045
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1045/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/407
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/407/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2553/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12215

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

review: Needs Fixing (continuous-integration)

[lp:~alan-griffiths/mir/miromnibus]

1872. By Alan Griffiths on 2014-08-27

Take the version of libmiromnibus.so from libmirserver.so

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1872
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2526/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1489
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1495
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1473/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1048/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/410/console

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> dh_install: usr/lib/arm-linux-gnueabihf/libmiromnibus.so exists in debian/tmp but is not installed to anywhere

Rats!

[Daniel van Vugt (vanvugt)]

Sounds like a good idea, but a more meaningful library name than "libmiromnibus" should be used. Something like "libmirtesting" etc.

review: Needs Fixing

[Alexandros Frantzis (afrantzis)]

> Sounds like a good idea, but a more meaningful library name than "libmiromnibus" should be used.
> Something like "libmirtesting" etc.

+1

review: Needs Fixing

[Kevin DuBois (kdub)]

abstain on the naming, mostly because I'd expect libmirtesting to be new test oriented code, not just the mirserver code with all the symbols exposed.

needs fixing because jenkins doesn't like the installation step.

review: Needs Fixing

[lp:~alan-griffiths/mir/miromnibus]

1873. By Alan Griffiths on 2014-08-29

merge lp:~mir-team/mir/development-branch

1874. By Alan Griffiths on 2014-08-29

Keep packaging happy

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1874
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2554/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1533
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1510
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1076
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1076/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/447
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/447/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2588
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12350

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> abstain on the naming, mostly because I'd expect libmirtesting to be new test
> oriented code, not just the mirserver code with all the symbols exposed.

+1

> needs fixing because jenkins doesn't like the installation step.

Fixed

[lp:~alan-griffiths/mir/miromnibus]

1875. By Alan Griffiths on 2014-08-29

merge lp:~mir-team/mir/development-branch

1876. By Alan Griffiths on 2014-08-29

s/miromnibus/mir-all-bare/

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1876
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2560/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1545
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1521/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1082
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1082/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/458/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

It took me a short while to figure out the meaning of the new name too :)

I think we could still do better in naming. And syntactically we should avoid "-" in the library name for consistency.

[Robert Carr (robertcarr)]

It also took me a short while to figure out the meaning of the new name (though...I guess I will say less than 90 seconds lol)

I would call it libmirallsymbolsexported

review: Abstain

Unmerged revisions

1876. By Alan Griffiths on 2014-08-29

s/miromnibus/mir-all-bare/

1875. By Alan Griffiths on 2014-08-29

merge lp:~mir-team/mir/development-branch

1874. By Alan Griffiths on 2014-08-29

Keep packaging happy

1873. By Alan Griffiths on 2014-08-29

merge lp:~mir-team/mir/development-branch

1872. By Alan Griffiths on 2014-08-27

Take the version of libmiromnibus.so from libmirserver.so

1871. By Alan Griffiths on 2014-08-27

merge lp:~mir-team/mir/development-branch

1870. By Alan Griffiths on 2014-08-27

install(TARGETS miromnibus was inside wrong condition

1869. By Alan Griffiths on 2014-08-27

Install libmiromnibus.so in mir/tools

1868. By Alan Griffiths on 2014-08-26

A bit less duplication

1867. By Alan Griffiths on 2014-08-26

Use libmiromnibus for unit-tests

=== modified file 'debian/mir-test-tools.install'
--- debian/mir-test-tools.install	2014-08-06 03:10:56 +0000
+++ debian/mir-test-tools.install	2014-08-29 16:22:45 +0000
@@ -5,3 +5,5 @@
 usr/bin/mir_performance_tests
 usr/lib/*/mir/tools/libmirclientlttng.so
 usr/lib/*/mir/tools/libmirserverlttng.so
+usr/lib/*/libmir-all-bare.so.25
+usr/lib/*/libmir-all-bare.so

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-08-29 11:16:38 +0000
+++ src/CMakeLists.txt	2014-08-29 16:22:45 +0000
@@ -18,3 +18,4 @@
 set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
 set(MIR_COMMON_OBJECTS ${MIR_COMMON_OBJECTS} PARENT_SCOPE)
 set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
+set(MIRSERVER_ABI ${MIRSERVER_ABI} PARENT_SCOPE)
\ No newline at end of file

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2014-08-29 12:51:40 +0000
+++ src/server/CMakeLists.txt	2014-08-29 16:22:45 +0000
@@ -101,3 +101,5 @@
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
+
+set(MIRSERVER_ABI ${MIRSERVER_ABI} PARENT_SCOPE)
\ No newline at end of file

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-08-06 03:10:56 +0000
+++ tests/CMakeLists.txt	2014-08-29 16:22:45 +0000
@@ -29,6 +29,48 @@
 option(MIR_BUILD_PERFORMANCE_TESTS "Build performance tests" ON)
 option(MIR_BUILD_UNIT_TESTS "Build unit tests" ON)
 
+if (MIR_BUILD_INTEGRATION_TESTS OR MIR_BUILD_UNIT_TESTS)
+  add_library(mir-all-bare SHARED
+    ${MIR_SERVER_OBJECTS}
+    $<TARGET_OBJECTS:mirclientobjects>
+    ${MIR_PLATFORM_OBJECTS}
+    ${MIR_COMMON_OBJECTS}
+  )
+  
+  target_link_libraries(mir-all-bare
+    3rd_party
+    mirdraw
+    mirtestdraw
+    mirclientrpc
+    mirclientlttngstatic
+  
+    ${PROTOBUF_LIBRARIES}
+    ${Boost_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+    ${DRM_LDFLAGS}
+    ${GBM_LDFLAGS}
+    ${MIR_PLATFORM_REFERENCES}
+    ${MIR_COMMON_REFERENCES}
+    ${MIR_SERVER_REFERENCES}
+  )
+
+  if (MIR_TEST_PLATFORM STREQUAL "android")
+  target_link_libraries(mir-all-bare 
+    mirsharedandroid
+    ${ANDROID_PROPERTIES_LDFLAGS}
+  )
+  endif()
+
+  set_target_properties(mir-all-bare
+    PROPERTIES
+    SOVERSION ${MIRSERVER_ABI}
+  )
+
+  install(TARGETS mir-all-bare
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  )
+endif()
+
 if (MIR_BUILD_ACCEPTANCE_TESTS)
   add_subdirectory(acceptance-tests/)
 endif (MIR_BUILD_ACCEPTANCE_TESTS)

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2014-08-29 12:51:40 +0000
+++ tests/integration-tests/CMakeLists.txt	2014-08-29 16:22:45 +0000
@@ -41,13 +41,10 @@
 endif()
 
 link_directories(${LIBRARY_OUTPUT_PATH})
+
 add_executable(
   mir_integration_tests
   ${INTEGRATION_TESTS_SRCS}
-  ${MIR_SERVER_OBJECTS}
-  $<TARGET_OBJECTS:mirclientobjects>
-  ${MIR_PLATFORM_OBJECTS}
-  ${MIR_COMMON_OBJECTS}
 )
 
 add_dependencies(mir_integration_tests GMock)
@@ -61,32 +58,16 @@
   mir-test-framework
   mir-test-doubles
 
-  mirdraw
-  mirtestdraw
-  mirclientrpc
-  mirclientlttngstatic
-
-  3rd_party
-
-  ${PROTOBUF_LIBRARIES}
+  mir-all-bare
+
   ${Boost_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARY}
   ${GMOCK_MAIN_LIBRARY}
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
-  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
-  ${MIR_PLATFORM_REFERENCES}
-  ${MIR_COMMON_REFERENCES}
-  ${MIR_SERVER_REFERENCES}
-)
-
-if (MIR_TEST_PLATFORM STREQUAL "android")
-target_link_libraries(mir_integration_tests
-  mirsharedandroid
-  ${ANDROID_PROPERTIES_LDFLAGS}
-)
-endif()
+  ${DRM_LDFLAGS}
+  ${GBM_LDFLAGS}
+)
 
 CMAKE_DEPENDENT_OPTION(
   MIR_RUN_INTEGRATION_TESTS

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-08-29 12:51:40 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-08-29 16:22:45 +0000
@@ -41,10 +41,6 @@
 
 add_executable(mir_unit_tests 
   ${UNIT_TEST_SOURCES}
-  ${MIR_SERVER_OBJECTS}
-  $<TARGET_OBJECTS:mirclientobjects>
-  ${MIR_PLATFORM_OBJECTS}
-  ${MIR_COMMON_OBJECTS}
 )
 
 add_dependencies(mir_unit_tests GMock)
@@ -54,39 +50,22 @@
 target_link_libraries(
   mir_unit_tests
 
-  mirdraw
-  mirtestdraw
-  mirclientrpc
-  mirclientlttngstatic
-  demo-shell
-
   mir-test
   mir-test-doubles
   mir-test-doubles-platform
   mir-test-framework
 
-  3rd_party
+  demo-shell
+  mir-all-bare
 
-  ${PROTOBUF_LIBRARIES}
+  ${Boost_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   ${GMOCK_LIBRARY}
   ${GMOCK_MAIN_LIBRARY}
-  ${Boost_LIBRARIES}
-  ${UMOCKDEV_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-  ${LIBHARDWARE_LDFLAGS} ${LIBHARDWARE_LIBRARIES}
-  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
-  ${MIR_PLATFORM_REFERENCES}
-  ${MIR_COMMON_REFERENCES}
-  ${MIR_SERVER_REFERENCES}
-)
-
-if (MIR_TEST_PLATFORM STREQUAL "android")
-target_link_libraries(mir_unit_tests 
-  mirsharedandroid
-  ${ANDROID_PROPERTIES_LDFLAGS}
-)
-endif()
+  ${DRM_LDFLAGS}
+  ${GBM_LDFLAGS}
+)
 
 # Umockdev uses glib, which uses the deprecated "register" allocation specifier
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dregister=")