Merge lp:~alan-griffiths/mir/phone-setup into lp:mir

[Alan Griffiths]

tools: sample setup script for phone

tools: sample setup script for phone

[lp:~alan-griffiths/mir/phone-setup]

1140. By Alan Griffiths on 2013-10-16

logging: correct component tag in connector report.

Approved by Alexandros Frantzis, PS Jenkins bot.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1144
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/182
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/182/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/185/rebuild

review: Approve (continuous-integration)

[lp:~alan-griffiths/mir/phone-setup]

1141. By Alan Griffiths on 2013-10-16

client: fix hang(s) in client API when server dies. Fixes: https://bugs.launchpad.net/bugs/1227743.

Approved by PS Jenkins bot, Kevin DuBois.

1142. By Kevin DuBois on 2013-10-17

fix: lp 1239577

TestClientIPCRender (an android-only gfx driver test) was hanging due to changes in signal handling. refactor the test, changing the cross-process sync mechanism so it doesn't use sigcont. Fixes: https://bugs.launchpad.net/bugs/1239577.

Approved by PS Jenkins bot, Daniel van Vugt.

1143. By kevin gunn on 2013-10-17

merge from trunk

1144. By Alan Griffiths on 2013-10-17

Fix failing acceptance-test:
ServerShutdown/OnSignal.removes_endpoint_on_signal (LP: #1237710)

Avoid fatal_signal_cleanup getting caught in a loop restoring itself and
then re-entering itself. This could happen in some permutations of
acceptance-tests where run_mir is entered with fatal_signal_cleanup already
set up from previous tests' server instances. Fixes: https://bugs.launchpad.net/bugs/1237710.

Approved by Daniel van Vugt, PS Jenkins bot, Kevin DuBois.

1145. By kevin gunn on 2013-10-17

bump mir deb changelog to 0.0.16 and libmirserver8.

Approved by Daniel van Vugt, PS Jenkins bot, Chris Halse Rogers.

[Daniel van Vugt (vanvugt)]

This looks very bespoke. It's likely the rest of us have our own (slightly different) processes already, so wouldn't use it. Also, the applicability is very narrow -- I doubt a newbie seeing this script could understand how to make it do useful things.

Therefore I think we probably don't want this in the Mir source.

But even if you disagree... Needs Fixing:
This file should not be mentioned at all. It's likely to vanish soon, making the rm command fail and therefore the whole script would fail:
9 +rm lib/libmirclient.so.0

review: Needs Fixing

[lp:~alan-griffiths/mir/phone-setup]

1146. By Daniel van Vugt on 2013-10-17

Avoid rendering surfaces that are fully hidden by other surfaces. This is
particularly important for mobile device performance. (LP: #1227739)
. Fixes: https://bugs.launchpad.net/bugs/1227739.

Approved by PS Jenkins bot, Kevin DuBois, Alan Griffiths, Alexandros Frantzis.

1147. By Daniel van Vugt on 2013-10-17

Remove orphaned tags, which appear to have come from the Compiz project (!?)
Add tags for the most recent releases up to 0.0.16.

No files changed, only tags.

1148. By Alan Griffiths on 2013-10-17

Don't create a link to a non-existant file

1149. By Alan Griffiths on 2013-10-17

merge lp:~alan-griffiths/mir/phone-setup

1150. By Alan Griffiths on 2013-10-17

Make script less specific

Unmerged revisions

1150. By Alan Griffiths on 2013-10-17

Make script less specific

1149. By Alan Griffiths on 2013-10-17

merge lp:~alan-griffiths/mir/phone-setup

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2013-09-12 21:36:55 +0000
+++ src/client/CMakeLists.txt	2013-10-17 10:35:25 +0000
@@ -77,20 +77,6 @@
   SOVERSION ${MIRCLIENT_ABI}
 )
 
-#
-# The version of libEGL.so.N installed on the build machine will often link
-# to an older version of libmirclient.so.N than we're trying to build. But if
-# we allow EGL clients to link to both then they will depend on TWO different
-# sonames of mirclient and get linkage errors. This hack ensures that all EGL
-# mir clients in our source tree will only ever link to one version of
-# mirclient; that is the new one here.
-# It might sound nasty, but it's much nicer than having to maintain mirclient
-# and mirserver in different source packages.
-#
-add_custom_target(mirclient_compat_links
-  COMMAND ln -fs libmirclient.so.1 libmirclient.so.0
-  WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-)
 # Ensure mirclient_compat_links exist before any dependents of mirclient
 add_dependencies(mirclient mirclient_compat_links)
 

=== added file 'tools/setup-phone.sh'
--- tools/setup-phone.sh	1970-01-01 00:00:00 +0000
+++ tools/setup-phone.sh	2013-10-17 10:35:25 +0000
@@ -0,0 +1,29 @@
+#!/bin/bash
+# Setup script for getting phone to a convenient state for development work
+#
+phablet-flash ubuntu-system --no-backup --channel=devel-proposed
+adb shell mount -o remount,rw /
+adb shell touch /userdata/.writable_image
+phablet-network
+adb shell apt-get install -y mir-demos gdb
+
+# You now can do stuff like this:
+# tools/install_on_android.sh
+
+# Or stuff like this:
+# $ adb shell
+# # cd tmp/mirtest/
+# # export LD_LIBRARY_PATH=/tmp/mirtest/
+# # ./acceptance-tests
+
+# Or stuff like this:
+# $ adb shell 
+# # apt-add-repository ppa:autopilot/ppa
+# # apt-get update 
+# # apt-get install libautopilot-qt python-autopilot 
+
+# Or even:
+# $ adb shell 
+# # sudo -i -u phablet
+# $ stop unity8
+# # gdb unity8