Mir

Merge lp:~alan-griffiths/mir/move-miral-to-mir-no-more-miral-packages into lp:mir

  1. move-miral-to-mir-no-more-miral-packages
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Superseded
Proposed branch: lp:~alan-griffiths/mir/move-miral-to-mir-no-more-miral-packages
Merge into: lp:mir
Prerequisite: lp:~alan-griffiths/mir/move-miral-to-mir
Diff against target: 453 lines (+77/-104)
20 files modified
debian/changelog (+1/-1)
debian/control (+24/-51)
debian/libmiral-dev.install (+0/-3)
debian/libmiral2.install (+0/-1)
debian/libmirclient-dev.install (+2/-0)
debian/libmirclientcpp-dev.install (+0/-2)
debian/libmirserver-dev.install (+3/-0)
debian/libmirserveral1.install (+1/-0)
debian/libmirserveral1.symbols (+1/-1)
debian/mir-demos.install (+9/-0)
debian/miral-examples.install (+0/-9)
examples/miral-kiosk/CMakeLists.txt (+1/-1)
examples/miral-shell/CMakeLists.txt (+1/-1)
src/CMakeLists.txt (+5/-0)
src/client/CMakeLists.txt (+13/-0)
src/client/mirclientcpp.pc.in (+2/-2)
src/miral/CMakeLists.txt (+11/-29)
src/miral/miral.pc.in (+1/-1)
tests/miral/CMakeLists.txt (+1/-1)
tools/update_package_abis.sh (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/move-miral-to-mir-no-more-miral-packages
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Needs Fixing
Mir development team Pending
Review via email: mp+329822@code.launchpad.net

This proposal has been superseded by a proposal from 2017-08-31.

Commit message

Incorporate miral packages into corresponding mir packages so we won't need an epoch

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4257
https://mir-jenkins.ubuntu.com/job/mir-ci/3600/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4924/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5149
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5139
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5139
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5139
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4963/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4963/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4963/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4963/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4963/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4963
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4963/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/4963
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4963/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4963/console

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

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

Rats!!

tools/update_package_abis.sh doesn't allow debian/libmirserver45.install to contain libmiral.so.2

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

PASSED: Continuous integration, rev:4258
https://mir-jenkins.ubuntu.com/job/mir-ci/3601/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4925
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5150
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5140
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5140
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5140
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4964/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/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4964/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/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4964/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

 Package: mir-demos
 Architecture: linux-any
+Breaks: miral-examples
+Replaces: miral-examples
This needs a "Provides" entry too, no?

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> Package: mir-demos
> Architecture: linux-any
> +Breaks: miral-examples
> +Replaces: miral-examples
> This needs a "Provides" entry too, no?

Really? What would "Depends" on mir-demos?

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> > Package: mir-demos
> > Architecture: linux-any
> > +Breaks: miral-examples
> > +Replaces: miral-examples
> > This needs a "Provides" entry too, no?
>
> Really? What would "Depends" on mir-demos?

I mean miral-examples

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

FAILED: Continuous integration, rev:4260
https://mir-jenkins.ubuntu.com/job/mir-ci/3620/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4947/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5172
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5162
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5162
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5162
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4986/console

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-08-29 08:56:16 +0000
3+++ debian/changelog 2017-08-31 10:09:47 +0000
4@@ -1,4 +1,4 @@
5-mir (1:1.0.0-0ubuntu1) UNRELEASED; urgency=medium
6+mir (1.0.0-0ubuntu1) UNRELEASED; urgency=medium
7
8 * New upstream release 1.0.0(https://launchpad.net/mir/+milestone/1.0.0)
9 - ABI summary:
10
11=== modified file 'debian/control'
12--- debian/control 2017-08-23 11:56:37 +0000
13+++ debian/control 2017-08-31 10:09:47 +0000
14@@ -66,6 +66,19 @@
15 Contains the shared library containing the Google Protobuf definitions
16 required for Mir clients and servers.
17
18+Package: libmirserveral1
19+Section: libs
20+Architecture: linux-any
21+Multi-Arch: same
22+Pre-Depends: ${misc:Pre-Depends}
23+Depends: ${misc:Depends},
24+ ${shlibs:Depends},
25+Description: Display server for Ubuntu - server library
26+ Mir is a display server running on linux systems, with a focus on efficiency,
27+ robust operation and a well-defined driver model.
28+ .
29+ Contains the shared library containing MirAL abstraction layer.
30+
31 #TODO: Packaging infrastructure for better dependency generation,
32 # ala pkg-xorg's xviddriver:Provides and ABI detection.
33 Package: libmirserver45
34@@ -147,12 +160,16 @@
35 Architecture: linux-any
36 Multi-Arch: same
37 Pre-Depends: ${misc:Pre-Depends}
38-Depends: libmirserver45 (= ${binary:Version}),
39+Depends: libmirserveral1 (= ${binary:Version}),
40+ libmirserver45 (= ${binary:Version}),
41 libmirplatform-dev (= ${binary:Version}),
42 libmircommon-dev (= ${binary:Version}),
43 libglm-dev,
44 uuid-dev,
45 ${misc:Depends},
46+Breaks: libmiral-dev
47+Replaces: libmiral-dev
48+Provides: libmiral-dev (=1.5)
49 Description: Display server for Ubuntu - development headers
50 Mir is a display server running on linux systems, with a focus on efficiency,
51 robust operation and a well-defined driver model.
52@@ -196,6 +213,9 @@
53 Architecture: linux-any
54 Multi-Arch: same
55 Pre-Depends: ${misc:Pre-Depends}
56+Breaks: libmirclientcpp-dev
57+Replaces: libmirclientcpp-dev
58+Provides: libmirclientcpp-dev (=1.5)
59 Depends: libmirclient9 (= ${binary:Version}),
60 libmircommon-dev (= ${binary:Version}),
61 libmircookie-dev (= ${binary:Version}),
62@@ -255,9 +275,11 @@
63
64 Package: mir-demos
65 Architecture: linux-any
66+Breaks: miral-examples
67+Replaces: miral-examples
68 Depends: ${misc:Depends},
69 ${shlibs:Depends},
70-Recommends: fonts-liberation
71+Recommends: fonts-liberation, dmz-cursor-theme
72 Description: Display server for Ubuntu - demonstration programs
73 Mir is a display server running on linux systems, with a focus on efficiency,
74 robust operation and a well-defined driver model.
75@@ -479,52 +501,3 @@
76 Contains header files that define the interfaces through which platforms and
77 renderers access the functionality needed to render with GL.
78
79-Package: libmiral2
80-Section: libs
81-Architecture: linux-any
82-Multi-Arch: same
83-Pre-Depends: ${misc:Pre-Depends}
84-Depends: ${misc:Depends},
85- ${shlibs:Depends},
86-Description: Display server for Ubuntu - ABI preserving abstraction layer
87- MirAL provides an ABI-stable abstraction layer for Mir based shells,
88- insulating them from mirserver ABI breaks.
89- .
90- Contains the shared library containing MirAL abstraction layer.
91-
92-Package: libmiral-dev
93-Section: libdevel
94-Architecture: linux-any
95-Multi-Arch: same
96-Pre-Depends: ${misc:Pre-Depends}
97-Depends: libmiral2 (= ${binary:Version}),
98- libmirclientcpp-dev (= ${binary:Version}),
99- ${misc:Depends},
100-Description: Developer files for the Mir ABI-stable abstraction layer
101- MirAL provides an ABI-stable abstraction layer for Mir based shells,
102- insulating them from mirserver ABI breaks.
103- .
104- Contains header files required for development using the MirAL abstraction
105- layer.
106-
107-Package: libmirclientcpp-dev
108-Section: libdevel
109-Architecture: linux-any
110-Multi-Arch: same
111-Pre-Depends: ${misc:Pre-Depends}
112-Depends: libmirclient-dev,
113-Description: A C++ wrapper for libmirclient-dev
114- Provides RAII (and other facilities) for Mir client library types.
115- .
116- Contains header files useful for C++ development against Mir.
117-
118-Package: miral-examples
119-Architecture: linux-any
120-Depends: ${misc:Depends},
121- ${shlibs:Depends},
122-Recommends: dmz-cursor-theme,
123-Description: Display server for Ubuntu - demonstration programs
124- MirAL provides an ABI-stable abstraction layer for Mir based shells,
125- insulating them from mirserver ABI breaks.
126- .
127- Contains demo applications that use the MirAL abstraction layer
128
129=== removed file 'debian/libmiral-dev.install'
130--- debian/libmiral-dev.install 2017-08-21 14:18:55 +0000
131+++ debian/libmiral-dev.install 1970-01-01 00:00:00 +0000
132@@ -1,3 +0,0 @@
133-usr/include/miral/miral/*
134-usr/lib/*/pkgconfig/miral.pc
135-usr/lib/*/libmiral.so
136
137=== removed file 'debian/libmiral2.install'
138--- debian/libmiral2.install 2017-08-21 14:18:55 +0000
139+++ debian/libmiral2.install 1970-01-01 00:00:00 +0000
140@@ -1,1 +0,0 @@
141-usr/lib/*/libmiral.so.2
142
143=== modified file 'debian/libmirclient-dev.install'
144--- debian/libmirclient-dev.install 2017-05-17 04:48:46 +0000
145+++ debian/libmirclient-dev.install 2017-08-31 10:09:47 +0000
146@@ -1,8 +1,10 @@
147 usr/include/mirclient/mir_toolkit/*.h
148 usr/include/mirclient/mir_toolkit/extensions/*.h
149+usr/include/mirclient/mir/client/*.h
150 usr/include/mirclient/mir/events/*.h
151 usr/include/mirclient/mir/event_printer.h
152 usr/include/mirclient/mir_toolkit/events
153 usr/include/mirclient/mir_toolkit/rs/mir_render_surface.h
154 usr/lib/*/pkgconfig/mirclient.pc
155+usr/lib/*/pkgconfig/mirclientcpp.pc
156 usr/lib/*/libmirclient.so
157
158=== removed file 'debian/libmirclientcpp-dev.install'
159--- debian/libmirclientcpp-dev.install 2017-08-21 14:18:55 +0000
160+++ debian/libmirclientcpp-dev.install 1970-01-01 00:00:00 +0000
161@@ -1,2 +0,0 @@
162-usr/include/miral/mir/*/*
163-usr/lib/*/pkgconfig/mirclientcpp.pc
164
165=== modified file 'debian/libmirserver-dev.install'
166--- debian/libmirserver-dev.install 2015-02-22 07:46:25 +0000
167+++ debian/libmirserver-dev.install 2017-08-31 10:09:47 +0000
168@@ -1,3 +1,6 @@
169 usr/include/mirserver
170+usr/include/miral
171 usr/lib/*/pkgconfig/mirserver.pc
172+usr/lib/*/pkgconfig/miral.pc
173 usr/lib/*/libmirserver.so
174+usr/lib/*/libmiral1.so
175
176=== added file 'debian/libmirserveral1.install'
177--- debian/libmirserveral1.install 1970-01-01 00:00:00 +0000
178+++ debian/libmirserveral1.install 2017-08-31 10:09:47 +0000
179@@ -0,0 +1,1 @@
180+usr/lib/*/libmirserveral.so.1
181
182=== renamed file 'debian/libmiral2.symbols' => 'debian/libmirserveral1.symbols'
183--- debian/libmiral2.symbols 2017-08-22 15:14:34 +0000
184+++ debian/libmirserveral1.symbols 2017-08-31 10:09:47 +0000
185@@ -1,4 +1,4 @@
186-libmiral.so.2 libmiral2 #MINVER#
187+libmirserveral.so.1 libmirserveral1 #MINVER#
188 MIRAL_1.0@MIRAL_1.0 1.0.0
189 (c++)"miral::WindowInfo::height_inc(mir::geometry::detail::IntWrapper<mir::geometry::DeltaYTag>)@MIRAL_1.0" 1.0.0
190 (c++)"miral::WindowInfo::max_aspect(miral::WindowSpecification::AspectRatio)@MIRAL_1.0" 1.0.0
191
192=== modified file 'debian/mir-demos.install'
193--- debian/mir-demos.install 2015-06-17 05:20:42 +0000
194+++ debian/mir-demos.install 2017-08-31 10:09:47 +0000
195@@ -1,3 +1,12 @@
196 usr/bin/mir_demo_*
197 usr/bin/mir_proving_*
198 usr/lib/*/libmir_demo_*
199+usr/bin/miral-shell
200+usr/bin/miral-run
201+usr/bin/miral-kiosk
202+usr/bin/miral-xrun
203+usr/bin/miral-screencast
204+usr/bin/miral-desktop
205+usr/bin/miral-app
206+usr/share/applications/miral-shell.desktop
207+usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
208
209=== removed file 'debian/miral-examples.install'
210--- debian/miral-examples.install 2017-08-21 15:58:34 +0000
211+++ debian/miral-examples.install 1970-01-01 00:00:00 +0000
212@@ -1,9 +0,0 @@
213-usr/bin/miral-shell
214-usr/bin/miral-run
215-usr/bin/miral-kiosk
216-usr/bin/miral-xrun
217-usr/bin/miral-screencast
218-usr/bin/miral-desktop
219-usr/bin/miral-app
220-usr/share/applications/miral-shell.desktop
221-usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
222
223=== modified file 'examples/miral-kiosk/CMakeLists.txt'
224--- examples/miral-kiosk/CMakeLists.txt 2017-08-21 15:58:34 +0000
225+++ examples/miral-kiosk/CMakeLists.txt 2017-08-31 10:09:47 +0000
226@@ -9,4 +9,4 @@
227 sw_splash.cpp sw_splash.h
228 )
229
230-target_link_libraries(miral-kiosk miral)
231+target_link_libraries(miral-kiosk mirserveral)
232
233=== modified file 'examples/miral-shell/CMakeLists.txt'
234--- examples/miral-shell/CMakeLists.txt 2017-08-21 15:58:34 +0000
235+++ examples/miral-shell/CMakeLists.txt 2017-08-31 10:09:47 +0000
236@@ -59,7 +59,7 @@
237 target_compile_definitions(miral-shell PRIVATE -DTYPO_SUPPORTS_FREETYPE)
238 target_link_libraries(miral-shell
239 miral-spinner
240- miral
241+ mirserveral
242 ${FREETYPE_LIBRARIES}
243 )
244
245
246=== renamed directory 'include/miral/mir/client' => 'include/client/mir/client'
247=== modified file 'src/CMakeLists.txt'
248--- src/CMakeLists.txt 2017-08-21 14:18:55 +0000
249+++ src/CMakeLists.txt 2017-08-31 10:09:47 +0000
250@@ -1,6 +1,11 @@
251 # We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.
252 set(MIRPLATFORM_ABI 16)
253
254+set(MIRAL_VERSION_MAJOR 1)
255+set(MIRAL_VERSION_MINOR 5)
256+set(MIRAL_VERSION_PATCH 0)
257+set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
258+
259 # Add the cookie implementation before exposing any APIs
260 add_subdirectory(cookie/)
261
262
263=== modified file 'src/client/CMakeLists.txt'
264--- src/client/CMakeLists.txt 2017-05-17 04:48:46 +0000
265+++ src/client/CMakeLists.txt 2017-08-31 10:09:47 +0000
266@@ -11,6 +11,11 @@
267 @ONLY
268 )
269
270+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in
271+ ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
272+ @ONLY
273+)
274+
275 configure_file(
276 ${CMAKE_CURRENT_SOURCE_DIR}/mirclient-debug-extension.pc.in
277 ${CMAKE_CURRENT_BINARY_DIR}/mirclient-debug-extension.pc
278@@ -106,6 +111,13 @@
279 mir_extension_core.cpp
280 ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_extension_core.h
281 ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/extensions/drag_and_drop.h
282+ ${CMAKE_SOURCE_DIR}/include/client/mir/client/blob.h
283+ ${CMAKE_SOURCE_DIR}/include/client/mir/client/cookie.h
284+ ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_spec.h
285+ ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_id.h
286+ ${CMAKE_SOURCE_DIR}/include/client/mir/client/connection.h
287+ ${CMAKE_SOURCE_DIR}/include/client/mir/client/display_config.h
288+ ${CMAKE_SOURCE_DIR}/include/client/mir/client/window.h
289 )
290
291 # Ensure protobuf C++ headers have been produced before
292@@ -153,6 +165,7 @@
293
294 install(
295 FILES ${CMAKE_CURRENT_BINARY_DIR}/mirclient.pc
296+ ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
297 DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
298 )
299
300
301=== renamed file 'src/miral/mirclientcpp.pc.in' => 'src/client/mirclientcpp.pc.in'
302--- src/miral/mirclientcpp.pc.in 2017-08-29 09:17:03 +0000
303+++ src/client/mirclientcpp.pc.in 2017-08-31 10:09:47 +0000
304@@ -1,7 +1,7 @@
305-includedir=@INCLUDEDIR@/miral
306+includedir=@INCLUDEDIR@/mirclient
307
308 Name: mirclientcpp
309-Description: Mir Abstraction Layer C++ wrapper for mirclient
310+Description: C++ wrapper for mirclient
311 Version: @MIRAL_VERSION@
312 Requires: mirclient
313 Cflags: -I${includedir}
314
315=== modified file 'src/miral/CMakeLists.txt'
316--- src/miral/CMakeLists.txt 2017-08-29 09:17:03 +0000
317+++ src/miral/CMakeLists.txt 2017-08-31 10:09:47 +0000
318@@ -1,8 +1,3 @@
319-set(MIRAL_VERSION_MAJOR 1)
320-set(MIRAL_VERSION_MINOR 5)
321-set(MIRAL_VERSION_PATCH 0)
322-set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
323-
324 if(${CMAKE_COMPILER_IS_GNUCXX})
325 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
326 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
327@@ -18,7 +13,7 @@
328 ${PROJECT_SOURCE_DIR}/include/server
329 )
330
331-set(MIRAL_ABI 2)
332+set(MIRAL_ABI 1)
333 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
334 set(miral_include ${PROJECT_SOURCE_DIR}/include/miral)
335
336@@ -38,7 +33,7 @@
337
338 set_source_files_properties(xcursor.c PROPERTIES COMPILE_DEFINITIONS _GNU_SOURCE)
339
340-add_library(miral SHARED
341+add_library(mirserveral SHARED
342 active_outputs.cpp ${miral_include}/miral/active_outputs.h
343 add_init_callback.cpp ${miral_include}/miral/add_init_callback.h
344 application.cpp ${miral_include}/miral/application.h
345@@ -66,13 +61,6 @@
346 window_manager_tools.cpp ${miral_include}/miral/window_manager_tools.h
347 ${miral_include}/miral/window_management_policy_addendum2.h
348 ${miral_include}/miral/window_management_policy_addendum3.h
349- ${miral_include}/mir/client/blob.h
350- ${miral_include}/mir/client/cookie.h
351- ${miral_include}/mir/client/window_spec.h
352- ${miral_include}/mir/client/window_id.h
353- ${miral_include}/mir/client/connection.h
354- ${miral_include}/mir/client/display_config.h
355- ${miral_include}/mir/client/window.h
356 )
357
358 target_include_directories(mirclientcpp
359@@ -84,12 +72,12 @@
360 PRIVATE ${MIRSERVER_INCLUDE_DIRS}
361 )
362
363-target_include_directories(miral
364+target_include_directories(mirserveral
365 PUBLIC "${miral_include}" ${MIRCLIENT_INCLUDE_DIRS}
366 PRIVATE ${MIRSERVER_INCLUDE_DIRS}
367 )
368
369-target_link_libraries(miral
370+target_link_libraries(mirserveral
371 PUBLIC
372 mirclient
373 mircommon
374@@ -98,7 +86,7 @@
375 mirserver
376 )
377
378-set_target_properties(miral
379+set_target_properties(mirserveral
380 PROPERTIES
381 SOVERSION ${MIRAL_ABI}
382 LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
383@@ -108,9 +96,9 @@
384 # clang generates slightly different symbols (but we don't care)
385 if (CMAKE_COMPILER_IS_GNUCXX)
386 add_custom_target(check-miral-symbols ALL
387- DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
388- COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
389- COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
390+ DEPENDS mirserveral ${PROJECT_SOURCE_DIR}/debian/libmirserveral${MIRAL_ABI}.symbols
391+ COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmirserveral${MIRAL_ABI}.symbols
392+ COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmirserveral.so.${MIRAL_ABI} -plibmirserveral${MIRAL_ABI} -O${CMAKE_CURRENT_BINARY_DIR}/libmirserveral${MIRAL_ABI}.symbols
393 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
394 VERBATIM
395 )
396@@ -124,17 +112,11 @@
397 @ONLY
398 )
399
400-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in
401- ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
402- @ONLY
403-)
404-
405 configure_file(
406 ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
407 ${miral_include}/miral/version.h
408 )
409
410-install(TARGETS miral LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
411-install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/miral DESTINATION "${INCLUDEDIR}")
412-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral.pc
413- ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
414+install(TARGETS mirserveral LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
415+install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/miral DESTINATION "${INCLUDEDIR}")
416+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral.pc DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
417
418=== modified file 'src/miral/miral.pc.in'
419--- src/miral/miral.pc.in 2017-08-29 09:17:03 +0000
420+++ src/miral/miral.pc.in 2017-08-31 10:09:47 +0000
421@@ -5,5 +5,5 @@
422 Description: Mir Abstraction Layer library
423 Version: @MIRAL_VERSION@
424 Requires: mirclientcpp
425-Libs: -L${libdir} -lmiral
426+Libs: -L${libdir} -lmirserveral
427 Cflags: -I${includedir}
428
429=== modified file 'tests/miral/CMakeLists.txt'
430--- tests/miral/CMakeLists.txt 2017-08-24 11:10:17 +0000
431+++ tests/miral/CMakeLists.txt 2017-08-31 10:09:47 +0000
432@@ -49,7 +49,7 @@
433 target_link_libraries(miral-test
434 ${GTEST_BOTH_LIBRARIES}
435 ${GMOCK_LIBRARIES}
436- miral
437+ mirserveral
438 miral-internal
439 mir-test-assist
440 )
441
442=== modified file 'tools/update_package_abis.sh'
443--- tools/update_package_abis.sh 2017-08-22 10:57:07 +0000
444+++ tools/update_package_abis.sh 2017-08-31 10:09:47 +0000
445@@ -10,7 +10,7 @@
446 fi
447
448 packages="\
449- libmiral:MIRAL_ABI \
450+ libmir-al:MIRAL_ABI \
451 libmircore:MIRCORE_ABI \
452 libmirclient:MIRCLIENT_ABI \
453 libmirclient-debug-extension:MIRCLIENT_DEBUG_EXTENSION_ABI \

Subscribers

People subscribed via source and target branches