Unity 8

Merge lp:~dandrader/unity8/consolidateLauncherAPIChecks into lp:unity8

  1. consolidateLauncherAPIChecks
  2. Merge into trunk
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 2799
Merged at revision: 2826
Proposed branch: lp:~dandrader/unity8/consolidateLauncherAPIChecks
Merge into: lp:unity8
Diff against target: 59 lines (+1/-7)
6 files modified
CMakeLists.txt (+1/-0)
plugins/Greeter/Unity/Launcher/CMakeLists.txt (+0/-1)
plugins/Unity/Launcher/CMakeLists.txt (+0/-1)
tests/mocks/Unity/Launcher/CMakeLists.txt (+0/-2)
tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt (+0/-2)
tests/plugins/Unity/Launcher/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~dandrader/unity8/consolidateLauncherAPIChecks
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+316097@code.launchpad.net

Commit message

Consolidate launcher API checks

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Not applicable

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Makes sense i guess

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2799
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3103/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4034
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2364
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2364
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4062
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3906
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3906/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3906
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3906/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3906
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3906/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3906
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3906/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3906
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3906/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3906
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3906/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3103/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2017-01-24 07:39:33 +0000
3+++ CMakeLists.txt 2017-02-01 11:36:55 +0000
4@@ -74,6 +74,7 @@
5 pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
6 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
7 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
8+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)
9 pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
10 pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)
11 pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2)
12
13=== modified file 'plugins/Greeter/Unity/Launcher/CMakeLists.txt'
14--- plugins/Greeter/Unity/Launcher/CMakeLists.txt 2016-11-30 10:46:22 +0000
15+++ plugins/Greeter/Unity/Launcher/CMakeLists.txt 2017-02-01 11:36:55 +0000
16@@ -1,4 +1,3 @@
17-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)
18 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
19
20 add_definitions(-DSM_BUSNAME=systemBus)
21
22=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
23--- plugins/Unity/Launcher/CMakeLists.txt 2016-11-30 10:46:22 +0000
24+++ plugins/Unity/Launcher/CMakeLists.txt 2017-02-01 11:36:55 +0000
25@@ -1,4 +1,3 @@
26-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)
27 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
28
29 add_definitions(-DSM_BUSNAME=systemBus)
30
31=== modified file 'tests/mocks/Unity/Launcher/CMakeLists.txt'
32--- tests/mocks/Unity/Launcher/CMakeLists.txt 2016-11-30 10:46:22 +0000
33+++ tests/mocks/Unity/Launcher/CMakeLists.txt 2017-02-01 11:36:55 +0000
34@@ -1,5 +1,3 @@
35-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)
36-
37 include_directories(
38 ${CMAKE_CURRENT_SOURCE_DIR}
39 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/
40
41=== modified file 'tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt'
42--- tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt 2016-12-14 15:52:45 +0000
43+++ tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt 2017-02-01 11:36:55 +0000
44@@ -1,5 +1,3 @@
45-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)
46-
47 include_directories(
48 ${CMAKE_CURRENT_SOURCE_DIR}
49 ${CMAKE_CURRENT_BINARY_DIR}
50
51=== modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
52--- tests/plugins/Unity/Launcher/CMakeLists.txt 2016-12-14 15:52:45 +0000
53+++ tests/plugins/Unity/Launcher/CMakeLists.txt 2017-02-01 11:36:55 +0000
54@@ -1,5 +1,4 @@
55 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
56-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)
57
58 include_directories(
59 ${CMAKE_CURRENT_SOURCE_DIR}

Subscribers

People subscribed via source and target branches