unity-mir

Merge lp:~ricmm/unity-mir/platform-api-v2 into lp:unity-mir

  1. platform-api-v2
  2. Merge into trunk
Proposed by Ricardo Mendoza
Status: Merged
Approved by: Michał Sawicz
Approved revision: 226
Merged at revision: 231
Proposed branch: lp:~ricmm/unity-mir/platform-api-v2
Merge into: lp:unity-mir
Diff against target: 95 lines (+18/-7)
4 files modified
debian/control (+1/-1)
src/modules/Unity/Application/CMakeLists.txt (+2/-2)
src/unity-mir/CMakeLists.txt (+1/-1)
src/unity-mir/qmirserver.cpp (+14/-3)
To merge this branch: bzr merge lp:~ricmm/unity-mir/platform-api-v2
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Ricardo Salveti (community) Approve
Review via email: mp+220724@code.launchpad.net

Commit message

Migrate to Platform API v2

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

FAILED: Continuous integration, rev:222
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/350/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/14/console

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

review: Needs Fixing (continuous-integration)
lp:~ricmm/unity-mir/platform-api-v2 updated
223. By Ricardo Mendoza

Merge trunk

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

FAILED: Continuous integration, rev:223
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/353/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/17/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Looks fine.

review: Approve
lp:~ricmm/unity-mir/platform-api-v2 updated
224. By Ricardo Mendoza

Merge trunk

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

FAILED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/366/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/30/console

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

review: Needs Fixing (continuous-integration)
lp:~ricmm/unity-mir/platform-api-v2 updated
225. By Ricardo Mendoza

Merge trunk.

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

FAILED: Continuous integration, rev:225
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/377/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/41/console

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

review: Needs Fixing (continuous-integration)
lp:~ricmm/unity-mir/platform-api-v2 updated
226. By Ricardo Mendoza

Remove explicit Platform API backend selection

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

FAILED: Continuous integration, rev:226
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/378/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/42/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Looks fine. Relying on ricmm's and davmor2's testing for ACK.

review: Approve
lp:~ricmm/unity-mir/platform-api-v2 updated
227. By Ricardo Mendoza

Promote configured Platform API backend to Mirserver instance if available. Otherwise, expect env to be set

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-06-05 01:03:18 +0000
3+++ debian/control 2014-06-10 21:15:25 +0000
4@@ -8,7 +8,7 @@
5 pkg-config,
6 libboost-dev,
7 libboost-system-dev,
8- libplatform-api1-dev,
9+ libubuntu-application-api-dev (>= 2.0.0),
10 libmirserver-dev (>= 0.2.0),
11 libmirclient-dev (>= 0.1.8),
12 libprocess-cpp-dev,
13
14=== modified file 'src/modules/Unity/Application/CMakeLists.txt'
15--- src/modules/Unity/Application/CMakeLists.txt 2014-05-26 06:27:09 +0000
16+++ src/modules/Unity/Application/CMakeLists.txt 2014-06-10 21:15:25 +0000
17@@ -66,7 +66,7 @@
18
19 unity-mir
20
21- ubuntu_application_api_mirserver
22+ ubuntu_application_api
23
24 Qt5::Core
25 Qt5::Quick
26@@ -80,7 +80,7 @@
27 ${PROCESS_CPP_LDFLAGS}
28 ${UPSTART_APP_LAUNCH_LDFLAGS}
29
30- ubuntu_application_api_mirserver
31+ ubuntu_application_api
32 )
33
34
35
36=== modified file 'src/unity-mir/CMakeLists.txt'
37--- src/unity-mir/CMakeLists.txt 2014-04-10 16:58:34 +0000
38+++ src/unity-mir/CMakeLists.txt 2014-06-10 21:15:25 +0000
39@@ -75,7 +75,7 @@
40 ${PROTOBUF_LIBRARIES}
41 ${Boost_SYSTEM_LIBRARY_RELEASE}
42
43- ubuntu_application_api_mirserver)
44+ ubuntu_application_api)
45
46 install(
47 TARGETS unity-mir
48
49=== modified file 'src/unity-mir/qmirserver.cpp' (properties changed: +x to -x)
50--- src/unity-mir/qmirserver.cpp 2014-05-06 12:35:01 +0000
51+++ src/unity-mir/qmirserver.cpp 2014-06-10 21:15:25 +0000
52@@ -22,12 +22,13 @@
53 #include <mir/main_loop.h>
54
55 // Platform API
56-#include <application/ubuntu_application_api_mirserver_priv.h>
57+#include <ubuntu/application/init.h>
58
59 // Qt
60 #include <QCoreApplication>
61 #include <QDebug>
62 #include <QThread>
63+#include <QFile>
64
65 // Std
66 #include <chrono>
67@@ -58,8 +59,18 @@
68 std::thread *t;
69 bool mirServerShutDown = false;
70
71+ QFile file("/etc/ubuntu-platform-api/application.conf");
72+ if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
73+ QByteArray plugin = file.readLine();
74+ if (plugin.contains("mirclient")) {
75+ plugin.replace("mirclient", QByteArray("mirserver"));
76+ plugin = plugin.trimmed();
77+ setenv("UBUNTU_PLATFORM_API_BACKEND", plugin.data(), 1);
78+ }
79+ }
80+
81 mir::run_mir(*config, [&](mir::DisplayServer &server) {
82- ua_ui_mirserver_init(*config);
83+ u_application_init(dynamic_cast<mir::DefaultServerConfiguration*>(config));
84
85 // Mir initiates shutdown on SIGINT & SIGTERM, need to distinguish that shutdown from a
86 // client-initiated shutdown. Do this by installing a custom signal handler that is run
87@@ -99,7 +110,7 @@
88 }
89 }
90 t->join();
91- ua_ui_mirserver_finish();
92+ u_application_finish();
93 delete config;
94 return 0;
95 }

Subscribers

People subscribed via source and target branches