Mir

Merge lp:~alan-griffiths/mir/restrict-access-to-private-headers into lp:mir

  1. restrict-access-to-private-headers
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 2094
Proposed branch: lp:~alan-griffiths/mir/restrict-access-to-private-headers
Merge into: lp:mir
Prerequisite: lp:~kdub/mir/no-mirtestdraw
Diff against target: 191 lines (+23/-1)
12 files modified
3rd_party/CMakeLists.txt (+1/-0)
CMakeLists.txt (+1/-1)
benchmarks/frame-uniformity/CMakeLists.txt (+1/-0)
common-ABI-sha1sums (+4/-0)
platform-ABI-sha1sums (+5/-0)
playground/CMakeLists.txt (+1/-0)
server-ABI-sha1sums (+5/-0)
src/CMakeLists.txt (+1/-0)
tests/integration-tests/CMakeLists.txt (+1/-0)
tests/mir_test_doubles/CMakeLists.txt (+1/-0)
tests/mir_test_framework/CMakeLists.txt (+1/-0)
tests/unit-tests/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~alan-griffiths/mir/restrict-access-to-private-headers
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alexandros Frantzis (community) Approve
Daniel van Vugt Abstain
Cemil Azizoglu (community) Abstain
Kevin DuBois (community) Approve
Review via email: mp+242097@code.launchpad.net

Commit message

1. "privatized" headers no longer be available throughout Mir codebase. (Especially not examples and acceptance tests.)
2. Some headers re-published as they are required by features in the acceptance tests and examples

Description of the change

1. "privatized" headers no longer be available throughout Mir codebase. (Especially not examples and acceptance tests.)
2. Some headers re-published as they are required by features in the acceptance tests and examples

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

FAILED: Continuous integration, rev:2068
http://jenkins.qa.ubuntu.com/job/mir-ci/2154/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/189
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/189/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/169/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/169/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

This will keep us more honest about our acceptance tests, so looks good to me.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2069
http://jenkins.qa.ubuntu.com/job/mir-ci/2163/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/203
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/181/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/181
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/181/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3451/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15991

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

[ RUN ] TestClientIPCRender.test_accelerated_render
/tmp/buildd/mir-0.8.0+14.10.20141010bzr2069pkg0vivid181+autopilot0/tests/integration-tests/graphics/android/test_client_render.cpp:404: Failure
Value of: red_pattern.check(*region0)
Actual: false
Expected: true
[ FAILED ] TestClientIPCRender.test_accelerated_render (35 ms)
[ RUN ] TestClientIPCRender.test_accelerated_render_double
/tmp/buildd/mir-0.8.0+14.10.20141010bzr2069pkg0vivid181+autopilot0/tests/integration-tests/graphics/android/test_client_render.cpp:418: Failure
Value of: red_pattern.check(*region0)
Actual: false
Expected: true
/tmp/buildd/mir-0.8.0+14.10.20141010bzr2069pkg0vivid181+autopilot0/tests/integration-tests/graphics/android/test_client_render.cpp:422: Failure
Value of: green_pattern.check(*region1)
Actual: false
Expected: true
[ FAILED ] TestClientIPCRender.test_accelerated_render_double (41 ms)

Looks unrelated - triggering rebuild (logged as lp:/1394180)

Revision history for this message
Kevin DuBois (kdub) wrote :

^^this was a problem in the base branch, remerging the base should resolve

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2070
http://jenkins.qa.ubuntu.com/job/mir-ci/2165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/154
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/184
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/184/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3454
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15996

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

review: Approve (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

We have 3 types of headers :

1- published
2- yet-to-be-published when there is a clear need for a downstream to use it
3- private

Not everyone sees a clear distinction between 2 & 3. The directory src/include is #2 IMO. I don't see a big issue having acceptance tests using these headers. After all, it's not unreasonable to have an API that we might consider publishing but haven't done so yet for whatever reason.

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

I'm slightly uncomfortable with republishing headers no one is using, even indirectly. Rather than decide based on the contents of acceptance tests, I suggest auditing the downstream projects instead, which would then indicate some acceptance tests should not be acceptance tests.

But also this seems like a minor change and the absence of symbols.map changes tells me they're still somewhat private.

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

> We have 3 types of headers :
>
> 1- published
> 2- yet-to-be-published when there is a clear need for a downstream to use it
> 3- private
>
> Not everyone sees a clear distinction between 2 & 3. The directory src/include
> is #2 IMO. I don't see a big issue having acceptance tests using these
> headers. After all, it's not unreasonable to have an API that we might
> consider publishing but haven't done so yet for whatever reason.

We have features that we are committed to supporting and these are tested in the acceptance tests. (That's what acceptance tests are.)

We have example code that shows users how they can make use of the Mir libraries. (That's what examples are.)

So I have a big issue with acceptance tests or examples using headers that are not published. As Kevin says we ought to be honest with our acceptance tests and examples.

I don't have an objection to having "playground" examples and tests of features that are not yet published, but they should not be confused with the above.

Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

OK.

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

> I'm slightly uncomfortable with republishing headers no one is using, even
> indirectly. Rather than decide based on the contents of acceptance tests, I
> suggest auditing the downstream projects instead, which would then indicate
> some acceptance tests should not be acceptance tests.

Agreed.

It is clear that Logger ought to be a customization point, so I'm happy with that.

The geometry types are pretty obvious and unlikely to change in problematic ways. There's really no reason to segregate the geometry headers on the basis of which ones happen to be in use right now.

That leaves Clock and BufferWriter:

Clock is only used by benchmarks/frame-uniformity/touch_measuring_client.cpp:21 - so making keeping that private isn't a big deal. Done.

BufferWriter is used by examples/render_overlays.cpp:27 and in stubbing out the graphics "platform". We could demote render_overlays to playground until we have an example that users could and find another way for the tests, but it doesn't seem worth the effort.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/890/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/264/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/264/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/238/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/238/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> Text conflict in platform-ABI-sha1sums
> Text conflict in server-ABI-sha1sums

The sooner we can dispose of this crutch and use proper ABI checks the better!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2072
http://jenkins.qa.ubuntu.com/job/mir-ci/2202/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/242/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/242/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2073
http://jenkins.qa.ubuntu.com/job/mir-ci/2206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/195
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/246
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3504
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16102

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

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/898/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/287
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/287/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/261/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/261/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Another stupid sha1sums sync.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '3rd_party/CMakeLists.txt'
--- 3rd_party/CMakeLists.txt 2014-10-29 06:21:10 +0000
+++ 3rd_party/CMakeLists.txt 2014-11-22 11:23:38 +0000
@@ -17,6 +17,7 @@
17set(MIR_INPUT_ANDROID_COMPILE_FLAGS ${MIR_INPUT_ANDROID_COMPILE_FLAGS}17set(MIR_INPUT_ANDROID_COMPILE_FLAGS ${MIR_INPUT_ANDROID_COMPILE_FLAGS}
18 PARENT_SCOPE)18 PARENT_SCOPE)
1919
20include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
20include_directories(${CMAKE_CURRENT_SOURCE_DIR}/android-deps)21include_directories(${CMAKE_CURRENT_SOURCE_DIR}/android-deps)
21add_subdirectory(android-input)22add_subdirectory(android-input)
2223
2324
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-11-21 20:16:32 +0000
+++ CMakeLists.txt 2014-11-22 11:23:38 +0000
@@ -104,7 +104,7 @@
104104
105enable_testing()105enable_testing()
106106
107include_directories(include/common src/include/common)107include_directories(include/common)
108108
109# Check for boost109# Check for boost
110find_package(Boost 1.48.0 COMPONENTS date_time system program_options iostreams filesystem REQUIRED)110find_package(Boost 1.48.0 COMPONENTS date_time system program_options iostreams filesystem REQUIRED)
111111
=== modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
--- benchmarks/frame-uniformity/CMakeLists.txt 2014-11-02 11:35:32 +0000
+++ benchmarks/frame-uniformity/CMakeLists.txt 2014-11-22 11:23:38 +0000
@@ -6,6 +6,7 @@
6 ${PROJECT_SOURCE_DIR}/tests/include/6 ${PROJECT_SOURCE_DIR}/tests/include/
77
8 ${PROJECT_SOURCE_DIR}/src/include/platform8 ${PROJECT_SOURCE_DIR}/src/include/platform
9 ${PROJECT_SOURCE_DIR}/src/include/common
9 ${PROJECT_SOURCE_DIR}10 ${PROJECT_SOURCE_DIR}
10 ${MIR_ANDROID_INCLUDE_DIRECTORIES}11 ${MIR_ANDROID_INCLUDE_DIRECTORIES}
11 ${MIR_3RD_PARTY_INCLUDE_DIRECTORIES}12 ${MIR_3RD_PARTY_INCLUDE_DIRECTORIES}
1213
=== modified file 'common-ABI-sha1sums'
--- common-ABI-sha1sums 2014-11-16 07:58:07 +0000
+++ common-ABI-sha1sums 2014-11-22 11:23:38 +0000
@@ -1,6 +1,9 @@
13329ada91412ded2f127aee9a92f065e57b81cb2 include/common/mir/cached_ptr.h13329ada91412ded2f127aee9a92f065e57b81cb2 include/common/mir/cached_ptr.h
282ff9499ef62739379616e02164dc98f9914c329 include/common/mir/fd.h282ff9499ef62739379616e02164dc98f9914c329 include/common/mir/fd.h
3b399dc08514751c86e23824612a52378dd9b1e23 include/common/mir/geometry/dimensions.h3b399dc08514751c86e23824612a52378dd9b1e23 include/common/mir/geometry/dimensions.h
440eb312d3ca6b0dfcefd647f56a74e77e10d8920 include/common/mir/geometry/displacement.h
5283cb0ecf9d544300681fc2ab86bec568e2d20ff include/common/mir/geometry/forward.h
6bfd87d9fb800c1c1b528c00185570abac569caf2 include/common/mir/geometry/length.h
4d954464ef2d20c2876db68c94512a443186da09b include/common/mir/geometry/point.h7d954464ef2d20c2876db68c94512a443186da09b include/common/mir/geometry/point.h
5dc7c62d3916eec025e8e7deaf57e06077ce38928 include/common/mir/geometry/rectangle.h8dc7c62d3916eec025e8e7deaf57e06077ce38928 include/common/mir/geometry/rectangle.h
65161774957e3ca4f5fa4e7db025d0978d2bbef06 include/common/mir/geometry/rectangles.h95161774957e3ca4f5fa4e7db025d0978d2bbef06 include/common/mir/geometry/rectangles.h
@@ -9,6 +12,7 @@
9dcf8b8982f138bdde39a241825c610e955cd5e33 include/common/mir/input/input_platform.h12dcf8b8982f138bdde39a241825c610e955cd5e33 include/common/mir/input/input_platform.h
10208cd6aed5ef5f8f39b3eb86604e4133cb840485 include/common/mir/input/input_receiver_thread.h13208cd6aed5ef5f8f39b3eb86604e4133cb840485 include/common/mir/input/input_receiver_thread.h
11be7d58c9fde2ce91cc66dd6144b76e08b536266b include/common/mir/int_wrapper.h14be7d58c9fde2ce91cc66dd6144b76e08b536266b include/common/mir/int_wrapper.h
152fd7274766a92f22e8784cb64af91947ba03d0de include/common/mir/logging/logger.h
129ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h169ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h
139907751d046e4aea81881cf19e5df52c7a6a813e include/common/mir_toolkit/client_types.h179907751d046e4aea81881cf19e5df52c7a6a813e include/common/mir_toolkit/client_types.h
142100c0674d9d882c1845550847357f6a5de5af66 include/common/mir_toolkit/common.h182100c0674d9d882c1845550847357f6a5de5af66 include/common/mir_toolkit/common.h
1519
=== renamed file 'src/include/common/mir/geometry/displacement.h' => 'include/common/mir/geometry/displacement.h'
=== renamed file 'src/include/common/mir/geometry/forward.h' => 'include/common/mir/geometry/forward.h'
=== renamed file 'src/include/common/mir/geometry/length.h' => 'include/common/mir/geometry/length.h'
=== added directory 'include/common/mir/logging'
=== renamed file 'src/include/common/mir/logging/logger.h' => 'include/common/mir/logging/logger.h'
=== modified file 'platform-ABI-sha1sums'
--- platform-ABI-sha1sums 2014-11-21 12:16:36 +0000
+++ platform-ABI-sha1sums 2014-11-22 11:23:38 +0000
@@ -1,6 +1,9 @@
13329ada91412ded2f127aee9a92f065e57b81cb2 include/common/mir/cached_ptr.h13329ada91412ded2f127aee9a92f065e57b81cb2 include/common/mir/cached_ptr.h
282ff9499ef62739379616e02164dc98f9914c329 include/common/mir/fd.h282ff9499ef62739379616e02164dc98f9914c329 include/common/mir/fd.h
3b399dc08514751c86e23824612a52378dd9b1e23 include/common/mir/geometry/dimensions.h3b399dc08514751c86e23824612a52378dd9b1e23 include/common/mir/geometry/dimensions.h
440eb312d3ca6b0dfcefd647f56a74e77e10d8920 include/common/mir/geometry/displacement.h
5283cb0ecf9d544300681fc2ab86bec568e2d20ff include/common/mir/geometry/forward.h
6bfd87d9fb800c1c1b528c00185570abac569caf2 include/common/mir/geometry/length.h
4d954464ef2d20c2876db68c94512a443186da09b include/common/mir/geometry/point.h7d954464ef2d20c2876db68c94512a443186da09b include/common/mir/geometry/point.h
5dc7c62d3916eec025e8e7deaf57e06077ce38928 include/common/mir/geometry/rectangle.h8dc7c62d3916eec025e8e7deaf57e06077ce38928 include/common/mir/geometry/rectangle.h
65161774957e3ca4f5fa4e7db025d0978d2bbef06 include/common/mir/geometry/rectangles.h95161774957e3ca4f5fa4e7db025d0978d2bbef06 include/common/mir/geometry/rectangles.h
@@ -9,6 +12,7 @@
9dcf8b8982f138bdde39a241825c610e955cd5e33 include/common/mir/input/input_platform.h12dcf8b8982f138bdde39a241825c610e955cd5e33 include/common/mir/input/input_platform.h
10208cd6aed5ef5f8f39b3eb86604e4133cb840485 include/common/mir/input/input_receiver_thread.h13208cd6aed5ef5f8f39b3eb86604e4133cb840485 include/common/mir/input/input_receiver_thread.h
11be7d58c9fde2ce91cc66dd6144b76e08b536266b include/common/mir/int_wrapper.h14be7d58c9fde2ce91cc66dd6144b76e08b536266b include/common/mir/int_wrapper.h
152fd7274766a92f22e8784cb64af91947ba03d0de include/common/mir/logging/logger.h
129ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h169ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h
139907751d046e4aea81881cf19e5df52c7a6a813e include/common/mir_toolkit/client_types.h179907751d046e4aea81881cf19e5df52c7a6a813e include/common/mir_toolkit/client_types.h
142100c0674d9d882c1845550847357f6a5de5af66 include/common/mir_toolkit/common.h182100c0674d9d882c1845550847357f6a5de5af66 include/common/mir_toolkit/common.h
@@ -22,6 +26,7 @@
2254328767ca330ba166160a486bd0688406ab0222 include/platform/mir/graphics/buffer.h2654328767ca330ba166160a486bd0688406ab0222 include/platform/mir/graphics/buffer.h
235875f13f5b029a4b5291e9baec3ae434b72be27c include/platform/mir/graphics/buffer_id.h275875f13f5b029a4b5291e9baec3ae434b72be27c include/platform/mir/graphics/buffer_id.h
24748f5c2aab11189aa02c4a89ab900561548e7304 include/platform/mir/graphics/buffer_properties.h28748f5c2aab11189aa02c4a89ab900561548e7304 include/platform/mir/graphics/buffer_properties.h
2944acfdf6d97069a910e192cba04cd0fe594cd68a include/platform/mir/graphics/buffer_writer.h
25ffa857f624f1c8cbd50a190107137346fc3204d6 include/platform/mir/graphics/cursor.h30ffa857f624f1c8cbd50a190107137346fc3204d6 include/platform/mir/graphics/cursor.h
26fe2b5f13ccd3ec6b78d90d3abbb7d88b48238578 include/platform/mir/graphics/cursor_image.h31fe2b5f13ccd3ec6b78d90d3abbb7d88b48238578 include/platform/mir/graphics/cursor_image.h
27986f5d0d8ea2c6a42cc320f468e682f81fec46ae include/platform/mir/graphics/display_buffer.h32986f5d0d8ea2c6a42cc320f468e682f81fec46ae include/platform/mir/graphics/display_buffer.h
2833
=== modified file 'playground/CMakeLists.txt'
--- playground/CMakeLists.txt 2014-10-22 15:11:05 +0000
+++ playground/CMakeLists.txt 2014-11-22 11:23:38 +0000
@@ -2,6 +2,7 @@
2include_directories(2include_directories(
3 ${PROJECT_SOURCE_DIR}/src/include/server3 ${PROJECT_SOURCE_DIR}/src/include/server
4 ${PROJECT_SOURCE_DIR}/src/include/platform4 ${PROJECT_SOURCE_DIR}/src/include/platform
5 ${PROJECT_SOURCE_DIR}/src/include/common
5 ${PROJECT_SOURCE_DIR}/include/client6 ${PROJECT_SOURCE_DIR}/include/client
6 ${PROJECT_SOURCE_DIR}/include/server7 ${PROJECT_SOURCE_DIR}/include/server
7 ${PROJECT_SOURCE_DIR}/include/platform8 ${PROJECT_SOURCE_DIR}/include/platform
89
=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums 2014-11-21 12:16:36 +0000
+++ server-ABI-sha1sums 2014-11-22 11:23:38 +0000
@@ -1,6 +1,9 @@
13329ada91412ded2f127aee9a92f065e57b81cb2 include/common/mir/cached_ptr.h13329ada91412ded2f127aee9a92f065e57b81cb2 include/common/mir/cached_ptr.h
282ff9499ef62739379616e02164dc98f9914c329 include/common/mir/fd.h282ff9499ef62739379616e02164dc98f9914c329 include/common/mir/fd.h
3b399dc08514751c86e23824612a52378dd9b1e23 include/common/mir/geometry/dimensions.h3b399dc08514751c86e23824612a52378dd9b1e23 include/common/mir/geometry/dimensions.h
440eb312d3ca6b0dfcefd647f56a74e77e10d8920 include/common/mir/geometry/displacement.h
5283cb0ecf9d544300681fc2ab86bec568e2d20ff include/common/mir/geometry/forward.h
6bfd87d9fb800c1c1b528c00185570abac569caf2 include/common/mir/geometry/length.h
4d954464ef2d20c2876db68c94512a443186da09b include/common/mir/geometry/point.h7d954464ef2d20c2876db68c94512a443186da09b include/common/mir/geometry/point.h
5dc7c62d3916eec025e8e7deaf57e06077ce38928 include/common/mir/geometry/rectangle.h8dc7c62d3916eec025e8e7deaf57e06077ce38928 include/common/mir/geometry/rectangle.h
65161774957e3ca4f5fa4e7db025d0978d2bbef06 include/common/mir/geometry/rectangles.h95161774957e3ca4f5fa4e7db025d0978d2bbef06 include/common/mir/geometry/rectangles.h
@@ -9,6 +12,7 @@
9dcf8b8982f138bdde39a241825c610e955cd5e33 include/common/mir/input/input_platform.h12dcf8b8982f138bdde39a241825c610e955cd5e33 include/common/mir/input/input_platform.h
10208cd6aed5ef5f8f39b3eb86604e4133cb840485 include/common/mir/input/input_receiver_thread.h13208cd6aed5ef5f8f39b3eb86604e4133cb840485 include/common/mir/input/input_receiver_thread.h
11be7d58c9fde2ce91cc66dd6144b76e08b536266b include/common/mir/int_wrapper.h14be7d58c9fde2ce91cc66dd6144b76e08b536266b include/common/mir/int_wrapper.h
152fd7274766a92f22e8784cb64af91947ba03d0de include/common/mir/logging/logger.h
129ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h169ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h
139907751d046e4aea81881cf19e5df52c7a6a813e include/common/mir_toolkit/client_types.h179907751d046e4aea81881cf19e5df52c7a6a813e include/common/mir_toolkit/client_types.h
142100c0674d9d882c1845550847357f6a5de5af66 include/common/mir_toolkit/common.h182100c0674d9d882c1845550847357f6a5de5af66 include/common/mir_toolkit/common.h
@@ -22,6 +26,7 @@
2254328767ca330ba166160a486bd0688406ab0222 include/platform/mir/graphics/buffer.h2654328767ca330ba166160a486bd0688406ab0222 include/platform/mir/graphics/buffer.h
235875f13f5b029a4b5291e9baec3ae434b72be27c include/platform/mir/graphics/buffer_id.h275875f13f5b029a4b5291e9baec3ae434b72be27c include/platform/mir/graphics/buffer_id.h
24748f5c2aab11189aa02c4a89ab900561548e7304 include/platform/mir/graphics/buffer_properties.h28748f5c2aab11189aa02c4a89ab900561548e7304 include/platform/mir/graphics/buffer_properties.h
2944acfdf6d97069a910e192cba04cd0fe594cd68a include/platform/mir/graphics/buffer_writer.h
25ffa857f624f1c8cbd50a190107137346fc3204d6 include/platform/mir/graphics/cursor.h30ffa857f624f1c8cbd50a190107137346fc3204d6 include/platform/mir/graphics/cursor.h
26fe2b5f13ccd3ec6b78d90d3abbb7d88b48238578 include/platform/mir/graphics/cursor_image.h31fe2b5f13ccd3ec6b78d90d3abbb7d88b48238578 include/platform/mir/graphics/cursor_image.h
27986f5d0d8ea2c6a42cc320f468e682f81fec46ae include/platform/mir/graphics/display_buffer.h32986f5d0d8ea2c6a42cc320f468e682f81fec46ae include/platform/mir/graphics/display_buffer.h
2833
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2014-11-05 03:25:04 +0000
+++ src/CMakeLists.txt 2014-11-22 11:23:38 +0000
@@ -1,3 +1,4 @@
1include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
1set(MIR_GENERATED_INCLUDE_DIRECTORIES)2set(MIR_GENERATED_INCLUDE_DIRECTORIES)
2add_subdirectory(common/)3add_subdirectory(common/)
3add_subdirectory(protobuf/)4add_subdirectory(protobuf/)
45
=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt 2014-11-21 12:16:36 +0000
+++ tests/integration-tests/CMakeLists.txt 2014-11-22 11:23:38 +0000
@@ -5,6 +5,7 @@
5 ${PROTOBUF_INCLUDE_DIRS}5 ${PROTOBUF_INCLUDE_DIRS}
6 ${CMAKE_CURRENT_BINARY_DIR}6 ${CMAKE_CURRENT_BINARY_DIR}
7 ${PROJECT_SOURCE_DIR}/src/include/platform7 ${PROJECT_SOURCE_DIR}/src/include/platform
8 ${PROJECT_SOURCE_DIR}/src/include/common
8 ${PROJECT_SOURCE_DIR}/src/include/server9 ${PROJECT_SOURCE_DIR}/src/include/server
9 ${PROJECT_SOURCE_DIR}/src/include/client10 ${PROJECT_SOURCE_DIR}/src/include/client
10)11)
1112
=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
--- tests/mir_test_doubles/CMakeLists.txt 2014-11-22 07:29:46 +0000
+++ tests/mir_test_doubles/CMakeLists.txt 2014-11-22 11:23:38 +0000
@@ -1,6 +1,7 @@
1include_directories(1include_directories(
2 ${CMAKE_SOURCE_DIR}2 ${CMAKE_SOURCE_DIR}
3 ${PROJECT_SOURCE_DIR}/src/include/platform3 ${PROJECT_SOURCE_DIR}/src/include/platform
4 ${PROJECT_SOURCE_DIR}/src/include/common
4 ${PROJECT_SOURCE_DIR}/src/include/server5 ${PROJECT_SOURCE_DIR}/src/include/server
5 ${PROJECT_SOURCE_DIR}/src/include/client6 ${PROJECT_SOURCE_DIR}/src/include/client
67
78
=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt 2014-11-21 12:16:36 +0000
+++ tests/mir_test_framework/CMakeLists.txt 2014-11-22 11:23:38 +0000
@@ -1,6 +1,7 @@
1include_directories(1include_directories(
2 ${CMAKE_SOURCE_DIR}2 ${CMAKE_SOURCE_DIR}
3 ${PROJECT_SOURCE_DIR}/src/include/platform3 ${PROJECT_SOURCE_DIR}/src/include/platform
4 ${PROJECT_SOURCE_DIR}/src/include/common
4 ${PROJECT_SOURCE_DIR}/src/include/server5 ${PROJECT_SOURCE_DIR}/src/include/server
5 ${PROJECT_SOURCE_DIR}/src/include/client6 ${PROJECT_SOURCE_DIR}/src/include/client
6 ${Boost_INCLUDE_DIRS}7 ${Boost_INCLUDE_DIRS}
78
=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt 2014-11-21 12:16:36 +0000
+++ tests/unit-tests/CMakeLists.txt 2014-11-22 11:23:38 +0000
@@ -5,6 +5,7 @@
5 ${PROJECT_SOURCE_DIR}/src/include/platform5 ${PROJECT_SOURCE_DIR}/src/include/platform
6 ${PROJECT_SOURCE_DIR}/src/include/server6 ${PROJECT_SOURCE_DIR}/src/include/server
7 ${PROJECT_SOURCE_DIR}/src/include/client7 ${PROJECT_SOURCE_DIR}/src/include/client
8 ${PROJECT_SOURCE_DIR}/src/include/common
8 ${GLIB_INCLUDE_DIRS}9 ${GLIB_INCLUDE_DIRS}
9)10)
1011

Subscribers

People subscribed via source and target branches