Mir

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

  1. setup-platform-libs-at-installation
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: no longer in the source branch.
Merged at revision: 1444
Proposed branch: lp:~afrantzis/mir/setup-platform-libs-at-installation
Merge into: lp:mir
Diff against target: 123 lines (+39/-9)
5 files modified
debian/rules (+3/-1)
src/client/android/CMakeLists.txt (+9/-2)
src/client/mesa/CMakeLists.txt (+9/-2)
src/platform/graphics/android/CMakeLists.txt (+9/-2)
src/platform/graphics/mesa/CMakeLists.txt (+9/-2)
To merge this branch: bzr merge lp:~afrantzis/mir/setup-platform-libs-at-installation
Reviewer Review Type Date Requested Status
Daniel van Vugt Abstain
Alan Griffiths Approve
Andreas Pokorny (community) Approve
Kevin DuBois (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+208766@code.launchpad.net

Commit message

build: Set up symlinks for platform libraries at make install

Description of the change

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Kevin DuBois (kdub) wrote :

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

review: Approve
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

works & looks good

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

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

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
39 dh_makeshlibs -V39 dh_makeshlibs -V
4040
41override_dh_install:41override_dh_install:
42 dh_install --fail-missing42 dh_install --fail-missing \
43 -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmirplatformgraphics.so \
44 -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmirclientplatform.so
43 sh debian/install_ld_so_conf.sh $(DEB_HOST_MULTIARCH)45 sh debian/install_ld_so_conf.sh $(DEB_HOST_MULTIARCH)
4446
45override_dh_installdeb:47override_dh_installdeb:
4648
=== 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 @@
26 ${LIBHARDWARE_LIBRARIES}26 ${LIBHARDWARE_LIBRARIES}
27)27)
2828
29install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/android)
30
29if (MIR_TEST_PLATFORM STREQUAL "android")31if (MIR_TEST_PLATFORM STREQUAL "android")
30 add_custom_command(TARGET mirclientplatformandroid32 add_custom_command(TARGET mirclientplatformandroid
31 POST_BUILD33 POST_BUILD
@@ -33,6 +35,11 @@
33 COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid> libmirclientplatform.so35 COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirclientplatformandroid> libmirclientplatform.so
34 WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}36 WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
35 )37 )
38
39 install(CODE
40 "execute_process(
41 COMMAND ln -sf mir/clientplatform/android/libmirclientplatform.so
42 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
43 )"
44 )
36endif()45endif()
37
38install(TARGETS mirclientplatformandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/android)
3946
=== 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 @@
27 ${DRM_LDFLAGS} ${DRM_LIBRARIES}27 ${DRM_LDFLAGS} ${DRM_LIBRARIES}
28)28)
2929
30install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/mesa)
31
30if (MIR_TEST_PLATFORM STREQUAL "mesa")32if (MIR_TEST_PLATFORM STREQUAL "mesa")
31 add_custom_command(TARGET mirclientplatformmesa33 add_custom_command(TARGET mirclientplatformmesa
32 POST_BUILD34 POST_BUILD
@@ -34,7 +36,12 @@
34 COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa> libmirclientplatform.so36 COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirclientplatformmesa> libmirclientplatform.so
35 WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}37 WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
36 )38 )
39
40 install(CODE
41 "execute_process(
42 COMMAND ln -sf mir/clientplatform/mesa/libmirclientplatform.so
43 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
44 )"
45 )
37endif()46endif()
3847
39install(TARGETS mirclientplatformmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/clientplatform/mesa)
40
4148
=== 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 @@
51 ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}51 ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
52)52)
5353
54install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/android)
55
54if (MIR_TEST_PLATFORM STREQUAL "android")56if (MIR_TEST_PLATFORM STREQUAL "android")
55 add_custom_command(TARGET mirplatformgraphicsandroid57 add_custom_command(TARGET mirplatformgraphicsandroid
56 POST_BUILD58 POST_BUILD
@@ -58,6 +60,11 @@
58 COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirplatformgraphicsandroid> libmirplatformgraphics.so60 COMMAND ${CMAKE_COMMAND} -E create_symlink android/$<TARGET_FILE_NAME:mirplatformgraphicsandroid> libmirplatformgraphics.so
59 WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}61 WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
60 )62 )
63
64 install(CODE
65 "execute_process(
66 COMMAND ln -sf mir/platformgraphics/android/libmirplatformgraphics.so
67 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
68 )"
69 )
61endif()70endif()
62
63install(TARGETS mirplatformgraphicsandroid LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/android)
6471
=== 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 @@
54 ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}54 ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
55)55)
5656
57install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/mesa)
58
57if (MIR_TEST_PLATFORM STREQUAL "mesa")59if (MIR_TEST_PLATFORM STREQUAL "mesa")
58 add_custom_command(TARGET mirplatformgraphicsmesa60 add_custom_command(TARGET mirplatformgraphicsmesa
59 POST_BUILD61 POST_BUILD
@@ -61,6 +63,11 @@
61 COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirplatformgraphicsmesa> libmirplatformgraphics.so63 COMMAND ${CMAKE_COMMAND} -E create_symlink mesa/$<TARGET_FILE_NAME:mirplatformgraphicsmesa> libmirplatformgraphics.so
62 WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}64 WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
63 )65 )
66
67 install(CODE
68 "execute_process(
69 COMMAND ln -sf mir/platformgraphics/mesa/libmirplatformgraphics.so
70 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
71 )"
72 )
64endif()73endif()
65
66install(TARGETS mirplatformgraphicsmesa LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mir/platformgraphics/mesa)

Subscribers

People subscribed via source and target branches