Merge lp:~afrantzis/mir/setup-platform-libs-at-installation into lp:mir

[Alexandros Frantzis]

build: Set up symlinks for platform libraries at make install

build: Set up symlinks for platform libraries at make install

Create symlinks to the default platform libraries (default platform = the first in the cmake MIR_PLATFORM list) so we get a working installation after 'make install'.

NB: doing a 'make install' over an existing Mir package installation will mess up the dpkg alternatives mechanism used for Mir platforms.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1437
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/962/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1081
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/671
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/694
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/694/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/699
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/699/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/672
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/672/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/640
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4383

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

looks sensible, in as much as I understand the cmake code...

review: Approve

[Andreas Pokorny (andreas-pokorny)]

works & looks good

review: Approve

[Alan Griffiths (alan-griffiths)]

Works. (But I can't help wondering if cmake offers a clearer solution - not that I can suggest one.)

review: Approve

[Daniel van Vugt (vanvugt)]

Enough people seem to approve already so I'll abstain.

I will note however we still need to clean up our library names:
78 +install(TARGETS mirplatformgraphicsandroid

review: Abstain

=== modified file 'debian/rules'
--- debian/rules	2014-02-17 09:20:04 +0000
+++ debian/rules	2014-02-28 11:12:06 +0000
@@ -39,7 +39,9 @@
 	dh_makeshlibs -V
 
 override_dh_install:
-	dh_install --fail-missing
+	dh_install --fail-missing \
+	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmirplatformgraphics.so \
+	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmirclientplatform.so
 	sh debian/install_ld_so_conf.sh $(DEB_HOST_MULTIARCH)
 
 override_dh_installdeb:

=== modified file 'src/client/android/CMakeLists.txt'
--- src/client/android/CMakeLists.txt	2014-02-18 21:40:05 +0000
+++ src/client/android/CMakeLists.txt	2014-02-28 11:12:06 +0000
@@ -26,6 +26,8 @@
   ${LIBHARDWARE_LIBRARIES}
 )
 
+install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/android)
+
 if (MIR_TEST_PLATFORM STREQUAL "android")
   add_custom_command(TARGET mirclientplatformandroid
     POST_BUILD
@@ -33,6 +35,11 @@
     COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid> libmirclientplatform.so
     WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
   )
+
+  install(CODE
+    "execute_process(
+       COMMAND ln -sf mir/clientplatform/android/libmirclientplatform.so
+       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
+     )"
+  )
 endif()
-
-install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/android)

=== modified file 'src/client/mesa/CMakeLists.txt'
--- src/client/mesa/CMakeLists.txt	2014-02-18 21:40:05 +0000
+++ src/client/mesa/CMakeLists.txt	2014-02-28 11:12:06 +0000
@@ -27,6 +27,8 @@
   ${DRM_LDFLAGS} ${DRM_LIBRARIES}
 )
 
+install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/mesa)
+
 if (MIR_TEST_PLATFORM STREQUAL "mesa")
   add_custom_command(TARGET mirclientplatformmesa
     POST_BUILD
@@ -34,7 +36,12 @@
     COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa> libmirclientplatform.so
     WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
   )
+
+  install(CODE
+    "execute_process(
+       COMMAND ln -sf mir/clientplatform/mesa/libmirclientplatform.so
+       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
+     )"
+  )
 endif()
 
-install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/mesa)
-

=== modified file 'src/platform/graphics/android/CMakeLists.txt'
--- src/platform/graphics/android/CMakeLists.txt	2014-02-18 21:40:05 +0000
+++ src/platform/graphics/android/CMakeLists.txt	2014-02-28 11:12:06 +0000
@@ -51,6 +51,8 @@
   ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
 )
 
+install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/android)
+
 if (MIR_TEST_PLATFORM STREQUAL "android")
   add_custom_command(TARGET mirplatformgraphicsandroid
     POST_BUILD
@@ -58,6 +60,11 @@
     COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirplatformgraphicsandroid> libmirplatformgraphics.so
     WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
   )
+
+  install(CODE
+    "execute_process(
+       COMMAND ln -sf mir/platformgraphics/android/libmirplatformgraphics.so
+       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
+     )"
+  )
 endif()
-
-install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/android)

=== modified file 'src/platform/graphics/mesa/CMakeLists.txt'
--- src/platform/graphics/mesa/CMakeLists.txt	2014-02-18 21:40:05 +0000
+++ src/platform/graphics/mesa/CMakeLists.txt	2014-02-28 11:12:06 +0000
@@ -54,6 +54,8 @@
   ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
 )
 
+install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/mesa)
+
 if (MIR_TEST_PLATFORM STREQUAL "mesa")
   add_custom_command(TARGET mirplatformgraphicsmesa
     POST_BUILD
@@ -61,6 +63,11 @@
     COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirplatformgraphicsmesa> libmirplatformgraphics.so
     WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
   )
+
+  install(CODE
+    "execute_process(
+       COMMAND ln -sf mir/platformgraphics/mesa/libmirplatformgraphics.so
+       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
+     )"
+  )
 endif()
-
-install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/mesa)