Merge lp:~brandontschaefer/miral/miral into lp:~alan-griffiths/miral/trunk

Proposed by Brandon Schaefer on 2016-04-11
Status: Merged
Merged at revision: 123
Proposed branch: lp:~brandontschaefer/miral/miral
Merge into: lp:~alan-griffiths/miral/trunk
Diff against target: 120 lines (+71/-1)
6 files modified
CMakeLists.txt (+4/-0)
miral-shell/CMakeLists.txt (+5/-0)
miral-shell/desktop/CMakeLists.txt (+12/-0)
miral-shell/desktop/miral-shell.desktop.in (+18/-0)
miral-shell/desktop/ubuntu-logo.svg (+27/-0)
miral/CMakeLists.txt (+5/-1)
To merge this branch: bzr merge lp:~brandontschaefer/miral/miral
Reviewer Review Type Date Requested Status
Alan Griffiths 2016-04-11 Approve on 2016-04-12
Review via email: mp+291550@code.launchpad.net

Commit message

Install the library + shell binary
Install a desktop file + ubuntu svg logo (for now)

Description of the change

Install the library + shell binary
Install a desktop file + ubuntu svg logo (for now)

To post a comment you must log in.
Alan Griffiths (alan-griffiths) wrote :

OK

review: Approve
Alan Griffiths (alan-griffiths) wrote :

Probably a minor config issue, but /usr/local/lib/ doesn't seem to be searched by default. So this install doesn't actually work.

Brandon Schaefer (brandontschaefer) wrote :

Hmm yeah you're right, I usually expect things to be install in /usr (for CMAKE_INTSALL_PREFIX) not sure if we should force a default install to a place that is looked at by default or if we should write a wrapper to set these env variables?

Alan Griffiths (alan-griffiths) wrote :

> Hmm yeah you're right, I usually expect things to be install in /usr (for
> CMAKE_INTSALL_PREFIX) not sure if we should force a default install to a place
> that is looked at by default or if we should write a wrapper to set these env
> variables?

We could default CMAKE_INSTALL_PREFIX to /usr?

Brandon Schaefer (brandontschaefer) wrote :

That should happen once we do debain stuff (when the package gets actually built)

Alan Griffiths (alan-griffiths) wrote :

I mean like:

if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
    set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "/usr install prefix" FORCE)
endif()

The debian stuff will, of course, override this

Brandon Schaefer (brandontschaefer) wrote :

O yeah that would be nice!

Brandon Schaefer (brandontschaefer) wrote :

/me adds it to his branch

lp:~brandontschaefer/miral/miral updated on 2016-04-12
107. By Brandon Schaefer on 2016-04-12

Default to /usr vs /usr/local
Use 4 spaces in CMakeLists.txt

Alan Griffiths (alan-griffiths) wrote :

I'm (still) OK with you committing this

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2016-04-10 17:18:56 +0000
+++ CMakeLists.txt 2016-04-12 16:01:12 +0000
@@ -1,6 +1,10 @@
1cmake_minimum_required(VERSION 3.0)1cmake_minimum_required(VERSION 3.0)
2project(miral)2project(miral)
33
4if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
5 set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "/usr install prefix" FORCE)
6endif()
7
4cmake_policy(SET CMP0015 NEW)8cmake_policy(SET CMP0015 NEW)
5cmake_policy(SET CMP0022 NEW)9cmake_policy(SET CMP0022 NEW)
610
711
=== modified file 'miral-shell/CMakeLists.txt'
--- miral-shell/CMakeLists.txt 2016-04-11 19:21:10 +0000
+++ miral-shell/CMakeLists.txt 2016-04-12 16:01:12 +0000
@@ -1,4 +1,5 @@
1add_subdirectory(spinner)1add_subdirectory(spinner)
2add_subdirectory(desktop)
23
3add_custom_target(miral-run ALL4add_custom_target(miral-run ALL
4 cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-run.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-run5 cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-run.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-run
@@ -16,3 +17,7 @@
16)17)
1718
18target_link_libraries(miral-shell miral miral-spinner)19target_link_libraries(miral-shell miral miral-spinner)
20
21install(TARGETS miral-shell
22 DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
23)
1924
=== added directory 'miral-shell/desktop'
=== added file 'miral-shell/desktop/CMakeLists.txt'
--- miral-shell/desktop/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ miral-shell/desktop/CMakeLists.txt 2016-04-12 16:01:12 +0000
@@ -0,0 +1,12 @@
1set(ICON_NAME ubuntu-logo)
2set(PROGRAM_NAME miral-shell)
3
4configure_file(miral-shell.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/miral-shell.desktop @ONLY)
5
6install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral-shell.desktop
7 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
8)
9
10install(FILES ${ICON_NAME}.svg
11 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
12)
013
=== added file 'miral-shell/desktop/miral-shell.desktop.in'
--- miral-shell/desktop/miral-shell.desktop.in 1970-01-01 00:00:00 +0000
+++ miral-shell/desktop/miral-shell.desktop.in 2016-04-12 16:01:12 +0000
@@ -0,0 +1,18 @@
1[Desktop Entry]
2Version=1.0
3Name=Miral Shell
4GenericName=Mir Shell
5Comment=A Mir Shell
6Keywords=Mir;Server;Shell
7Type=Application
8Icon=@ICON_NAME@
9Exec=@PROGRAM_NAME@
10Terminal=false
11Categories=Utility
12#MimeType=
13X-Ubuntu-Touch=true
14X-Ubuntu-Gettext-Domain=miral-shell
15X-Ubuntu-Single-Instance=true
16X-Ubuntu-Default-Department-ID=miral-shell
17#X-Screenshot=
18X-Ubuntu-Splash-Color=#FFFFFF
019
=== added file 'miral-shell/desktop/ubuntu-logo.svg'
--- miral-shell/desktop/ubuntu-logo.svg 1970-01-01 00:00:00 +0000
+++ miral-shell/desktop/ubuntu-logo.svg 2016-04-12 16:01:12 +0000
@@ -0,0 +1,27 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
3<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
4 <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
5]>
6<svg version="1.1"
7 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
8 x="0px" y="0px" width="285px" height="285px" viewBox="-0.866 -0.866 285 285" enable-background="new -0.866 -0.866 285 285"
9 xml:space="preserve">
10<defs>
11</defs>
12<path fill="#DD4814" d="M283.465,141.734c0,78.273-63.457,141.73-141.734,141.73S0,220.008,0,141.734C0,63.455,63.453,0,141.73,0
13 S283.465,63.455,283.465,141.734z"/>
14<path fill="#FFFFFF" d="M45.356,122.812c-10.453,0-18.923,8.47-18.923,18.923c0,10.449,8.47,18.92,18.923,18.92
15 c10.449,0,18.92-8.471,18.92-18.92C64.276,131.281,55.806,122.812,45.356,122.812z M180.463,208.814
16 c-9.051,5.225-12.149,16.793-6.926,25.84c5.226,9.051,16.793,12.151,25.844,6.926c9.048-5.224,12.148-16.792,6.923-25.842
17 C201.08,206.691,189.511,203.59,180.463,208.814z M86.458,141.732c0-18.701,9.293-35.219,23.504-45.221L96.128,73.338
18 c-16.56,11.064-28.878,27.978-33.995,47.788c5.977,4.872,9.796,12.291,9.796,20.608c0,8.315-3.819,15.734-9.797,20.605
19 c5.116,19.812,17.435,36.726,33.995,47.789l13.835-23.175C95.751,176.953,86.458,160.436,86.458,141.732z M141.733,86.457
20 c28.877,0,52.564,22.141,55.047,50.373l26.968-0.394c-1.327-20.844-10.432-39.562-24.425-53.319
21 c-7.194,2.718-15.505,2.306-22.688-1.842c-7.192-4.152-11.705-11.156-12.941-18.757c-6.992-1.935-14.351-2.99-21.96-2.99
22 c-13.086,0-25.449,3.072-36.431,8.512l13.146,23.56C125.526,88.307,133.412,86.457,141.733,86.457z M141.733,197.008
23 c-8.322,0-16.207-1.85-23.285-5.143L105.3,215.427c10.983,5.438,23.347,8.511,36.433,8.511c7.609,0,14.968-1.055,21.961-2.99
24 c1.236-7.601,5.75-14.605,12.943-18.76c7.183-4.146,15.494-4.558,22.688-1.839c13.992-13.758,23.097-32.476,24.422-53.32
25 l-26.968-0.394C194.298,174.871,170.61,197.008,141.733,197.008z M180.46,74.649c9.05,5.227,20.619,2.126,25.842-6.921
26 c5.226-9.051,2.128-20.619-6.923-25.845c-9.049-5.224-20.617-2.124-25.843,6.927C168.312,57.857,171.412,69.426,180.46,74.649z"/>
27</svg>
028
=== modified file 'miral/CMakeLists.txt'
--- miral/CMakeLists.txt 2016-04-10 17:18:56 +0000
+++ miral/CMakeLists.txt 2016-04-12 16:01:12 +0000
@@ -22,4 +22,8 @@
22 ${MIRCLIENT_LDFLAGS}22 ${MIRCLIENT_LDFLAGS}
23# PRIVATE TODO complete wrapping of libmirserver23# PRIVATE TODO complete wrapping of libmirserver
24 ${MIRSERVER_LDFLAGS}24 ${MIRSERVER_LDFLAGS}
25)
26\ No newline at end of file25\ No newline at end of file
26)
27
28install(TARGETS miral
29 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
30)

Subscribers

People subscribed via source and target branches