Mir

Merge lp:~brandontschaefer/mir/move-client-events-to-server into lp:mir

  1. move-client-events-to-server
  2. Merge into development-branch
Proposed by Brandon Schaefer
Status: Rejected
Rejected by: Brandon Schaefer
Proposed branch: lp:~brandontschaefer/mir/move-client-events-to-server
Merge into: lp:mir
Diff against target: 329 lines (+57/-52)
15 files modified
include/server/mir/events/event_builders.h (+4/-4)
src/client/CMakeLists.txt (+4/-4)
src/client/events/CMakeLists.txt (+0/-23)
src/client/input/CMakeLists.txt (+1/-0)
src/client/input/input_event.cpp (+1/-2)
src/client/input/mir_cookie.cpp (+1/-1)
src/client/mir_surface.cpp (+1/-1)
src/include/server/mir/events/serialization.h (+4/-4)
src/platforms/evdev/CMakeLists.txt (+1/-0)
src/server/CMakeLists.txt (+1/-0)
src/server/events/CMakeLists.txt (+26/-0)
src/server/events/event_builders.cpp (+4/-4)
src/server/events/make_empty_event.cpp (+3/-3)
src/server/events/make_empty_event.h (+3/-3)
src/server/events/serialization.cpp (+3/-3)
To merge this branch: bzr merge lp:~brandontschaefer/mir/move-client-events-to-server
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Needs Fixing
Cemil Azizoglu Pending
Brandon Schaefer Pending
Review via email: mp+288710@code.launchpad.net

Commit message

Move src/client/events/* to src/server/events/*
Move src/client/mir_cookie.* to src/client/input/mir_cookie.*

Description of the change

Move src/client/events/* to src/server/events/*

=== renamed file 'include/client/mir/events/event_builders.h' => 'include/server/mir/events/event_builders.h'
=== renamed file 'src/client/mir_cookie.cpp' => 'src/client/input/mir_cookie.cpp'

=== renamed file 'src/client/mir_cookie.h' => 'src/include/client/mir/input/mir_cookie.h
=== renamed file 'src/include/client/mir/events/serialization.h' => 'src/include/server/mir/events/serialization.h'
=== renamed file 'src/client/events/event_builders.cpp' => 'src/server/events/event_builders.cpp'
=== renamed file 'src/client/events/make_empty_event.cpp' => 'src/server/events/make_empty_event.cpp'
=== renamed file 'src/client/events/make_empty_event.h' => 'src/server/events/make_empty_event.h'=== renamed file 'src/client/events/serialization.cpp' => 'src/server/events/serialization.cpp'

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Opps always mix those up

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3386
https://mir-jenkins.ubuntu.com/job/mir-ci/544/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/419/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/449
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/441
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/441
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/428/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/428/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/428/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/428/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/428/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Talked about it in IRC. Lets get make_event moved out of client, if we cant then move to common.

Unmerged revisions

3386. By Brandon Schaefer

* Actually add the cmake file

3385. By Brandon Schaefer

* Remove clients events

3384. By Brandon Schaefer

* Move the actual files

3383. By Brandon Schaefer

* Move src/client/events/* to src/server/events/*

3382. By Brandon Schaefer

* Opps should be on

3381. By Brandon Schaefer

* The main structure for the MirEvent using capnproto

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'include/server/mir/events'
2=== renamed file 'include/client/mir/events/event_builders.h' => 'include/server/mir/events/event_builders.h'
3--- include/client/mir/events/event_builders.h 2016-01-29 08:18:22 +0000
4+++ include/server/mir/events/event_builders.h 2016-03-10 21:55:49 +0000
5@@ -1,16 +1,16 @@
6 /*
7- * Copyright © 2015 Canonical Ltd.
8+ * Copyright © 2015-2016 Canonical Ltd.
9 *
10 * This program is free software: you can redistribute it and/or modify it
11- * under the terms of the GNU Lesser General Public License version 3,
12+ * under the terms of the GNU General Public License version 3,
13 * as published by the Free Software Foundation.
14 *
15 * This program is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18- * GNU Lesser General Public License for more details.
19+ * GNU General Public License for more details.
20 *
21- * You should have received a copy of the GNU Lesser General Public License
22+ * You should have received a copy of the GNU General Public License
23 * along with this program. If not, see <http://www.gnu.org/licenses/>.
24 *
25 * Author: Robert Carr <robert.carr@canonical.com>
26
27=== modified file 'src/client/CMakeLists.txt'
28--- src/client/CMakeLists.txt 2016-03-09 12:19:40 +0000
29+++ src/client/CMakeLists.txt 2016-03-10 21:55:49 +0000
30@@ -21,8 +21,10 @@
31 ${PROTOBUF_INCLUDE_DIRS}
32 ${CMAKE_CURRENT_BINARY_DIR}
33 ${PROJECT_SOURCE_DIR}/include/client
34+ ${PROJECT_SOURCE_DIR}/include/server
35 ${PROJECT_SOURCE_DIR}/src/include/client
36 ${PROJECT_SOURCE_DIR}/src/include/cookie
37+ ${PROJECT_SOURCE_DIR}/src/include/server
38 ${DRM_INCLUDE_DIRS}
39 )
40
41@@ -38,7 +40,6 @@
42
43 add_subdirectory(rpc/)
44 add_subdirectory(lttng/)
45-add_subdirectory(events)
46 add_subdirectory(input)
47
48 add_library(mirclientobjects OBJECT
49@@ -49,7 +50,6 @@
50 event.cpp
51 event_printer.cpp
52 mir_blob.cpp
53- mir_cookie.cpp
54 mir_connection.cpp
55 mir_connection_api.cpp
56 mir_input_device_api.cpp
57@@ -93,8 +93,8 @@
58 # trying to compile mirclientobjects
59 add_dependencies(mirclientobjects mirprotobuf)
60
61-mir_add_library_with_symbols(mirclient SHARED ${symbol_map} $<TARGET_OBJECTS:mirclientobjects> $<TARGET_OBJECTS:mirsharedinput>)
62-add_library(mirclient-static STATIC $<TARGET_OBJECTS:mirclientobjects> $<TARGET_OBJECTS:mirsharedinput>)
63+mir_add_library_with_symbols(mirclient SHARED ${symbol_map} $<TARGET_OBJECTS:mirclientobjects> $<TARGET_OBJECTS:mirsharedinput> $<TARGET_OBJECTS:mirevent>)
64+add_library(mirclient-static STATIC $<TARGET_OBJECTS:mirclientobjects> $<TARGET_OBJECTS:mirsharedinput> $<TARGET_OBJECTS:mirevent>)
65
66 set_target_properties(mirclient
67
68
69=== removed directory 'src/client/events'
70=== removed file 'src/client/events/CMakeLists.txt'
71--- src/client/events/CMakeLists.txt 2016-01-22 16:40:15 +0000
72+++ src/client/events/CMakeLists.txt 1970-01-01 00:00:00 +0000
73@@ -1,23 +0,0 @@
74-# Copyright © 2015 Canonical Ltd.
75-#
76-# This program is free software: you can redistribute it and/or modify
77-# it under the terms of the GNU Lesser General Public License version 3 as
78-# published by the Free Software Foundation.
79-#
80-# This program is distributed in the hope that it will be useful,
81-# but WITHOUT ANY WARRANTY; without even the implied warranty of
82-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
83-# GNU Lesser General Public License for more details.
84-#
85-# You should have received a copy of the GNU Lesser General Public License
86-# along with this program. If not, see <http://www.gnu.org/licenses/>.
87-#
88-# Authored by: Robert Carr <robert.carr@canonical.com>
89-
90-list(APPEND MIR_CLIENT_SOURCES
91- ${CMAKE_CURRENT_SOURCE_DIR}/event_builders.cpp
92- ${CMAKE_CURRENT_SOURCE_DIR}/serialization.cpp
93- ${CMAKE_CURRENT_SOURCE_DIR}/make_empty_event.cpp
94-)
95-
96-set(MIR_CLIENT_SOURCES ${MIR_CLIENT_SOURCES} PARENT_SCOPE)
97
98=== modified file 'src/client/input/CMakeLists.txt'
99--- src/client/input/CMakeLists.txt 2016-01-29 08:18:22 +0000
100+++ src/client/input/CMakeLists.txt 2016-03-10 21:55:49 +0000
101@@ -27,6 +27,7 @@
102 ${ANDROID_SHARED_INPUT_SOURCES}
103 input_event.cpp
104 input_devices.cpp
105+ mir_cookie.cpp
106 ${CMAKE_CURRENT_SOURCE_DIR}/xkb_mapper.cpp
107 )
108
109
110=== modified file 'src/client/input/input_event.cpp'
111--- src/client/input/input_event.cpp 2016-02-24 03:55:11 +0000
112+++ src/client/input/input_event.cpp 2016-03-10 21:55:49 +0000
113@@ -21,12 +21,11 @@
114 #include "mir/cookie/cookie.h"
115 #include "mir/event_type_to_string.h"
116 #include "mir/events/event_private.h"
117+#include "mir/input/mir_cookie.h"
118 #include "mir/log.h"
119 #include "mir/require.h"
120 #include "mir_toolkit/mir_cookie.h"
121
122-#include "../mir_cookie.h"
123-
124 #include <string.h>
125
126 namespace ml = mir::logging;
127
128=== renamed file 'src/client/mir_cookie.cpp' => 'src/client/input/mir_cookie.cpp'
129--- src/client/mir_cookie.cpp 2016-01-22 20:16:50 +0000
130+++ src/client/input/mir_cookie.cpp 2016-03-10 21:55:49 +0000
131@@ -16,7 +16,7 @@
132 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
133 */
134
135-#include "mir_cookie.h"
136+#include "mir/input/mir_cookie.h"
137
138 #include "mir/require.h"
139
140
141=== modified file 'src/client/mir_surface.cpp'
142--- src/client/mir_surface.cpp 2016-03-03 07:24:16 +0000
143+++ src/client/mir_surface.cpp 2016-03-10 21:55:49 +0000
144@@ -30,7 +30,7 @@
145 #include "mir/input/input_platform.h"
146 #include "mir/input/xkb_mapper.h"
147 #include "mir/cookie/cookie.h"
148-#include "mir_cookie.h"
149+#include "mir/input/mir_cookie.h"
150
151 #include <cassert>
152 #include <unistd.h>
153
154=== renamed file 'src/client/mir_cookie.h' => 'src/include/client/mir/input/mir_cookie.h'
155=== added directory 'src/include/server/mir/events'
156=== renamed file 'src/include/client/mir/events/serialization.h' => 'src/include/server/mir/events/serialization.h'
157--- src/include/client/mir/events/serialization.h 2016-01-22 16:40:15 +0000
158+++ src/include/server/mir/events/serialization.h 2016-03-10 21:55:49 +0000
159@@ -1,16 +1,16 @@
160 /*
161- * Copyright © 2015 Canonical Ltd.
162+ * Copyright © 2015-2016 Canonical Ltd.
163 *
164 * This program is free software: you can redistribute it and/or modify it
165- * under the terms of the GNU Lesser General Public License version 3,
166+ * under the terms of the GNU General Public License version 3,
167 * as published by the Free Software Foundation.
168 *
169 * This program is distributed in the hope that it will be useful,
170 * but WITHOUT ANY WARRANTY; without even the implied warranty of
171 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
172- * GNU Lesser General Public License for more details.
173+ * GNU General Public License for more details.
174 *
175- * You should have received a copy of the GNU Lesser General Public License
176+ * You should have received a copy of the GNU General Public License
177 * along with this program. If not, see <http://www.gnu.org/licenses/>.
178 *
179 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
180
181=== modified file 'src/platforms/evdev/CMakeLists.txt'
182--- src/platforms/evdev/CMakeLists.txt 2016-02-25 06:52:05 +0000
183+++ src/platforms/evdev/CMakeLists.txt 2016-03-10 21:55:49 +0000
184@@ -13,6 +13,7 @@
185 ${PROJECT_SOURCE_DIR}/src/include/common # raii.h
186 ${PROJECT_SOURCE_DIR}/include/common
187 ${PROJECT_SOURCE_DIR}/include/client
188+ ${PROJECT_SOURCE_DIR}/include/server # event builder
189 )
190
191 add_library(mirevdevutilsobjects OBJECT
192
193=== modified file 'src/server/CMakeLists.txt'
194--- src/server/CMakeLists.txt 2016-02-24 03:55:11 +0000
195+++ src/server/CMakeLists.txt 2016-03-10 21:55:49 +0000
196@@ -23,6 +23,7 @@
197 add_definitions(-DMIR_SERVER_GRAPHICS_PLATFORM_VERSION="${MIR_SERVER_GRAPHICS_PLATFORM_VERSION}")
198
199 add_subdirectory(compositor/)
200+add_subdirectory(events/)
201 add_subdirectory(graphics/)
202 add_subdirectory(input/)
203 add_subdirectory(report/)
204
205=== added directory 'src/server/events'
206=== added file 'src/server/events/CMakeLists.txt'
207--- src/server/events/CMakeLists.txt 1970-01-01 00:00:00 +0000
208+++ src/server/events/CMakeLists.txt 2016-03-10 21:55:49 +0000
209@@ -0,0 +1,26 @@
210+# Copyright © 2016 Canonical Ltd.
211+#
212+# This program is free software: you can redistribute it and/or modify it
213+# under the terms of the GNU General Public License version 3,
214+# as published by the Free Software Foundation.
215+#
216+# This program is distributed in the hope that it will be useful,
217+# but WITHOUT ANY WARRANTY; without even the implied warranty of
218+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
219+# GNU General Public License for more details.
220+#
221+# You should have received a copy of the GNU General Public License
222+# along with this program. If not, see <http://www.gnu.org/licenses/>.
223+#
224+# Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
225+
226+set(EVENT_SOURCES
227+ event_builders.cpp
228+ serialization.cpp
229+ make_empty_event.cpp
230+)
231+
232+add_library(
233+ mirevent OBJECT
234+ ${EVENT_SOURCES}
235+)
236
237=== renamed file 'src/client/events/event_builders.cpp' => 'src/server/events/event_builders.cpp'
238--- src/client/events/event_builders.cpp 2016-01-29 08:18:22 +0000
239+++ src/server/events/event_builders.cpp 2016-03-10 21:55:49 +0000
240@@ -1,16 +1,16 @@
241 /*
242- * Copyright © 2015 Canonical Ltd.
243+ * Copyright © 2015-2016 Canonical Ltd.
244 *
245 * This program is free software: you can redistribute it and/or modify it
246- * under the terms of the GNU Lesser General Public License version 3,
247+ * under the terms of the GNU General Public License version 3,
248 * as published by the Free Software Foundation.
249 *
250 * This program is distributed in the hope that it will be useful,
251 * but WITHOUT ANY WARRANTY; without even the implied warranty of
252 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
253- * GNU Lesser General Public License for more details.
254+ * GNU General Public License for more details.
255 *
256- * You should have received a copy of the GNU Lesser General Public License
257+ * You should have received a copy of the GNU General Public License
258 * along with this program. If not, see <http://www.gnu.org/licenses/>.
259 *
260 * Author: Robert Carr <robert.carr@canonical.com>
261
262=== renamed file 'src/client/events/make_empty_event.cpp' => 'src/server/events/make_empty_event.cpp'
263--- src/client/events/make_empty_event.cpp 2016-01-22 16:40:15 +0000
264+++ src/server/events/make_empty_event.cpp 2016-03-10 21:55:49 +0000
265@@ -2,15 +2,15 @@
266 * Copyright © 2016 Canonical Ltd.
267 *
268 * This program is free software: you can redistribute it and/or modify it
269- * under the terms of the GNU Lesser General Public License version 3,
270+ * under the terms of the GNU General Public License version 3,
271 * as published by the Free Software Foundation.
272 *
273 * This program is distributed in the hope that it will be useful,
274 * but WITHOUT ANY WARRANTY; without even the implied warranty of
275 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
276- * GNU Lesser General Public License for more details.
277+ * GNU General Public License for more details.
278 *
279- * You should have received a copy of the GNU Lesser General Public License
280+ * You should have received a copy of the GNU General Public License
281 * along with this program. If not, see <http://www.gnu.org/licenses/>.
282 *
283 * Author: Andreas Pokorny <andreas.pokorny@canonical.com>
284
285=== renamed file 'src/client/events/make_empty_event.h' => 'src/server/events/make_empty_event.h'
286--- src/client/events/make_empty_event.h 2016-01-22 16:40:15 +0000
287+++ src/server/events/make_empty_event.h 2016-03-10 21:55:49 +0000
288@@ -2,15 +2,15 @@
289 * Copyright © 2016 Canonical Ltd.
290 *
291 * This program is free software: you can redistribute it and/or modify it
292- * under the terms of the GNU Lesser General Public License version 3,
293+ * under the terms of the GNU General Public License version 3,
294 * as published by the Free Software Foundation.
295 *
296 * This program is distributed in the hope that it will be useful,
297 * but WITHOUT ANY WARRANTY; without even the implied warranty of
298 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
299- * GNU Lesser General Public License for more details.
300+ * GNU General Public License for more details.
301 *
302- * You should have received a copy of the GNU Lesser General Public License
303+ * You should have received a copy of the GNU General Public License
304 * along with this program. If not, see <http://www.gnu.org/licenses/>.
305 *
306 * Author: Andreas Pokorny <andreas.pokorny@canonical.com>
307
308=== renamed file 'src/client/events/serialization.cpp' => 'src/server/events/serialization.cpp'
309--- src/client/events/serialization.cpp 2016-01-22 16:40:15 +0000
310+++ src/server/events/serialization.cpp 2016-03-10 21:55:49 +0000
311@@ -2,15 +2,15 @@
312 * Copyright © 2016 Canonical Ltd.
313 *
314 * This program is free software: you can redistribute it and/or modify it
315- * under the terms of the GNU Lesser General Public License version 3,
316+ * under the terms of the GNU General Public License version 3,
317 * as published by the Free Software Foundation.
318 *
319 * This program is distributed in the hope that it will be useful,
320 * but WITHOUT ANY WARRANTY; without even the implied warranty of
321 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
322- * GNU Lesser General Public License for more details.
323+ * GNU General Public License for more details.
324 *
325- * You should have received a copy of the GNU Lesser General Public License
326+ * You should have received a copy of the GNU General Public License
327 * along with this program. If not, see <http://www.gnu.org/licenses/>.
328 *
329 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>

Subscribers

People subscribed via source and target branches