Mir

Merge lp:~mir-team/mir/project-page-in-docs into lp:~mir-team/mir/trunk

Proposed by Alexandros Frantzis
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 483
Proposed branch: lp:~mir-team/mir/project-page-in-docs
Merge into: lp:~mir-team/mir/trunk
Diff against target: 340 lines (+289/-11)
6 files modified
doc/building_source_for_pc.md (+57/-0)
doc/installing_prebuilt_on_android.md (+46/-0)
doc/installing_prebuilt_on_pc.md (+29/-0)
doc/mainpage.md (+48/-11)
doc/using_mir_on_android.md (+26/-0)
doc/using_mir_on_pc.md (+83/-0)
To merge this branch: bzr merge lp:~mir-team/mir/project-page-in-docs
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+152687@code.launchpad.net

Commit message

doc: Use doxygen documentation to create a project page

Description of the change

doc: Use doxygen documentation to create a project page

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

PASSED: Continuous integration, rev:483
http://jenkins.qa.ubuntu.com/job/mir-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/37//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/37//rebuild/?

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

I think we should update to avoid the duplication between HACKING and building_source_for_pc - but it doesn't cause any immediate harm.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'doc/building_source_for_pc.md'
--- doc/building_source_for_pc.md 1970-01-01 00:00:00 +0000
+++ doc/building_source_for_pc.md 2013-03-11 14:27:24 +0000
@@ -0,0 +1,57 @@
1Building the source for a PC {#building_source_for_pc}
2============================
3
4Getting mir
5-----------
6
7Mir is a project on Launchpad (https://launchpad.net/mir). To grab a copy use
8the command:
9
10 $ bzr branch lp:mir
11
12
13Getting dependencies
14--------------------
15
16To succesfully build Mir there are a few packages required. The easiest way
17to get them is to use the packaging build dependencies:
18
19 $ apt-get install devscripts equivs cmake
20 $ mk-build-deps --install --tool "apt-get -y" --build-dep debian/control
21
22
23Building mir
24------------
25
26Mir is built using cmake. You first need to create the build directory and
27configure the build:
28
29 $ mkdir build
30 $ cd build
31 $ cmake .. (possibly passing configuration options to cmake)
32
33There are many configuration options for the mir project. The default options
34will work fine, but you may want to customize the build depending on your
35needs. The best way to get an overview and set them is to use the cmake-gui
36tool:
37
38 $ cmake-gui ..
39
40The next step is to build the source and run the tests:
41
42 $ make (-j8)
43 $ ctest
44
45Installing mir
46--------------
47
48To install mir just use the normal make install command:
49
50 $ make install
51
52This will install the mir libraries, executable, example clients and header
53files to the configured installation location (/usr/local by default). If you
54install to a non-standard location, keep in mind that you will probably need to
55properly set the PKG_CONFIG_PATH environment variable to allow other
56applications to build against mir, and LD_LIBRARY_PATH to allow applications to
57find the mir libraries at runtime.
058
=== added file 'doc/installing_prebuilt_on_android.md'
--- doc/installing_prebuilt_on_android.md 1970-01-01 00:00:00 +0000
+++ doc/installing_prebuilt_on_android.md 2013-03-11 14:27:24 +0000
@@ -0,0 +1,46 @@
1Installing pre-built packages on an Android device {#installing_prebuilt_on_android}
2==================================================
3
4Supported Devices
5-----------------
6
7The following devices have been tested with Mir:
8
9| Device | Status |
10| ------------------ | ------ |
11| Nexus 7 (nvidia) | tested |
12| Galaxy Nexus (SGX) | tested - needs special hybris for nvidia atm |
13| Nexus 4 (qualcomm) | in progress |
14
15Installing Mir
16--------------
17
181. First you must install a phablet image on your device, by following the
19 directions at https://wiki.ubuntu.com/Touch/Install on one of the supported
20 devices. Once you have booted into the device with Ubuntu Touch ensure you
21 then connect the device to the internet.
22
232. With your device connected via USB, type:
24
25 $ adb devices
26
27 just to ensure you are connected, then open the android shell:
28
29 $ adb root
30 $ adb shell
31
323. In the adb shell, stop SurfaceFlinger, Android's compositing engine that
33 owns the display, and open the Ubuntu Touch shell:
34
35 # stop
36 # ubuntu_chroot shell
37
384. Add the mir staging PPA to your device's sources list:
39
40 # apt-get install software-properties-common (to get the add-apt-repository command)
41 # add-apt-repository ppa:mir-team/staging
42 # apt-get update
43
445. Install Mir:
45
46 # apt-get install mir libmirclient-demos
047
=== added file 'doc/installing_prebuilt_on_pc.md'
--- doc/installing_prebuilt_on_pc.md 1970-01-01 00:00:00 +0000
+++ doc/installing_prebuilt_on_pc.md 2013-03-11 14:27:24 +0000
@@ -0,0 +1,29 @@
1Installing pre-built packages on a PC {#installing_prebuilt_on_pc}
2=====================================
3
41. Install raring if you haven' t done so already. Uninstall any proprietary
5 drivers (-nvidia, -fglrx) and reboot on the FOSS drivers.
6
72. Add the ppa:mir-team/staging. Note that besides mir itself, the PPA includes
8 custom builds of Mesa and Xorg drivers with support for mir:
9
10 sudo add-apt-repository ppa:mir-team/staging
11
123. Update your package list:
13
14 sudo apt-get update
15
164. Create the `/etc/apt/preferences.d/50-pin-mir.pref` file with the following contents:
17
18 Package: *
19 Pin: origin "private-ppa.launchpad.net"
20 Pin-Priority: 1001
21
22 Package: *
23 Pin: release o=LP-PPA-mir-team-staging
24 Pin-Priority: 1002
25
265. Install mir and dist-upgrade:
27
28 sudo apt-get install mir
29 sudo apt-get dist-upgrade
030
=== modified file 'doc/mainpage.md'
--- doc/mainpage.md 2012-12-28 08:07:31 +0000
+++ doc/mainpage.md 2013-03-11 14:27:24 +0000
@@ -1,22 +1,59 @@
1Welcome to Mir {#mainpage}1Welcome to Mir {#mainpage}
2==============2==============
33
4Welcome to the world of Mir!4Mir is a next generation display server targeted as a replacement for the X
55window server system to unlock next-generation user experiences for devices
6Willkommen in der Welt von Mir!6ranging from Linux desktop to mobile devices powered by Ubuntu. The primary
77purpose of Mir is to enable the development of the next generation
8¡Bienvenido al mundo de Mir!8[Unity](http://unity.ubuntu.com).
99
10Καλώς ήρθατε στον κόσμο του Mir!10More detailed information about the motivation, scope, and high-level design
11of Mir can be found at http://wiki.ubuntu.com/MirSpec .
12
13Getting and installing Mir
14--------------------------
15
16### Using pre-built packages
17
18If you just want to try out mir, or write client applications, then the easiest
19way is to use the pre-built packages:
20
21 - \ref installing_prebuilt_on_pc
22 - \ref installing_prebuilt_on_android
23
24### Building and installing from source
25
26If you are curious about Mir internals or intend to contribute to it, you should
27get the source and build it:
28
29 - \ref building_source_for_pc
30
31Using Mir
32---------
33
34 - \ref using_mir_on_pc
35 - \ref using_mir_on_android
36
37Getting involved
38----------------
39
40The best place to ask questions and discuss about the Mir project is the
41#ubuntu-mir IRC channel on freenode.
42
43The Mir project is hosted on Launchpad: https://launchpad.net/mir
44
45Please file bug reports at: https://bugs.launchpad.net/mir
46
47The Mir development mailing list can be found at: https://lists.ubuntu.com/mailman/listinfo/Mir-devel
1148
12Writing client applications49Writing client applications
13---------------------------50---------------------------
1451
151. \ref mir_client_library.h "Mir API Documentation"52 - \ref mir_client_library.h "Mir API Documentation"
162. \subpage demo_client.c "demo_client.c: A simple mir client"53 - \subpage demo_client.c "demo_client.c: A simple mir client"
1754
18Working on Mir code55Working on Mir code
19-------------------56-------------------
2057
211. \ref md_README "Mir Read me"58 - \ref md_README "Mir Read me"
222. \ref md_HACKING "Mir hacking guide"59 - \ref md_HACKING "Mir hacking guide"
2360
=== added file 'doc/using_mir_on_android.md'
--- doc/using_mir_on_android.md 1970-01-01 00:00:00 +0000
+++ doc/using_mir_on_android.md 2013-03-11 14:27:24 +0000
@@ -0,0 +1,26 @@
1Using Mir on an Android device {#using_mir_on_android}
2==============================
3
4After installing mir on your device (see \ref installing_prebuilt_on_android),
5open the Android shell:
6
7 $ adb root
8 $ adb shell
9
10In the Android shell, stop SurfaceFlinger and open the Ubuntu touch chroot shell:
11
12 # stop
13 # ubuntu_chroot shell
14
15Now, start Mir and a client application:
16
17 # mir &
18 # some-mir-client (e.g. mir_demo_client_accelerated)
19
20Getting some example client applications
21----------------------------------------
22
23You can get some example programs by installing the `libmirclient-demos` package
24inside the Ubuntu touch chroot shell (see above):
25
26 # apt-get install libmirclient-demos
027
=== added file 'doc/using_mir_on_pc.md'
--- doc/using_mir_on_pc.md 1970-01-01 00:00:00 +0000
+++ doc/using_mir_on_pc.md 2013-03-11 14:27:24 +0000
@@ -0,0 +1,83 @@
1Using Mir on a PC {#using_mir_on_pc}
2=================
3
4Before you begin
5----------------
6
7Before you can use Mir you need to ensure you have the proper custom Mesa build
8installed. If you installed Mir using the packages from mir-team staging PPA
9(see \ref installing_prebuilt_on_pc), you should be good to go.
10
11If you built Mir from source code (see \ref building_source_for_pc), you need
12to ensure you are using the proper Mesa at runtime. You can do that by
13installing the Mesa packages manually from the staging PPA, or by building the
14custom Mesa yourself and ensuring it can be found by mir, e.g., by using
15LD_LIBRARY_PATH.
16
17Using Mir as system compositor with X
18-------------------------------------
19
20Note: for this to work you need to have Mir and all its dependencies (which
21include lightdm, Mesa and the Xorg drivers). The easiest way is to install
22pre-built packages from the staging PPA.
23
24To run X sessions under Mir, with Mir acting as the system compositor, edit
25your /etc/lightdm/lightdm.conf to look to look like this:
26
27 [SeatDefaults]
28 user-session=ubuntu
29 greeter-session=unity-greeter
30 type=mir
31
32Now restart lightdm:
33
34 $ sudo service lightdm restart
35
36In theory, you should now find yourself back in Ubuntu and not notice
37anything different. You can verify you're in mir several ways:
38
39 $ ps aux | grep mir
40 $ grep -i xmir /var/log/Xorg.0.log
41 $ ls -l /var/log/lightdm/mir.log
42
43Running Mir natively
44--------------------
45
46You can also run Mir natively. To do so, log in to VT1 (Ctrl+Alt+F1) _after_
47you are already logged in to X. If you do so before then you will not be
48assigned adequate credentials to access the graphics hardware and will get
49strange errors.
50
51Note that you can switch back to X using Alt+F7. But it is very important to
52remember NOT to switch once you have any mir binaries running. Doing so will
53currently make X die (!).
54
55Now we want to run the mir server and a client to render something. The trick
56is that we need to make sure the mir server is easy to terminate before ever
57switching back to X. To ensure this, the server needs to be in the foreground,
58but starting before your client (in the background). To do this, you must:
59
60 $ (sleep 3; some-mir-client) & mir ; kill $!
61
62Wait 3 seconds and the client will start. You can kill it with Ctrl+C. REMEMBER
63to kill the mir processes fully before attempting to switch back to X or your X
64login will die.
65
66In case you accidentally killed your X login and ended up with a failsafe
67screen, you might find on subsequent reboots you can't log in to X at all any
68more (it instantly and silently takes you back to the login screen). The fix
69for this is to log in to a VT and:
70
71 $ rm .Xauthority
72 $ sudo restart lightdm
73
74Getting some example client applications
75----------------------------------------
76
77If you installed mir using the packages from the mir-team staging PPA, you can
78get some example programs by installing the `libmirclient-demos` package:
79
80 $ sudo apt-get install libmirclient-demos
81
82If you are building from source you can find client applications in the bin/
83subdirectory of the build directory.

Subscribers

People subscribed via source and target branches