Merge lp:~andreas-pokorny/mir/unwrap-the-wrap into lp:mir

[Andreas Pokorny]

Remove wrapper and instead search for client and server platform paths relative to executable path but fallback to the compiled in directory in any case of failure

This removes the wrapper executable which was used to make running mir binaries simpler but also more painfull everytime you wanted to used gdb.

With this change client and server first peek for ../lib/mir/server-platforms and ../lib/server-modules (s/server/client for client) before settling with the compiled in path.

Alternatives not tried/proposed: have another compiled in path containing the CMAKE_BUILD_DIR.

[lp:~andreas-pokorny/mir/unwrap-the-wrap]

2167. By Andreas Pokorny on 2015-01-21

merge prereq

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2167
http://jenkins.qa.ubuntu.com/job/mir-ci/2739/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/964
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/964
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/926/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/736/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/926/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2739/rebuild

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

>> With this change client and server first peek for ../lib/mir/server-platforms and ../lib/server-modules
>> (s/server/client for client) before settling with the compiled in path.

I'm concerned this may be the wrong choice for release builds...

review: Needs Information

[Andreas Pokorny (andreas-pokorny)]

> >> With this change client and server first peek for ../lib/mir/server-
> platforms and ../lib/server-modules
> >> (s/server/client for client) before settling with the compiled in path.
>
> I'm concerned this may be the wrong choice for release builds...

hmmm I am not sure what would help your concerns, but we could do changes to our build directory structure to decrease the probability a deployed binary finds a directory at all... or increase the chance this initial peek hits the distribution choice for mir platform libraries.

[lp:~andreas-pokorny/mir/unwrap-the-wrap]

2168. By Andreas Pokorny on 2015-01-21

dont install when noinstall

[Kevin DuBois (kdub)]

I suppose I prefer a search to wrapping all the binaries we have so that we load with a proper environment variable loaded, so if this works, seems a step in the right direction. (I was dreading explaining the env variable to bringup teams...). I guess my ideal approach would be to have the linker find libmirplatform.so.X, and then have the common platform library search paths, and select the best-fitting platform. At any rate, seems a bit better (if the packaging is fixed)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2168
http://jenkins.qa.ubuntu.com/job/mir-ci/2748/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/977/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/976
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/938
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/745
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/745/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/938
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/938/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4034
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17307

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2748/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

===
383 + for (auto const& path : {base_path + "/../lib/server-modules/", base_path + "/../lib/mir/server-platform/"})

402 + for (auto const& path : {base_path + "/../lib/client-modules/", base_path + "/../lib/mir/client-platform/"})
===

I'm not convinced this should be in production code for the sake of running non-installed binaries.

Also MIR_CLIENT_PLATFORM_PATH and MIR_SERVER_PLATFORM_PATH could be different than the relative path described above right?

review: Needs Information

[Daniel van Vugt (vanvugt)]

I like the idea of removing all wrappers if we have something else that works. Many of us argued for not wrapping from the beginning :)

Although I'm not sure what the immediate need is here... Our wrappers work perfectly both locally and on remote hosts already: rsync -avH lib bin phablet@nexus4:testmir/

(1) Not really portable outside of the Linux:
366 + auto tmp = readlink("/proc/self/exe", buf, sizeof buf);
A more portable solution is to make a path relative to argv[0]

(2) executable_path.cpp: Lines a a bit too long to be readable.

(3) Successful unwrapping is measured by our ability to remove this function, not just rename it:
34 -function (mir_add_wrapped_executable TARGET)
35 - set(REAL_EXECUTABLE .${TARGET}-uninstalled)
36 +function (mir_add_executable TARGET)

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Still needs fixing. Mainly on (3) as a successful removal of wrapping involves removing our wrapping of CMake's add_executable() too.

Although we don't need this branch right now either. I've proposed a simple fix for the original problem:
https://code.launchpad.net/~vanvugt/mir/append-libpath/+merge/247255

[Andreas Pokorny (andreas-pokorny)]

> Still needs fixing. Mainly on (3) as a successful removal of wrapping involves
> removing our wrapping of CMake's add_executable() too.
>
> Although we don't need this branch right now either. I've proposed a simple
> fix for the original problem:
> https://code.launchpad.net/~vanvugt/mir/append-libpath/+merge/247255

Another problem that occurred was that gdb fails to restart when you go through the wrapper. So if you want to use it you have to use the '.uninstalled' binaries.

(3) the function still fulfills a purpose it installs executables to bin and provides a NOINSTALL flag, so I left it there.

[lp:~andreas-pokorny/mir/unwrap-the-wrap]

2169. By Andreas Pokorny on 2015-01-22

simplified a bit - {server,client}-platorms is only used when deployed,
but library directories could be arbitrary

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2169
http://jenkins.qa.ubuntu.com/job/mir-ci/2772/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1005/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1004/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/966/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/769/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/966/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2772/rebuild

review: Needs Fixing (continuous-integration)

[lp:~andreas-pokorny/mir/unwrap-the-wrap]

2170. By Andreas Pokorny on 2015-01-22

merged prereq

[Alberto Aguirre (albaguirre)]

I suppose I prefer just a simple launcher script (not the current wrapper) for dev purposes - which is what uninstalled binaries and libraries are mostly used for.

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2170
http://jenkins.qa.ubuntu.com/job/mir-ci/2779/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1018/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1017
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/979/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/776/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/979/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2779/rebuild

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

Maybe only for build-type = DEBUG?

[Daniel van Vugt (vanvugt)]

> (3) the function still fulfills a purpose it installs executables to bin and provides a NOINSTALL flag, so I left it there.

It's a hack we only added last month. And NOINSTALL is a hack I only added last month to fix other bugs with the first wrapping system. We should get back to clean and pure CMake without leaving behind any remnants of the wrapping work if we can. That means using add_executable and explicit install rules.

And yeah I know gdb is a problem. We all knew it would be a problem. I too was one of the people who originally opposed wrapping for that and other reasons :)

[Andreas Pokorny (andreas-pokorny)]

> > (3) the function still fulfills a purpose it installs executables to bin and
> provides a NOINSTALL flag, so I left it there.
>
> It's a hack we only added last month. And NOINSTALL is a hack I only added
> last month to fix other bugs with the first wrapping system. We should get
> back to clean and pure CMake without leaving behind any remnants of the
> wrapping work if we can. That means using add_executable and explicit install
> rules.
>
> And yeah I know gdb is a problem. We all knew it would be a problem. I too was
> one of the people who originally opposed wrapping for that and other reasons
> :)

hm cmake is meant to be programmable/extendable. The base set of function requires one to write rather verbose configurations. There is nothing negative about adding intent and reducing noise.

I will put this back to WIP, as we discussed a better approach yesterday during standup, while there is still there is a lack of broad agreement...

Unmerged revisions

2170. By Andreas Pokorny on 2015-01-22

merged prereq

2169. By Andreas Pokorny on 2015-01-22

simplified a bit - {server,client}-platorms is only used when deployed,
but library directories could be arbitrary

2168. By Andreas Pokorny on 2015-01-21

dont install when noinstall

2167. By Andreas Pokorny on 2015-01-21

merge prereq

2166. By Andreas Pokorny on 2015-01-21

Remove wrapper and instead search for client and server platform paths relative to executable path but fallback to the compiled in directory in any case of failure

=== modified file 'benchmarks/android-input/CMakeLists.txt'
--- benchmarks/android-input/CMakeLists.txt	2015-01-16 02:57:31 +0000
+++ benchmarks/android-input/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -7,7 +7,7 @@
   ${MIR_3RD_PARTY_INCLUDE_DIRECTORIES}
 )
 
-mir_add_wrapped_executable(input-reader-perf NOINSTALL
+mir_add_executable(input-reader-perf NOINSTALL
   input_reader_perf.cpp
 )
 

=== modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
--- benchmarks/frame-uniformity/CMakeLists.txt	2015-01-16 02:57:31 +0000
+++ benchmarks/frame-uniformity/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -11,7 +11,7 @@
   ${MIR_3RD_PARTY_INCLUDE_DIRECTORIES}
 )
 
-mir_add_wrapped_executable(frame_uniformity_test_client NOINSTALL
+mir_add_executable(frame_uniformity_test_client NOINSTALL
   touch_measuring_client.cpp
   touch_producing_server.cpp
   frame_uniformity_test.cpp

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2015-01-16 02:57:31 +0000
+++ cmake/MirCommon.cmake	2015-01-22 16:32:05 +0000
@@ -169,27 +169,17 @@
   endif()
 endfunction()
 
-function (mir_add_wrapped_executable TARGET)
-  set(REAL_EXECUTABLE .${TARGET}-uninstalled)
+function (mir_add_executable TARGET)
 
+  # TODO this can be done nicer with cmakes argument parser 
   list(GET ARGN 0 modifier)
   if ("${modifier}" STREQUAL "NOINSTALL")
-    list(REMOVE_AT ARGN 0)
-  else()
-    install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/${REAL_EXECUTABLE}
-      DESTINATION ${CMAKE_INSTALL_BINDIR}
-      RENAME ${TARGET}
-    )
+      list(REMOVE_AT ARGN 0)
   endif()
 
   add_executable(${TARGET} ${ARGN})
-  set_target_properties(${TARGET} PROPERTIES
-    OUTPUT_NAME ${REAL_EXECUTABLE}
-    SKIP_BUILD_RPATH TRUE
-  )
 
-  add_custom_target(${TARGET}-wrapped
-    ln -fs wrapper ${CMAKE_BINARY_DIR}/bin/${TARGET}
-  )
-  add_dependencies(${TARGET} ${TARGET}-wrapped)
+  if (NOT "${modifier}" STREQUAL "NOINSTALL")
+      install(TARGETS ${TARGET} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+  endif()
 endfunction()

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2015-01-16 02:57:31 +0000
+++ examples/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -1,4 +1,4 @@
-mir_add_wrapped_executable(mir_demo_standalone_render_surfaces
+mir_add_executable(mir_demo_standalone_render_surfaces
   render_surfaces.cpp
   buffer_render_target.cpp
   image_renderer.cpp
@@ -31,44 +31,44 @@
   ${EGL_LIBRARIES}
   ${GLESv2_LIBRARIES}
 )
-mir_add_wrapped_executable(mir_demo_client_eglflash
+mir_add_executable(mir_demo_client_eglflash
   eglflash.c
 )
 target_link_libraries(mir_demo_client_eglflash
   eglapp
 )
-mir_add_wrapped_executable(mir_demo_client_egltriangle
+mir_add_executable(mir_demo_client_egltriangle
   egltriangle.c
 )
 target_link_libraries(mir_demo_client_egltriangle
   eglapp
 )
-mir_add_wrapped_executable(mir_demo_client_eglcounter
+mir_add_executable(mir_demo_client_eglcounter
   eglcounter.cpp
 )
 target_link_libraries(mir_demo_client_eglcounter
   eglapp
 )
-mir_add_wrapped_executable(mir_demo_client_eglplasma
+mir_add_executable(mir_demo_client_eglplasma
   eglplasma.c
 )
 target_link_libraries(mir_demo_client_eglplasma
   eglapp
 )
-mir_add_wrapped_executable(mir_demo_client_cursors
+mir_add_executable(mir_demo_client_cursors
   cursors_demo_client.c
 )
 target_link_libraries(mir_demo_client_cursors
   eglapp
 )
-mir_add_wrapped_executable(mir_demo_client_eglstateswitcher
+mir_add_executable(mir_demo_client_eglstateswitcher
   eglstateswitcher.c
 )
 target_link_libraries(mir_demo_client_eglstateswitcher
   eglapp
 )
 
-mir_add_wrapped_executable(mir_demo_client_basic
+mir_add_executable(mir_demo_client_basic
   basic.c
 )
 
@@ -80,22 +80,22 @@
   ${CMAKE_THREAD_LIBS_INIT}
 )
 
-mir_add_wrapped_executable(mir_demo_client_release_at_exit release_at_exit.c)
+mir_add_executable(mir_demo_client_release_at_exit release_at_exit.c)
 target_link_libraries(mir_demo_client_release_at_exit mirclient)
 
-mir_add_wrapped_executable(mir_demo_client_multiwin multiwin.c)
+mir_add_executable(mir_demo_client_multiwin multiwin.c)
 target_link_libraries(mir_demo_client_multiwin mirclient)
 
-mir_add_wrapped_executable(mir_demo_client_fingerpaint fingerpaint.c)
+mir_add_executable(mir_demo_client_fingerpaint fingerpaint.c)
 target_link_libraries(mir_demo_client_fingerpaint mirclient)
 
-mir_add_wrapped_executable(mir_demo_client_progressbar progressbar.c)
+mir_add_executable(mir_demo_client_progressbar progressbar.c)
 target_link_libraries(mir_demo_client_progressbar mirclient)
 
-mir_add_wrapped_executable(mir_demo_client_display_config demo_client_display_config.c)
+mir_add_executable(mir_demo_client_display_config demo_client_display_config.c)
 target_link_libraries(mir_demo_client_display_config eglapp)
 
-mir_add_wrapped_executable(mir_demo_client_flicker
+mir_add_executable(mir_demo_client_flicker
   flicker.c
 )
 
@@ -107,7 +107,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
 )
 
-mir_add_wrapped_executable(mir_demo_client_scroll
+mir_add_executable(mir_demo_client_scroll
   scroll.cpp
 )
 
@@ -123,7 +123,7 @@
 
 )
 
-mir_add_wrapped_executable(mir_demo_client_prompt_session prompt_session.c)
+mir_add_executable(mir_demo_client_prompt_session prompt_session.c)
 target_link_libraries(mir_demo_client_prompt_session mirclient)
 
 add_library(mirdraw STATIC graphics_utils.cpp)
@@ -136,7 +136,7 @@
   ${GLESv2_INCLUDE_DIRS}
 )
 
-mir_add_wrapped_executable(mir_demo_standalone_render_to_fb
+mir_add_executable(mir_demo_standalone_render_to_fb
     render_to_fb.cpp
 )
 
@@ -146,7 +146,7 @@
     ${Boost_LIBRARIES}
 )
 
-mir_add_wrapped_executable(mir_demo_server
+mir_add_executable(mir_demo_server
   server_example.cpp
   glog_logger.cpp
   server_example_test_client.cpp
@@ -160,10 +160,10 @@
   ${Boost_LIBRARIES}
 )
 
-mir_add_wrapped_executable(mir_demo_server_minimal server_minimal.cpp)
+mir_add_executable(mir_demo_server_minimal server_minimal.cpp)
 target_link_libraries(mir_demo_server_minimal mirserver)
 
-mir_add_wrapped_executable(mir_demo_standalone_render_overlays
+mir_add_executable(mir_demo_standalone_render_overlays
     render_overlays.cpp
 )
 

=== modified file 'playground/demo-shell/CMakeLists.txt'
--- playground/demo-shell/CMakeLists.txt	2015-01-14 06:39:13 +0000
+++ playground/demo-shell/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -4,7 +4,7 @@
   window_manager.cpp
 )
 
-mir_add_wrapped_executable(mir_proving_server
+mir_add_executable(mir_proving_server
   demo_shell.cpp
 )
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-01-22 16:32:04 +0000
+++ src/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -11,6 +11,11 @@
 # Add the platform implementations before exposing any private APIs
 add_subdirectory(platforms/)
 
+# required in common
+set(MIR_CLIENT_PLATFORM_PATH
+  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mir/client-platform
+)
+
 # the src/include/... directories should be private to the implementation
 include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
 set(MIR_GENERATED_INCLUDE_DIRECTORIES)
@@ -23,12 +28,6 @@
 add_subdirectory(client/)
 add_subdirectory(utils/)
 
-add_executable(wrapper wrapper.c)
-set_property(TARGET wrapper
-             APPEND_STRING PROPERTY COMPILE_FLAGS " -DEXECUTABLE_FORMAT=\\\".%s-uninstalled\\\"")
-set_property(TARGET wrapper
-             APPEND_STRING PROPERTY COMPILE_FLAGS " -D_BSD_SOURCE")
-
 set(
   MIR_GENERATED_INCLUDE_DIRECTORIES
   ${MIR_GENERATED_INCLUDE_DIRECTORIES}

=== modified file 'src/client/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp	2015-01-22 16:32:04 +0000
+++ src/client/default_connection_configuration.cpp	2015-01-22 16:32:05 +0000
@@ -34,6 +34,7 @@
 #include "connection_surface_map.h"
 #include "lifecycle_control.h"
 #include "mir/shared_library.h"
+#include "mir/executable_path.h"
 #include "mir/client_platform_factory.h"
 #include "probing_client_platform_factory.h"
 #include "mir_event_distributor.h"
@@ -122,7 +123,8 @@
             else
             {
                 auto const platform_path_override = getenv("MIR_CLIENT_PLATFORM_PATH");
-                auto const platform_path = platform_path_override ? platform_path_override : MIR_CLIENT_PLATFORM_PATH;
+                auto const builtin_path = mir::default_client_platform_path();
+                auto const platform_path = platform_path_override ? platform_path_override : builtin_path.c_str();
                 platform_plugins = mir::libraries_for_path(platform_path, *the_shared_library_prober_report());
             }
 

=== modified file 'src/common/CMakeLists.txt'
--- src/common/CMakeLists.txt	2015-01-14 06:39:13 +0000
+++ src/common/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -1,4 +1,8 @@
-add_definitions(-DMIR_LOG_COMPONENT_FALLBACK="mircommon")
+add_definitions(
+    -DMIR_LOG_COMPONENT_FALLBACK="mircommon"
+    -DMIR_SERVER_PLATFORM_PATH="${MIR_SERVER_PLATFORM_PATH}"
+    -DMIR_CLIENT_PLATFORM_PATH="${MIR_CLIENT_PLATFORM_PATH}"
+)
 
 set(MIR_GENERATED_INCLUDE_DIRECTORIES)
 set(MIR_COMMON_SOURCES)
@@ -17,9 +21,16 @@
 add_subdirectory(sharedlibrary)
 add_subdirectory(thread)
 add_subdirectory(time)
+
+add_library(mircommonbaseobjects
+  OBJECT
+  event.cpp
+  log.cpp
+  executable_path.cpp
+)
 list(APPEND MIR_COMMON_SOURCES
   $<TARGET_OBJECTS:mirtime>
-  ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
+  $<TARGET_OBJECTS:mircommonbaseobjects>
 )
 
 set(PREFIX "${CMAKE_INSTALL_PREFIX}")
@@ -32,14 +43,9 @@
   ${MIR_GENERATED_INCLUDE_DIRECTORIES}
   PARENT_SCOPE)
 
-
 MESSAGE( STATUS "MIR_COMMON_SOURCES. . . : ${MIR_COMMON_SOURCES}" )
 MESSAGE( STATUS "MIR_COMMON_REFERENCES . : ${MIR_COMMON_REFERENCES}" )
 
-list(APPEND MIR_COMMON_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/event.cpp
-)
-
 add_library(mircommon
   SHARED
   ${MIR_COMMON_SOURCES}

=== added file 'src/common/executable_path.cpp'
--- src/common/executable_path.cpp	1970-01-01 00:00:00 +0000
+++ src/common/executable_path.cpp	2015-01-22 16:32:05 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2015 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:
+ *  Andreas Pokorny <[e-mail]>
+ */
+
+#include "mir/executable_path.h"
+
+#include <libgen.h>
+#include <stdexcept>
+#include <boost/throw_exception.hpp>
+#include <boost/exception/errinfo_errno.hpp>
+#include <boost/filesystem.hpp>
+
+std::string mir::executable_path()
+{
+    char buf[1024];
+    auto tmp = readlink("/proc/self/exe", buf, sizeof buf);
+    if (tmp < 0)
+        BOOST_THROW_EXCEPTION(boost::enable_error_info(
+                                  std::runtime_error("Failed to find our executable path"))
+                              << boost::errinfo_errno(errno));
+    if (tmp > static_cast<ssize_t>(sizeof(buf) - 1))
+        BOOST_THROW_EXCEPTION(std::runtime_error("Path to executable is too long!"));
+    buf[tmp] = '\0';
+    return dirname(buf);
+}
+
+std::string mir::default_server_platform_path()
+{
+    try
+    {
+        auto inside_build_dir = executable_path() + "/../lib/server-modules/";
+        if (boost::filesystem::exists(inside_build_dir))
+            return inside_build_dir;
+    }
+    catch(boost::exception &)
+    {
+        // a failure in searching the module path inside build directories is nothing the deployed server libraries
+        // should have to handle, hence ignored here
+    }
+
+    return MIR_SERVER_PLATFORM_PATH;
+}
+
+std::string mir::default_client_platform_path()
+{
+    try
+    {
+        auto inside_build_dir = executable_path() + "/../lib/client-modules/";
+
+        if (boost::filesystem::exists(inside_build_dir))
+                return inside_build_dir;
+    }
+    catch(boost::exception &)
+    {
+        // a failure in searching the module path inside build directories is nothing the deployed client libraries
+        // should have to handle, hence ignored here
+    }
+
+    return MIR_CLIENT_PLATFORM_PATH;
+}
+

=== modified file 'src/common/symbols.map'
--- src/common/symbols.map	2015-01-14 06:39:13 +0000
+++ src/common/symbols.map	2015-01-22 16:32:05 +0000
@@ -11,6 +11,9 @@
     mir_diagonal_resize_bottom_to_top_cursor_name*;
     mir_diagonal_resize_top_to_bottom_cursor_name*;
     mir_disabled_cursor_name*;
+    mir::default_server_platform_path*;
+    mir::default_client_platform_path*;
+    mir::executable_path*;
     mir::Fd::Fd*;
     mir::Fd::invalid*;
     mir::Fd::operator*;

=== added file 'src/include/common/mir/executable_path.h'
--- src/include/common/mir/executable_path.h	1970-01-01 00:00:00 +0000
+++ src/include/common/mir/executable_path.h	2015-01-22 16:32:05 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2015 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:
+ *  Andreas Pokorny <[e-mail]>
+ */
+
+#ifndef MIR_EXECUTABLE_PATH_H_
+#define MIR_EXECUTABLE_PATH_H_
+
+#include <string>
+
+namespace mir
+{
+std::string executable_path();
+std::string default_server_platform_path();
+std::string default_client_platform_path();
+}
+
+#endif

=== modified file 'src/platform/CMakeLists.txt'
--- src/platform/CMakeLists.txt	2015-01-22 16:32:04 +0000
+++ src/platform/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -7,7 +7,6 @@
 
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 
-add_definitions(-DMIR_SERVER_PLATFORM_PATH="${MIR_SERVER_PLATFORM_PATH}")
 add_definitions(-DMIR_SERVER_GRAPHICS_PLATFORM_VERSION="${MIR_SERVER_GRAPHICS_PLATFORM_VERSION}")
 
 set(MIR_PLATFORM_OBJECTS

=== modified file 'src/platform/options/default_configuration.cpp'
--- src/platform/options/default_configuration.cpp	2015-01-22 16:32:04 +0000
+++ src/platform/options/default_configuration.cpp	2015-01-22 16:32:05 +0000
@@ -21,6 +21,7 @@
 #include "mir/graphics/platform.h"
 #include "mir/default_configuration.h"
 #include "mir/abnormal_exit.h"
+#include "mir/executable_path.h"
 #include "mir/shared_library_prober.h"
 #include "mir/logging/null_shared_library_prober_report.h"
 #include "mir/graphics/platform_probe.h"
@@ -110,6 +111,9 @@
     using namespace options;
     namespace po = boost::program_options;
 
+    auto default_platform_path = default_server_platform_path();
+    auto server_path_description = "Directory to look for platform libraries (default: " + default_platform_path + ")";
+
     add_options()
         (host_socket_opt, po::value<std::string>(),
             "Host socket filename")
@@ -119,8 +123,8 @@
         (prompt_socket_opt, "Provide a \"..._trusted\" filename for prompt helper connections")
         (platform_graphics_lib, po::value<std::string>(),
             "Library to use for platform graphics support (default: autodetect)")
-        (platform_path, po::value<std::string>()->default_value(MIR_SERVER_PLATFORM_PATH),
-            "Directory to look for platform libraries (default: " MIR_SERVER_PLATFORM_PATH ")")
+        (platform_path, po::value<std::string>()->default_value(default_platform_path),
+            server_path_description.c_str())
         (enable_input_opt, po::value<bool>()->default_value(enable_input_default),
             "Enable input.")
         (compositor_report_opt, po::value<std::string>()->default_value(off_opt_value),
@@ -166,7 +170,7 @@
          po::value<std::string>(), "");
     program_options.add_options()
         (platform_path,
-         po::value<std::string>()->default_value(MIR_SERVER_PLATFORM_PATH),
+         po::value<std::string>()->default_value(default_server_platform_path()),
         "");
     mo::ProgramOption options;
     options.parse_arguments(program_options, argc, argv);

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2015-01-22 16:32:04 +0000
+++ src/server/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -11,7 +11,6 @@
   ${GLIB_INCLUDE_DIRS}
 )
 
-add_definitions(-DMIR_SERVER_PLATFORM_PATH="${MIR_SERVER_PLATFORM_PATH}")
 add_definitions(-DMIR_SERVER_GRAPHICS_PLATFORM_VERSION="${MIR_SERVER_GRAPHICS_PLATFORM_VERSION}")
 
 add_subdirectory(compositor/)

=== modified file 'src/utils/CMakeLists.txt'
--- src/utils/CMakeLists.txt	2015-01-16 02:57:31 +0000
+++ src/utils/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -7,13 +7,13 @@
 )
 
 # Note that production binaries don't have underscores in their names
-mir_add_wrapped_executable(mirping ping.c)
+mir_add_executable(mirping ping.c)
 target_link_libraries(mirping mirclient)
 
-mir_add_wrapped_executable(mirout out.c)
+mir_add_executable(mirout out.c)
 target_link_libraries(mirout mirclient)
 
-mir_add_wrapped_executable(mirscreencast screencast.cpp)
+mir_add_executable(mirscreencast screencast.cpp)
 
 target_link_libraries(mirscreencast
   mirclient

=== removed file 'src/wrapper.c'
--- src/wrapper.c	2015-01-22 16:32:04 +0000
+++ src/wrapper.c	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel van Vugt <[e-mail]>
- */
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-
-int main(int argc, char** argv)
-{
-    char path[1024], *dest = path, *dest_max = path+sizeof(path)-1;
-    char *pivot = path;
-    size_t pivot_max = 0;
-    const char *src = argv[0], *name = argv[0];
-
-    (void)argc;
-    while (*src && dest < dest_max)
-    {
-        *dest = *src;
-        if (*dest == '/')
-        {
-            pivot = dest + 1;
-            name = src + 1;
-        }
-        ++src;
-        ++dest;
-    }
-    pivot_max = dest_max - pivot;
-
-    strncpy(pivot, "../lib/client-modules/", pivot_max);
-    *dest_max = '\0';
-    setenv("MIR_CLIENT_PLATFORM_PATH", path, 1);
-    printf("MIR_CLIENT_PLATFORM_PATH=%s\n", path);
-    strncpy(pivot+7, "server-modules/", pivot_max-7);
-    setenv("MIR_SERVER_PLATFORM_PATH", path, 1);
-    printf("MIR_SERVER_PLATFORM_PATH=%s\n", path);
-
-    pivot[6] = '\0';  /* truncate lib/client-modules to just lib */
-    setenv("LD_LIBRARY_PATH", path, 1);
-    printf("LD_LIBRARY_PATH=%s\n", path);
-
-    snprintf(pivot, pivot_max, EXECUTABLE_FORMAT, name);
-    *dest_max = '\0';
-    printf("exec=%s\n", path);
-
-    argv[0] = path;
-    execv(argv[0], argv);
-
-    fprintf(stderr, "Failed to execute: %s\n", path);
-    return 1;
-}

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2015-01-22 16:32:04 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -2,6 +2,7 @@
 
 include_directories(
   ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/src/include/common/
 )
 
 set(
@@ -43,7 +44,7 @@
 
 add_subdirectory(throwback)
 
-mir_add_wrapped_executable(
+mir_add_executable(
   mir_acceptance_tests
 
   ${SOURCES}

=== modified file 'tests/client-language/CMakeLists.txt'
--- tests/client-language/CMakeLists.txt	2015-01-16 02:57:31 +0000
+++ tests/client-language/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -1,5 +1,5 @@
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
 
-mir_add_wrapped_executable(client-language-test-c99 NOINSTALL
+mir_add_executable(client-language-test-c99 NOINSTALL
   c99.c
 )

=== modified file 'tests/include/mir_test_framework/executable_path.h'
--- tests/include/mir_test_framework/executable_path.h	2015-01-22 16:32:04 +0000
+++ tests/include/mir_test_framework/executable_path.h	2015-01-22 16:32:05 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 Canonical Ltd.
+ * Copyright © 2014-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -20,10 +20,11 @@
 #ifndef MIR_TEST_FRAMEWORK_EXECUTABLE_PATH_H_
 #define MIR_TEST_FRAMEWORK_EXECUTABLE_PATH_H_
 
-#include <string>
+#include "mir/executable_path.h"
+
 namespace mir_test_framework
 {
-std::string executable_path();
+using mir::executable_path;
 
 std::string library_path();
 std::string server_platform(std::string const& name);

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2015-01-22 16:32:04 +0000
+++ tests/integration-tests/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -65,7 +65,7 @@
 endif()
 
 link_directories(${LIBRARY_OUTPUT_PATH})
-mir_add_wrapped_executable(
+mir_add_executable(
   mir_integration_tests
   ${INTEGRATION_TESTS_SRCS}
   ${MIR_SERVER_OBJECTS}

=== modified file 'tests/mir-stress/CMakeLists.txt'
--- tests/mir-stress/CMakeLists.txt	2015-01-16 02:57:31 +0000
+++ tests/mir-stress/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -1,6 +1,6 @@
 project(mir_stress)
 
-mir_add_wrapped_executable(mir_stress
+mir_add_executable(mir_stress
   src/client.cpp
   src/mir-stress.cpp
   src/results.cpp

=== modified file 'tests/mir_test_framework/executable_path.cpp'
--- tests/mir_test_framework/executable_path.cpp	2015-01-22 16:32:04 +0000
+++ tests/mir_test_framework/executable_path.cpp	2015-01-22 16:32:05 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013,2014 Canonical Ltd.
+ * Copyright © 2013-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -20,26 +20,14 @@
 
 #include "mir_test_framework/executable_path.h"
 
+#include "mir/executable_path.h"
+
 #include <libgen.h>
 #include <stdexcept>
 #include <boost/throw_exception.hpp>
 #include <boost/exception/errinfo_errno.hpp>
 #include <boost/filesystem.hpp>
 
-std::string mir_test_framework::executable_path()
-{
-    char buf[1024];
-    auto tmp = readlink("/proc/self/exe", buf, sizeof buf);
-    if (tmp < 0)
-        BOOST_THROW_EXCEPTION(boost::enable_error_info(
-                                  std::runtime_error("Failed to find our executable path"))
-                              << boost::errinfo_errno(errno));
-    if (tmp > static_cast<ssize_t>(sizeof(buf) - 1))
-        BOOST_THROW_EXCEPTION(std::runtime_error("Path to executable is too long!"));
-    buf[tmp] = '\0';
-    return dirname(buf);
-}
-
 std::string mir_test_framework::library_path()
 {
     return executable_path() + "/../lib";

=== modified file 'tests/performance-tests/CMakeLists.txt'
--- tests/performance-tests/CMakeLists.txt	2015-01-16 02:57:31 +0000
+++ tests/performance-tests/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -4,7 +4,7 @@
   test_glmark2-es2-mir.cpp
 )
 
-mir_add_wrapped_executable(
+mir_add_executable(
   mir_performance_tests
 
   ${PERFORMANCE_TESTS_SOURCES}

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2015-01-22 16:32:04 +0000
+++ tests/unit-tests/CMakeLists.txt	2015-01-22 16:32:05 +0000
@@ -66,7 +66,7 @@
 
 link_directories(${LIBRARY_OUTPUT_PATH})
 
-mir_add_wrapped_executable(mir_unit_tests
+mir_add_executable(mir_unit_tests
   ${UNIT_TEST_SOURCES}
   ${MIR_SERVER_OBJECTS}
   $<TARGET_OBJECTS:mirclientobjects>