Mir

Merge lp:~alan-griffiths/mir/cleanup-proving_server into lp:mir

Proposed by Alan Griffiths on 2017-09-06
Status: Merged
Approved by: Alan Griffiths on 2017-09-07
Approved revision: 4242
Merged at revision: 4243
Proposed branch: lp:~alan-griffiths/mir/cleanup-proving_server
Merge into: lp:mir
Diff against target: 98 lines (+0/-75)
3 files modified
doc/demo_shell_controls.md (+0/-53)
doc/mainpage.md (+0/-1)
src/server/symbols.map (+0/-21)
To merge this branch: bzr merge lp:~alan-griffiths/mir/cleanup-proving_server
Reviewer Review Type Date Requested Status
Chris Halse Rogers 2017-09-06 Approve on 2017-09-06
Mir CI Bot continuous-integration Approve on 2017-09-06
Review via email: mp+330274@code.launchpad.net

Commit message

Remove a few missed references to mir_proving_server

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4242
https://mir-jenkins.ubuntu.com/job/mir-ci/3632/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4968
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5196
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5184
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5184
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5184
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5007
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5007/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5007
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5007/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5007
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5007/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5007
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5007/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5007
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5007/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5007
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5007/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5007
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5007/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5007
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5007/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3632/rebuild

review: Approve (continuous-integration)
Chris Halse Rogers (raof) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'doc/demo_shell_controls.md'
2--- doc/demo_shell_controls.md 2016-01-29 08:18:22 +0000
3+++ doc/demo_shell_controls.md 1970-01-01 00:00:00 +0000
4@@ -1,53 +0,0 @@
5-Demo Shell Controls {#demo_shell_controls}
6-===================
7-
8-Mir's demo shell (`mir_proving_server`) is a basic environment for testing
9-Mir server features as well as running natively ported apps/toolkits. It is
10-still primitive and requires some explaining to make proper use of, so read
11-on.
12-
13-Running Demo Shell
14-------------------
15-
16-Remember to always run `mir_proving_server` as root on PC (not required on
17-Android), as this is required for input device support (open bug
18-https://bugs.launchpad.net/mir/+bug/1286252);
19-
20- sudo mir_proving_server
21-
22-And if you're not already on the VT you wish to use, that needs to be
23-specified:
24-
25- sudo mir_proving_server --vt 1
26-
27-There are plenty more options available if you run:
28-
29- mir_proving_server --help
30-
31-Controls
32---------
33-
34-All controls have a keyboard/mouse combination and where possible also have
35-touch alternatives for phones/tablets:
36-
37- - Quit the shell (shut down the Mir server): *Ctrl-Alt-Backspace*
38- - Switch back to X: *Ctrl-Alt-F7*
39- - Switch virtual terminals (VTs): *Ctrl-Alt-(F1-F12)*
40- - Switch apps: *Alt-Tab* or *4-finger swipe left/right*
41- - Switch windows of the current app: *Alt-grave*
42- - Ask an app to close: *Alt-F4* (it may refuse or not understand)
43- - Move window: *Alt-leftmousebutton* or *3-finger drag*
44- - Resize window: *Alt-middlemousebutton* or *3-finger pinch/zoom*
45- - Toggle negative rendering: *Super-N*
46- - Toggle high-contrast rendering: *Super-C*
47- - Sleep/wake all displays: *Alt-P* or *Android power button*
48- - Rotate the focussed monitor: *Ctrl-Alt-(Left/Right/Up/Down)* or
49- *Volume up/down while touching the screen*
50- - Change display mode of the focussed monitor: *Ctrl-Alt-(=/-)*
51- - Reset display mode to default, on focussed monitor: *Ctrl-Alt-0*
52- - Adjust window opacity/alpha: *Alt-mousewheel*
53- - Zoom in/out: *Super-mousewheel*
54-
55-*Super* means the Windows key on a PC, or the search key on a Chromebook.
56-
57-Want more? Log your requests at: https://bugs.launchpad.net/mir/+filebug
58
59=== modified file 'doc/mainpage.md'
60--- doc/mainpage.md 2017-05-08 03:04:26 +0000
61+++ doc/mainpage.md 2017-09-06 11:22:59 +0000
62@@ -39,7 +39,6 @@
63 ---------
64
65 - \ref using_mir_on_pc
66- - \ref demo_shell_controls
67 - \ref demo_server
68
69 Getting involved
70
71=== modified file 'src/server/symbols.map'
72--- src/server/symbols.map 2017-08-02 11:07:50 +0000
73+++ src/server/symbols.map 2017-09-06 11:22:59 +0000
74@@ -929,24 +929,3 @@
75 mir::run_mir*;
76 };
77 } MIR_SERVER_1.0;
78-
79-# these symbols are needed by mir_proving_server but are not intended to be public
80-MIR_SERVER_DETAIL_FOR_PROVING_1.0 {
81- global:
82- extern "C++" {
83- mir::renderer::gl::ProgramFamily::add_program*;
84-
85- mir::renderer::gl::Renderer::Renderer*;
86- mir::renderer::gl::Renderer::?Renderer*;
87- mir::renderer::gl::Renderer::Program::Program*;
88- mir::renderer::gl::Renderer::draw*;
89- mir::renderer::gl::Renderer::render*;
90- mir::renderer::gl::Renderer::set_output_transform*;
91- mir::renderer::gl::Renderer::set_viewport*;
92- mir::renderer::gl::Renderer::suspend*;
93- mir::renderer::gl::Renderer::tessellate*;
94- mir::renderer::gl::Renderer::vshader;
95- typeinfo?for?mir::renderer::gl::Renderer;
96- vtable?for?mir::renderer::gl::Renderer;
97- };
98-} MIR_SERVER_DETAIL_FOR_TESTING_1.0;

Subscribers

People subscribed via source and target branches