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

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:mir

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2015-01-22

Alberto Aguirre (community): Abstain on 2015-01-22

Daniel van Vugt: Needs Fixing on 2015-01-22

Robert Carr (community): Needs Information on 2015-01-21

Diff: 752 lines (+185/-151)

24 files modified

benchmarks/android-input/CMakeLists.txt (+1/-1)
benchmarks/frame-uniformity/CMakeLists.txt (+1/-1)
cmake/MirCommon.cmake (+6/-16)
examples/CMakeLists.txt (+20/-20)
playground/demo-shell/CMakeLists.txt (+1/-1)
src/CMakeLists.txt (+5/-6)
src/client/default_connection_configuration.cpp (+3/-1)
src/common/CMakeLists.txt (+13/-7)
src/common/executable_path.cpp (+76/-0)
src/common/symbols.map (+3/-0)
src/include/common/mir/executable_path.h (+32/-0)
src/platform/CMakeLists.txt (+0/-1)
src/platform/options/default_configuration.cpp (+7/-3)
src/server/CMakeLists.txt (+0/-1)
src/utils/CMakeLists.txt (+3/-3)
src/wrapper.c (+0/-66)
tests/acceptance-tests/CMakeLists.txt (+2/-1)
tests/client-language/CMakeLists.txt (+1/-1)
tests/include/mir_test_framework/executable_path.h (+4/-3)
tests/integration-tests/CMakeLists.txt (+1/-1)
tests/mir-stress/CMakeLists.txt (+1/-1)
tests/mir_test_framework/executable_path.cpp (+3/-15)
tests/performance-tests/CMakeLists.txt (+1/-1)
tests/unit-tests/CMakeLists.txt (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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

2165. By Andreas Pokorny on 2015-01-21

merged lp:mir

2164. By Daniel van Vugt on 2015-01-20

Merge latest trunk

2163. By Daniel van Vugt on 2015-01-19

Merge latest trunk

2162. By Andreas Pokorny on 2015-01-18

* New upstream release 0.11.0 (https://launchpad.net/mir/+milestone/0.11.0)
  - Enhancements:
    . Lots more major plumbing in the Android code, on the path to supporting
      external displays.
    . Performance: Use optimally efficient fragment shading when possible.
    . Performance: (Desktop) Composite using double buffering instead of
      triple to reduce visible lag.
    . TODO fill me in more
  - ABI summary: Servers (will?) need rebuilding, but clients do not;
    . Mirclient ABI unchanged at 8
    . Mircommon ABI unchanged at 3
    . Mirplatform ABI bumped to 6
    . Mirserver ABI unchanged at 28 (expect 29 before release)
  - Bug fixes:
    . TODO fill me in at release

2161. By Andreas Pokorny on 2015-01-14

update checksums after merge