Mir

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

  1. cleanup-proving_server
  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: 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 Approve
Mir CI Bot continuous-integration Approve
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.
Revision history for this message
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)
Revision history for this message
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
=== removed file 'doc/demo_shell_controls.md'
--- doc/demo_shell_controls.md 2016-01-29 08:18:22 +0000
+++ doc/demo_shell_controls.md 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
1Demo Shell Controls {#demo_shell_controls}
2===================
3
4Mir's demo shell (`mir_proving_server`) is a basic environment for testing
5Mir server features as well as running natively ported apps/toolkits. It is
6still primitive and requires some explaining to make proper use of, so read
7on.
8
9Running Demo Shell
10------------------
11
12Remember to always run `mir_proving_server` as root on PC (not required on
13Android), as this is required for input device support (open bug
14https://bugs.launchpad.net/mir/+bug/1286252);
15
16 sudo mir_proving_server
17
18And if you're not already on the VT you wish to use, that needs to be
19specified:
20
21 sudo mir_proving_server --vt 1
22
23There are plenty more options available if you run:
24
25 mir_proving_server --help
26
27Controls
28--------
29
30All controls have a keyboard/mouse combination and where possible also have
31touch alternatives for phones/tablets:
32
33 - Quit the shell (shut down the Mir server): *Ctrl-Alt-Backspace*
34 - Switch back to X: *Ctrl-Alt-F7*
35 - Switch virtual terminals (VTs): *Ctrl-Alt-(F1-F12)*
36 - Switch apps: *Alt-Tab* or *4-finger swipe left/right*
37 - Switch windows of the current app: *Alt-grave*
38 - Ask an app to close: *Alt-F4* (it may refuse or not understand)
39 - Move window: *Alt-leftmousebutton* or *3-finger drag*
40 - Resize window: *Alt-middlemousebutton* or *3-finger pinch/zoom*
41 - Toggle negative rendering: *Super-N*
42 - Toggle high-contrast rendering: *Super-C*
43 - Sleep/wake all displays: *Alt-P* or *Android power button*
44 - Rotate the focussed monitor: *Ctrl-Alt-(Left/Right/Up/Down)* or
45 *Volume up/down while touching the screen*
46 - Change display mode of the focussed monitor: *Ctrl-Alt-(=/-)*
47 - Reset display mode to default, on focussed monitor: *Ctrl-Alt-0*
48 - Adjust window opacity/alpha: *Alt-mousewheel*
49 - Zoom in/out: *Super-mousewheel*
50
51*Super* means the Windows key on a PC, or the search key on a Chromebook.
52
53Want more? Log your requests at: https://bugs.launchpad.net/mir/+filebug
540
=== modified file 'doc/mainpage.md'
--- doc/mainpage.md 2017-05-08 03:04:26 +0000
+++ doc/mainpage.md 2017-09-06 11:22:59 +0000
@@ -39,7 +39,6 @@
39---------39---------
4040
41 - \ref using_mir_on_pc41 - \ref using_mir_on_pc
42 - \ref demo_shell_controls
43 - \ref demo_server42 - \ref demo_server
4443
45Getting involved44Getting involved
4645
=== modified file 'src/server/symbols.map'
--- src/server/symbols.map 2017-08-02 11:07:50 +0000
+++ src/server/symbols.map 2017-09-06 11:22:59 +0000
@@ -929,24 +929,3 @@
929 mir::run_mir*;929 mir::run_mir*;
930 };930 };
931} MIR_SERVER_1.0;931} MIR_SERVER_1.0;
932
933# these symbols are needed by mir_proving_server but are not intended to be public
934MIR_SERVER_DETAIL_FOR_PROVING_1.0 {
935 global:
936 extern "C++" {
937 mir::renderer::gl::ProgramFamily::add_program*;
938
939 mir::renderer::gl::Renderer::Renderer*;
940 mir::renderer::gl::Renderer::?Renderer*;
941 mir::renderer::gl::Renderer::Program::Program*;
942 mir::renderer::gl::Renderer::draw*;
943 mir::renderer::gl::Renderer::render*;
944 mir::renderer::gl::Renderer::set_output_transform*;
945 mir::renderer::gl::Renderer::set_viewport*;
946 mir::renderer::gl::Renderer::suspend*;
947 mir::renderer::gl::Renderer::tessellate*;
948 mir::renderer::gl::Renderer::vshader;
949 typeinfo?for?mir::renderer::gl::Renderer;
950 vtable?for?mir::renderer::gl::Renderer;
951 };
952} MIR_SERVER_DETAIL_FOR_TESTING_1.0;

Subscribers

People subscribed via source and target branches