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
=== modified file 'debian/changelog'
--- debian/changelog 2017-08-29 08:56:16 +0000
+++ debian/changelog 2017-08-31 10:09:47 +0000
@@ -1,4 +1,4 @@
1mir (1:1.0.0-0ubuntu1) UNRELEASED; urgency=medium1mir (1.0.0-0ubuntu1) UNRELEASED; urgency=medium
22
3 * New upstream release 1.0.0(https://launchpad.net/mir/+milestone/1.0.0)3 * New upstream release 1.0.0(https://launchpad.net/mir/+milestone/1.0.0)
4 - ABI summary:4 - ABI summary:
55
=== modified file 'debian/control'
--- debian/control 2017-08-23 11:56:37 +0000
+++ debian/control 2017-08-31 10:09:47 +0000
@@ -66,6 +66,19 @@
66 Contains the shared library containing the Google Protobuf definitions66 Contains the shared library containing the Google Protobuf definitions
67 required for Mir clients and servers.67 required for Mir clients and servers.
6868
69Package: libmirserveral1
70Section: libs
71Architecture: linux-any
72Multi-Arch: same
73Pre-Depends: ${misc:Pre-Depends}
74Depends: ${misc:Depends},
75 ${shlibs:Depends},
76Description: Display server for Ubuntu - server library
77 Mir is a display server running on linux systems, with a focus on efficiency,
78 robust operation and a well-defined driver model.
79 .
80 Contains the shared library containing MirAL abstraction layer.
81
69#TODO: Packaging infrastructure for better dependency generation,82#TODO: Packaging infrastructure for better dependency generation,
70# ala pkg-xorg's xviddriver:Provides and ABI detection.83# ala pkg-xorg's xviddriver:Provides and ABI detection.
71Package: libmirserver4584Package: libmirserver45
@@ -147,12 +160,16 @@
147Architecture: linux-any160Architecture: linux-any
148Multi-Arch: same161Multi-Arch: same
149Pre-Depends: ${misc:Pre-Depends}162Pre-Depends: ${misc:Pre-Depends}
150Depends: libmirserver45 (= ${binary:Version}),163Depends: libmirserveral1 (= ${binary:Version}),
164 libmirserver45 (= ${binary:Version}),
151 libmirplatform-dev (= ${binary:Version}),165 libmirplatform-dev (= ${binary:Version}),
152 libmircommon-dev (= ${binary:Version}),166 libmircommon-dev (= ${binary:Version}),
153 libglm-dev,167 libglm-dev,
154 uuid-dev,168 uuid-dev,
155 ${misc:Depends},169 ${misc:Depends},
170Breaks: libmiral-dev
171Replaces: libmiral-dev
172Provides: libmiral-dev (=1.5)
156Description: Display server for Ubuntu - development headers173Description: Display server for Ubuntu - development headers
157 Mir is a display server running on linux systems, with a focus on efficiency,174 Mir is a display server running on linux systems, with a focus on efficiency,
158 robust operation and a well-defined driver model.175 robust operation and a well-defined driver model.
@@ -196,6 +213,9 @@
196Architecture: linux-any213Architecture: linux-any
197Multi-Arch: same214Multi-Arch: same
198Pre-Depends: ${misc:Pre-Depends}215Pre-Depends: ${misc:Pre-Depends}
216Breaks: libmirclientcpp-dev
217Replaces: libmirclientcpp-dev
218Provides: libmirclientcpp-dev (=1.5)
199Depends: libmirclient9 (= ${binary:Version}),219Depends: libmirclient9 (= ${binary:Version}),
200 libmircommon-dev (= ${binary:Version}),220 libmircommon-dev (= ${binary:Version}),
201 libmircookie-dev (= ${binary:Version}),221 libmircookie-dev (= ${binary:Version}),
@@ -255,9 +275,11 @@
255275
256Package: mir-demos276Package: mir-demos
257Architecture: linux-any277Architecture: linux-any
278Breaks: miral-examples
279Replaces: miral-examples
258Depends: ${misc:Depends},280Depends: ${misc:Depends},
259 ${shlibs:Depends},281 ${shlibs:Depends},
260Recommends: fonts-liberation282Recommends: fonts-liberation, dmz-cursor-theme
261Description: Display server for Ubuntu - demonstration programs283Description: Display server for Ubuntu - demonstration programs
262 Mir is a display server running on linux systems, with a focus on efficiency,284 Mir is a display server running on linux systems, with a focus on efficiency,
263 robust operation and a well-defined driver model.285 robust operation and a well-defined driver model.
@@ -479,52 +501,3 @@
479 Contains header files that define the interfaces through which platforms and501 Contains header files that define the interfaces through which platforms and
480 renderers access the functionality needed to render with GL.502 renderers access the functionality needed to render with GL.
481503
482Package: libmiral2
483Section: libs
484Architecture: linux-any
485Multi-Arch: same
486Pre-Depends: ${misc:Pre-Depends}
487Depends: ${misc:Depends},
488 ${shlibs:Depends},
489Description: Display server for Ubuntu - ABI preserving abstraction layer
490 MirAL provides an ABI-stable abstraction layer for Mir based shells,
491 insulating them from mirserver ABI breaks.
492 .
493 Contains the shared library containing MirAL abstraction layer.
494
495Package: libmiral-dev
496Section: libdevel
497Architecture: linux-any
498Multi-Arch: same
499Pre-Depends: ${misc:Pre-Depends}
500Depends: libmiral2 (= ${binary:Version}),
501 libmirclientcpp-dev (= ${binary:Version}),
502 ${misc:Depends},
503Description: Developer files for the Mir ABI-stable abstraction layer
504 MirAL provides an ABI-stable abstraction layer for Mir based shells,
505 insulating them from mirserver ABI breaks.
506 .
507 Contains header files required for development using the MirAL abstraction
508 layer.
509
510Package: libmirclientcpp-dev
511Section: libdevel
512Architecture: linux-any
513Multi-Arch: same
514Pre-Depends: ${misc:Pre-Depends}
515Depends: libmirclient-dev,
516Description: A C++ wrapper for libmirclient-dev
517 Provides RAII (and other facilities) for Mir client library types.
518 .
519 Contains header files useful for C++ development against Mir.
520
521Package: miral-examples
522Architecture: linux-any
523Depends: ${misc:Depends},
524 ${shlibs:Depends},
525Recommends: dmz-cursor-theme,
526Description: Display server for Ubuntu - demonstration programs
527 MirAL provides an ABI-stable abstraction layer for Mir based shells,
528 insulating them from mirserver ABI breaks.
529 .
530 Contains demo applications that use the MirAL abstraction layer
531504
=== removed file 'debian/libmiral-dev.install'
--- debian/libmiral-dev.install 2017-08-21 14:18:55 +0000
+++ debian/libmiral-dev.install 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1usr/include/miral/miral/*
2usr/lib/*/pkgconfig/miral.pc
3usr/lib/*/libmiral.so
40
=== removed file 'debian/libmiral2.install'
--- debian/libmiral2.install 2017-08-21 14:18:55 +0000
+++ debian/libmiral2.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1usr/lib/*/libmiral.so.2
20
=== modified file 'debian/libmirclient-dev.install'
--- debian/libmirclient-dev.install 2017-05-17 04:48:46 +0000
+++ debian/libmirclient-dev.install 2017-08-31 10:09:47 +0000
@@ -1,8 +1,10 @@
1usr/include/mirclient/mir_toolkit/*.h1usr/include/mirclient/mir_toolkit/*.h
2usr/include/mirclient/mir_toolkit/extensions/*.h2usr/include/mirclient/mir_toolkit/extensions/*.h
3usr/include/mirclient/mir/client/*.h
3usr/include/mirclient/mir/events/*.h4usr/include/mirclient/mir/events/*.h
4usr/include/mirclient/mir/event_printer.h5usr/include/mirclient/mir/event_printer.h
5usr/include/mirclient/mir_toolkit/events6usr/include/mirclient/mir_toolkit/events
6usr/include/mirclient/mir_toolkit/rs/mir_render_surface.h7usr/include/mirclient/mir_toolkit/rs/mir_render_surface.h
7usr/lib/*/pkgconfig/mirclient.pc8usr/lib/*/pkgconfig/mirclient.pc
9usr/lib/*/pkgconfig/mirclientcpp.pc
8usr/lib/*/libmirclient.so10usr/lib/*/libmirclient.so
911
=== removed file 'debian/libmirclientcpp-dev.install'
--- debian/libmirclientcpp-dev.install 2017-08-21 14:18:55 +0000
+++ debian/libmirclientcpp-dev.install 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1usr/include/miral/mir/*/*
2usr/lib/*/pkgconfig/mirclientcpp.pc
30
=== modified file 'debian/libmirserver-dev.install'
--- debian/libmirserver-dev.install 2015-02-22 07:46:25 +0000
+++ debian/libmirserver-dev.install 2017-08-31 10:09:47 +0000
@@ -1,3 +1,6 @@
1usr/include/mirserver1usr/include/mirserver
2usr/include/miral
2usr/lib/*/pkgconfig/mirserver.pc3usr/lib/*/pkgconfig/mirserver.pc
4usr/lib/*/pkgconfig/miral.pc
3usr/lib/*/libmirserver.so5usr/lib/*/libmirserver.so
6usr/lib/*/libmiral1.so
47
=== added file 'debian/libmirserveral1.install'
--- debian/libmirserveral1.install 1970-01-01 00:00:00 +0000
+++ debian/libmirserveral1.install 2017-08-31 10:09:47 +0000
@@ -0,0 +1,1 @@
1usr/lib/*/libmirserveral.so.1
02
=== renamed file 'debian/libmiral2.symbols' => 'debian/libmirserveral1.symbols'
--- debian/libmiral2.symbols 2017-08-22 15:14:34 +0000
+++ debian/libmirserveral1.symbols 2017-08-31 10:09:47 +0000
@@ -1,4 +1,4 @@
1libmiral.so.2 libmiral2 #MINVER#1libmirserveral.so.1 libmirserveral1 #MINVER#
2 MIRAL_1.0@MIRAL_1.0 1.0.02 MIRAL_1.0@MIRAL_1.0 1.0.0
3 (c++)"miral::WindowInfo::height_inc(mir::geometry::detail::IntWrapper<mir::geometry::DeltaYTag>)@MIRAL_1.0" 1.0.03 (c++)"miral::WindowInfo::height_inc(mir::geometry::detail::IntWrapper<mir::geometry::DeltaYTag>)@MIRAL_1.0" 1.0.0
4 (c++)"miral::WindowInfo::max_aspect(miral::WindowSpecification::AspectRatio)@MIRAL_1.0" 1.0.04 (c++)"miral::WindowInfo::max_aspect(miral::WindowSpecification::AspectRatio)@MIRAL_1.0" 1.0.0
55
=== modified file 'debian/mir-demos.install'
--- debian/mir-demos.install 2015-06-17 05:20:42 +0000
+++ debian/mir-demos.install 2017-08-31 10:09:47 +0000
@@ -1,3 +1,12 @@
1usr/bin/mir_demo_*1usr/bin/mir_demo_*
2usr/bin/mir_proving_*2usr/bin/mir_proving_*
3usr/lib/*/libmir_demo_*3usr/lib/*/libmir_demo_*
4usr/bin/miral-shell
5usr/bin/miral-run
6usr/bin/miral-kiosk
7usr/bin/miral-xrun
8usr/bin/miral-screencast
9usr/bin/miral-desktop
10usr/bin/miral-app
11usr/share/applications/miral-shell.desktop
12usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
413
=== removed file 'debian/miral-examples.install'
--- debian/miral-examples.install 2017-08-21 15:58:34 +0000
+++ debian/miral-examples.install 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1usr/bin/miral-shell
2usr/bin/miral-run
3usr/bin/miral-kiosk
4usr/bin/miral-xrun
5usr/bin/miral-screencast
6usr/bin/miral-desktop
7usr/bin/miral-app
8usr/share/applications/miral-shell.desktop
9usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
100
=== modified file 'examples/miral-kiosk/CMakeLists.txt'
--- examples/miral-kiosk/CMakeLists.txt 2017-08-21 15:58:34 +0000
+++ examples/miral-kiosk/CMakeLists.txt 2017-08-31 10:09:47 +0000
@@ -9,4 +9,4 @@
9 sw_splash.cpp sw_splash.h9 sw_splash.cpp sw_splash.h
10)10)
1111
12target_link_libraries(miral-kiosk miral)12target_link_libraries(miral-kiosk mirserveral)
1313
=== modified file 'examples/miral-shell/CMakeLists.txt'
--- examples/miral-shell/CMakeLists.txt 2017-08-21 15:58:34 +0000
+++ examples/miral-shell/CMakeLists.txt 2017-08-31 10:09:47 +0000
@@ -59,7 +59,7 @@
59target_compile_definitions(miral-shell PRIVATE -DTYPO_SUPPORTS_FREETYPE)59target_compile_definitions(miral-shell PRIVATE -DTYPO_SUPPORTS_FREETYPE)
60target_link_libraries(miral-shell60target_link_libraries(miral-shell
61 miral-spinner61 miral-spinner
62 miral62 mirserveral
63 ${FREETYPE_LIBRARIES}63 ${FREETYPE_LIBRARIES}
64)64)
6565
6666
=== renamed directory 'include/miral/mir/client' => 'include/client/mir/client'
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2017-08-21 14:18:55 +0000
+++ src/CMakeLists.txt 2017-08-31 10:09:47 +0000
@@ -1,6 +1,11 @@
1# We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.1# We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.
2set(MIRPLATFORM_ABI 16)2set(MIRPLATFORM_ABI 16)
33
4set(MIRAL_VERSION_MAJOR 1)
5set(MIRAL_VERSION_MINOR 5)
6set(MIRAL_VERSION_PATCH 0)
7set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
8
4# Add the cookie implementation before exposing any APIs9# Add the cookie implementation before exposing any APIs
5add_subdirectory(cookie/)10add_subdirectory(cookie/)
611
712
=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt 2017-05-17 04:48:46 +0000
+++ src/client/CMakeLists.txt 2017-08-31 10:09:47 +0000
@@ -11,6 +11,11 @@
11 @ONLY11 @ONLY
12)12)
1313
14configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in
15 ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
16 @ONLY
17)
18
14configure_file(19configure_file(
15 ${CMAKE_CURRENT_SOURCE_DIR}/mirclient-debug-extension.pc.in20 ${CMAKE_CURRENT_SOURCE_DIR}/mirclient-debug-extension.pc.in
16 ${CMAKE_CURRENT_BINARY_DIR}/mirclient-debug-extension.pc21 ${CMAKE_CURRENT_BINARY_DIR}/mirclient-debug-extension.pc
@@ -106,6 +111,13 @@
106 mir_extension_core.cpp111 mir_extension_core.cpp
107 ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_extension_core.h112 ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_extension_core.h
108 ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/extensions/drag_and_drop.h113 ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/extensions/drag_and_drop.h
114 ${CMAKE_SOURCE_DIR}/include/client/mir/client/blob.h
115 ${CMAKE_SOURCE_DIR}/include/client/mir/client/cookie.h
116 ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_spec.h
117 ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_id.h
118 ${CMAKE_SOURCE_DIR}/include/client/mir/client/connection.h
119 ${CMAKE_SOURCE_DIR}/include/client/mir/client/display_config.h
120 ${CMAKE_SOURCE_DIR}/include/client/mir/client/window.h
109)121)
110122
111# Ensure protobuf C++ headers have been produced before123# Ensure protobuf C++ headers have been produced before
@@ -153,6 +165,7 @@
153165
154install(166install(
155 FILES ${CMAKE_CURRENT_BINARY_DIR}/mirclient.pc167 FILES ${CMAKE_CURRENT_BINARY_DIR}/mirclient.pc
168 ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
156 DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig169 DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
157)170)
158171
159172
=== renamed file 'src/miral/mirclientcpp.pc.in' => 'src/client/mirclientcpp.pc.in'
--- src/miral/mirclientcpp.pc.in 2017-08-29 09:17:03 +0000
+++ src/client/mirclientcpp.pc.in 2017-08-31 10:09:47 +0000
@@ -1,7 +1,7 @@
1includedir=@INCLUDEDIR@/miral1includedir=@INCLUDEDIR@/mirclient
22
3Name: mirclientcpp3Name: mirclientcpp
4Description: Mir Abstraction Layer C++ wrapper for mirclient4Description: C++ wrapper for mirclient
5Version: @MIRAL_VERSION@5Version: @MIRAL_VERSION@
6Requires: mirclient6Requires: mirclient
7Cflags: -I${includedir}7Cflags: -I${includedir}
88
=== modified file 'src/miral/CMakeLists.txt'
--- src/miral/CMakeLists.txt 2017-08-29 09:17:03 +0000
+++ src/miral/CMakeLists.txt 2017-08-31 10:09:47 +0000
@@ -1,8 +1,3 @@
1set(MIRAL_VERSION_MAJOR 1)
2set(MIRAL_VERSION_MINOR 5)
3set(MIRAL_VERSION_PATCH 0)
4set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
5
6if(${CMAKE_COMPILER_IS_GNUCXX})1if(${CMAKE_COMPILER_IS_GNUCXX})
7 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")2 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
8 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")3 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
@@ -18,7 +13,7 @@
18 ${PROJECT_SOURCE_DIR}/include/server13 ${PROJECT_SOURCE_DIR}/include/server
19)14)
2015
21set(MIRAL_ABI 2)16set(MIRAL_ABI 1)
22set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)17set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
23set(miral_include ${PROJECT_SOURCE_DIR}/include/miral)18set(miral_include ${PROJECT_SOURCE_DIR}/include/miral)
2419
@@ -38,7 +33,7 @@
3833
39set_source_files_properties(xcursor.c PROPERTIES COMPILE_DEFINITIONS _GNU_SOURCE)34set_source_files_properties(xcursor.c PROPERTIES COMPILE_DEFINITIONS _GNU_SOURCE)
4035
41add_library(miral SHARED36add_library(mirserveral SHARED
42 active_outputs.cpp ${miral_include}/miral/active_outputs.h37 active_outputs.cpp ${miral_include}/miral/active_outputs.h
43 add_init_callback.cpp ${miral_include}/miral/add_init_callback.h38 add_init_callback.cpp ${miral_include}/miral/add_init_callback.h
44 application.cpp ${miral_include}/miral/application.h39 application.cpp ${miral_include}/miral/application.h
@@ -66,13 +61,6 @@
66 window_manager_tools.cpp ${miral_include}/miral/window_manager_tools.h61 window_manager_tools.cpp ${miral_include}/miral/window_manager_tools.h
67 ${miral_include}/miral/window_management_policy_addendum2.h62 ${miral_include}/miral/window_management_policy_addendum2.h
68 ${miral_include}/miral/window_management_policy_addendum3.h63 ${miral_include}/miral/window_management_policy_addendum3.h
69 ${miral_include}/mir/client/blob.h
70 ${miral_include}/mir/client/cookie.h
71 ${miral_include}/mir/client/window_spec.h
72 ${miral_include}/mir/client/window_id.h
73 ${miral_include}/mir/client/connection.h
74 ${miral_include}/mir/client/display_config.h
75 ${miral_include}/mir/client/window.h
76)64)
7765
78target_include_directories(mirclientcpp66target_include_directories(mirclientcpp
@@ -84,12 +72,12 @@
84 PRIVATE ${MIRSERVER_INCLUDE_DIRS}72 PRIVATE ${MIRSERVER_INCLUDE_DIRS}
85)73)
8674
87target_include_directories(miral75target_include_directories(mirserveral
88 PUBLIC "${miral_include}" ${MIRCLIENT_INCLUDE_DIRS}76 PUBLIC "${miral_include}" ${MIRCLIENT_INCLUDE_DIRS}
89 PRIVATE ${MIRSERVER_INCLUDE_DIRS}77 PRIVATE ${MIRSERVER_INCLUDE_DIRS}
90)78)
9179
92target_link_libraries(miral80target_link_libraries(mirserveral
93 PUBLIC81 PUBLIC
94 mirclient82 mirclient
95 mircommon83 mircommon
@@ -98,7 +86,7 @@
98 mirserver86 mirserver
99)87)
10088
101set_target_properties(miral89set_target_properties(mirserveral
102 PROPERTIES90 PROPERTIES
103 SOVERSION ${MIRAL_ABI}91 SOVERSION ${MIRAL_ABI}
104 LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"92 LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
@@ -108,9 +96,9 @@
108# clang generates slightly different symbols (but we don't care)96# clang generates slightly different symbols (but we don't care)
109if (CMAKE_COMPILER_IS_GNUCXX)97if (CMAKE_COMPILER_IS_GNUCXX)
110 add_custom_target(check-miral-symbols ALL98 add_custom_target(check-miral-symbols ALL
111 DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols99 DEPENDS mirserveral ${PROJECT_SOURCE_DIR}/debian/libmirserveral${MIRAL_ABI}.symbols
112 COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols100 COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmirserveral${MIRAL_ABI}.symbols
113 COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols101 COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmirserveral.so.${MIRAL_ABI} -plibmirserveral${MIRAL_ABI} -O${CMAKE_CURRENT_BINARY_DIR}/libmirserveral${MIRAL_ABI}.symbols
114 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"102 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
115 VERBATIM103 VERBATIM
116 )104 )
@@ -124,17 +112,11 @@
124 @ONLY112 @ONLY
125)113)
126114
127configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in
128 ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
129 @ONLY
130)
131
132configure_file(115configure_file(
133 ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in116 ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
134 ${miral_include}/miral/version.h117 ${miral_include}/miral/version.h
135)118)
136119
137install(TARGETS miral LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")120install(TARGETS mirserveral LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
138install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/miral DESTINATION "${INCLUDEDIR}")121install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/miral DESTINATION "${INCLUDEDIR}")
139install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral.pc122install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral.pc DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
140 ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
141123
=== modified file 'src/miral/miral.pc.in'
--- src/miral/miral.pc.in 2017-08-29 09:17:03 +0000
+++ src/miral/miral.pc.in 2017-08-31 10:09:47 +0000
@@ -5,5 +5,5 @@
5Description: Mir Abstraction Layer library5Description: Mir Abstraction Layer library
6Version: @MIRAL_VERSION@6Version: @MIRAL_VERSION@
7Requires: mirclientcpp7Requires: mirclientcpp
8Libs: -L${libdir} -lmiral8Libs: -L${libdir} -lmirserveral
9Cflags: -I${includedir}9Cflags: -I${includedir}
1010
=== modified file 'tests/miral/CMakeLists.txt'
--- tests/miral/CMakeLists.txt 2017-08-24 11:10:17 +0000
+++ tests/miral/CMakeLists.txt 2017-08-31 10:09:47 +0000
@@ -49,7 +49,7 @@
49target_link_libraries(miral-test49target_link_libraries(miral-test
50 ${GTEST_BOTH_LIBRARIES}50 ${GTEST_BOTH_LIBRARIES}
51 ${GMOCK_LIBRARIES}51 ${GMOCK_LIBRARIES}
52 miral52 mirserveral
53 miral-internal53 miral-internal
54 mir-test-assist54 mir-test-assist
55)55)
5656
=== modified file 'tools/update_package_abis.sh'
--- tools/update_package_abis.sh 2017-08-22 10:57:07 +0000
+++ tools/update_package_abis.sh 2017-08-31 10:09:47 +0000
@@ -10,7 +10,7 @@
10fi10fi
1111
12packages="\12packages="\
13 libmiral:MIRAL_ABI \13 libmir-al:MIRAL_ABI \
14 libmircore:MIRCORE_ABI \14 libmircore:MIRCORE_ABI \
15 libmirclient:MIRCLIENT_ABI \15 libmirclient:MIRCLIENT_ABI \
16 libmirclient-debug-extension:MIRCLIENT_DEBUG_EXTENSION_ABI \16 libmirclient-debug-extension:MIRCLIENT_DEBUG_EXTENSION_ABI \

Subscribers

People subscribed via source and target branches