Unity 8

Merge lp:~saviq/unity8/cmake-plugin-cleanup into lp:unity8

  1. cmake-plugin-cleanup
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Nick Dedekind
Approved revision: 877
Merged at revision: 906
Proposed branch: lp:~saviq/unity8/cmake-plugin-cleanup
Merge into: lp:unity8
Diff against target: 1027 lines (+243/-288)
56 files modified
cmake/modules/QmlPlugins.cmake (+124/-49)
plugins/AccountsService/CMakeLists.txt (+1/-4)
plugins/AccountsService/qmldir (+1/-1)
plugins/CMakeLists.txt (+13/-0)
plugins/Dash/CMakeLists.txt (+1/-6)
plugins/Dash/qmldir (+1/-1)
plugins/HudClient/CMakeLists.txt (+1/-6)
plugins/HudClient/qmldir (+1/-1)
plugins/LightDM/CMakeLists.txt (+1/-6)
plugins/LightDM/qmldir (+1/-1)
plugins/Powerd/CMakeLists.txt (+1/-3)
plugins/Powerd/qmldir (+1/-1)
plugins/SessionBroadcast/CMakeLists.txt (+1/-4)
plugins/SessionBroadcast/qmldir (+1/-1)
plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt (+1/-6)
plugins/Ubuntu/DownloadDaemonListener/qmldir (+1/-1)
plugins/Ubuntu/Gestures/CMakeLists.txt (+1/-6)
plugins/Ubuntu/Gestures/qmldir (+1/-1)
plugins/Unity/Indicators/CMakeLists.txt (+4/-7)
plugins/Unity/Indicators/qml/CMakeLists.txt (+0/-5)
plugins/Unity/Indicators/qml/qmldir (+1/-1)
plugins/Unity/Launcher/CMakeLists.txt (+1/-3)
plugins/Unity/Launcher/qmldir (+1/-1)
plugins/Utils/CMakeLists.txt (+1/-3)
plugins/Utils/qmldir (+1/-1)
tests/mocks/AccountsService/CMakeLists.txt (+1/-12)
tests/mocks/AccountsService/qmldir (+1/-0)
tests/mocks/CMakeLists.txt (+30/-0)
tests/mocks/GSettings.1.0/CMakeLists.txt (+1/-4)
tests/mocks/GSettings.1.0/qmldir (+1/-0)
tests/mocks/HudClient/CMakeLists.txt (+1/-4)
tests/mocks/HudClient/qmldir (+2/-0)
tests/mocks/LightDM/CMakeLists.txt (+5/-12)
tests/mocks/LightDM/qmldir (+1/-0)
tests/mocks/Powerd/CMakeLists.txt (+1/-12)
tests/mocks/Powerd/qmldir (+1/-0)
tests/mocks/QMenuModel/CMakeLists.txt (+2/-12)
tests/mocks/QMenuModel/qmldir (+1/-0)
tests/mocks/QtMultimedia/CMakeLists.txt (+1/-12)
tests/mocks/QtMultimedia/qmldir (+1/-0)
tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt (+1/-9)
tests/mocks/Ubuntu/DownloadDaemonListener/qmldir (+1/-0)
tests/mocks/Ubuntu/Thumbnailer/CMakeLists.txt (+1/-7)
tests/mocks/Ubuntu/Thumbnailer/qmldir (+2/-0)
tests/mocks/Unity/Application/CMakeLists.txt (+10/-36)
tests/mocks/Unity/Application/qmldir (+2/-0)
tests/mocks/Unity/CMakeLists.txt (+1/-12)
tests/mocks/Unity/Indicators/CMakeLists.txt (+1/-14)
tests/mocks/Unity/Indicators/qmldir (+1/-0)
tests/mocks/Unity/Launcher/CMakeLists.txt (+1/-5)
tests/mocks/Unity/Launcher/qmldir (+1/-0)
tests/mocks/Unity/Notifications/CMakeLists.txt (+1/-11)
tests/mocks/Unity/Notifications/qmldir (+1/-0)
tests/mocks/Unity/qmldir (+1/-0)
tests/utils/modules/Unity/Test/CMakeLists.txt (+4/-7)
tests/utils/modules/Unity/Test/qmldir (+2/-0)
To merge this branch: bzr merge lp:~saviq/unity8/cmake-plugin-cleanup
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Nick Dedekind (community) Approve
Albert Astals Cid (community) Needs Fixing
Review via email: mp+218171@code.launchpad.net

Commit message

Refactor export_qmlfiles and export_qmlplugins to be more generic and clean up installed mocks.

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?
Yes.

 * Did you make sure that your branch does not contain spurious tags?
Yes.

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

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:872
http://jenkins.qa.ubuntu.com/job/unity8-ci/2901/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/586
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1422
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1426
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1426/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1422
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/510
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4892
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4892/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6736

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2901/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:873
http://jenkins.qa.ubuntu.com/job/unity8-ci/2902/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/588/console
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1766/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1423/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1427/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1423/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4894/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2902/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:874
http://jenkins.qa.ubuntu.com/job/unity8-ci/2903/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/589
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1767
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1428
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1428/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1424
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4895
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4895/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6741

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2903/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in plugins/Dash/CMakeLists.txt
Text conflict in plugins/Dash/qmldir

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:875
http://jenkins.qa.ubuntu.com/job/unity8-ci/2958/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/202
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1818/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/432
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/432/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7143

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2958/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

I'm getting a "Need to use QMirServerApplication" message when running locally on desktop, and unity8 continuously restarts.

Revision history for this message
Nick Dedekind (nick-dedekind) :
review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:877
http://jenkins.qa.ubuntu.com/job/unity8-ci/2970/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/243
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1830/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/734
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/505
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/505/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7211

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2970/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Fixed.

Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes. works on local desktop install & phone package install

 * Did CI run pass? If not, please explain why.
Unrelated failure

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:877
http://jenkins.qa.ubuntu.com/job/unity8-ci/2975/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/69
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/69/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/761
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/555
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/555/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7259

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2975/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

\o/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'cmake/modules/Plugins.cmake' => 'cmake/modules/QmlPlugins.cmake'
2--- cmake/modules/Plugins.cmake 2014-01-29 18:16:53 +0000
3+++ cmake/modules/QmlPlugins.cmake 2014-05-15 15:00:34 +0000
4@@ -1,68 +1,143 @@
5-find_program(qmlplugindump_exe qmlplugindump)
6-
7-if(NOT qmlplugindump_exe)
8- msg(FATAL_ERROR "Could not locate qmlplugindump.")
9+# If you need to override the qmlplugindump binary, create the qmlplugin executable
10+# target before loading this plugin.
11+
12+if(NOT TARGET qmlplugindump)
13+ find_program(qmlplugindump_exe qmlplugindump)
14+
15+ if(NOT qmlplugindump_exe)
16+ msg(FATAL_ERROR "Could not locate qmlplugindump.")
17+ endif()
18+
19+ add_executable(qmlplugindump IMPORTED)
20+ set_target_properties(qmlplugindump PROPERTIES IMPORTED_LOCATION ${qmlplugindump_exe})
21 endif()
22
23-# Creates target for copying and installing qmlfiles
24-#
25-# export_qmlfiles(plugin sub_path)
26-#
27-#
28-# Target to be created:
29-# - plugin-qmlfiles - Copies the qml files (*.qml, *.js, qmldir) into the shadow build folder.
30-
31-macro(export_qmlfiles PLUGIN PLUGIN_SUBPATH)
32+
33+# Creates a target for copying resource files into build dir and optionally installing them.
34+#
35+# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
36+# into ${DESTINATION}/${path}.
37+#
38+# Resource file names are matched against {*.{qml,js,jpg,png,sci,svg},qmldir}.
39+#
40+# export_qmlfiles(plugin path
41+# [SEARCH_PATH path] # Path to search for resources in (defaults to ${CMAKE_CURRENT_SOURCE_DIR})
42+# [BINARY_DIR path]
43+# [DESTINATION path]
44+# [TARGET_PREFIX string] # Will be prefixed to the target name
45+# )
46+#
47+# Created target:
48+# - ${TARGET_PREFIX}${plugin}-qmlfiles - Copies resources into the binary dir.
49+
50+macro(export_qmlfiles PLUGIN PATH)
51+ set(single SEARCH_PATH BINARY_DIR DESTINATION TARGET_PREFIX)
52+ cmake_parse_arguments(QMLFILES "" "${single}" "" ${ARGN})
53+
54+ if(NOT QMLFILES_SEARCH_PATH)
55+ set(QMLFILES_SEARCH_PATH ${CMAKE_CURRENT_SOURCE_DIR})
56+ endif()
57+
58+ if(QMLFILES_BINARY_DIR)
59+ set(qmlfiles_dir ${QMLFILES_BINARY_DIR}/${PATH})
60+ else()
61+ set(qmlfiles_dir ${CMAKE_CURRENT_BINARY_DIR})
62+ endif()
63
64 file(GLOB QMLFILES
65- *.qml
66- *.js
67- qmldir
68+ ${QMLFILES_SEARCH_PATH}/*.qml
69+ ${QMLFILES_SEARCH_PATH}/*.js
70+ ${QMLFILES_SEARCH_PATH}/*.jpg
71+ ${QMLFILES_SEARCH_PATH}/*.png
72+ ${QMLFILES_SEARCH_PATH}/*.sci
73+ ${QMLFILES_SEARCH_PATH}/*.svg
74+ ${QMLFILES_SEARCH_PATH}/qmldir
75 )
76
77- # copy the qmldir file
78- add_custom_target(${PLUGIN}-qmlfiles ALL
79- COMMAND cp ${QMLFILES} ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}
80+ execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${qmlfiles_dir})
81+
82+ # copy the files
83+ add_custom_target(${QMLFILES_TARGET_PREFIX}${PLUGIN}-qmlfiles ALL
84+ COMMAND cp ${QMLFILES} ${qmlfiles_dir}
85 DEPENDS ${QMLFILES}
86 SOURCES ${QMLFILES}
87 )
88
89- # install the qmlfiles file.
90- install(FILES ${QMLFILES}
91- DESTINATION ${SHELL_INSTALL_QML}/${PLUGIN_SUBPATH}
92- )
93+ if(QMLFILES_DESTINATION)
94+ # install the qmlfiles file.
95+ install(FILES ${QMLFILES}
96+ DESTINATION ${QMLFILES_DESTINATION}/${PATH}
97+ )
98+ endif()
99 endmacro(export_qmlfiles)
100
101
102-# Creates target for generating the qmltypes file for a plugin and installs plugin files
103-#
104-# export_qmlplugin(plugin version sub_path [TARGETS target1 [target2 ...]])
105-#
106-# TARGETS additional install targets (eg the plugin shared object)
107-#
108-# Target to be created:
109-# - plugin-qmltypes - Generates the qmltypes file in the shadow build folder.
110-
111-macro(export_qmlplugin PLUGIN VERSION PLUGIN_SUBPATH)
112- set(multi_value_keywords TARGETS)
113- cmake_parse_arguments(qmlplugin "" "" "${multi_value_keywords}" ${ARGN})
114-
115- # Only try to generate .qmltypes if not cross compiling
116+# Creates a target for generating the typeinfo file for a QML plugin and optionally installs it
117+# and additional targets.
118+#
119+# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
120+# into ${DESTINATION}/${path}. If you don't pass BINARY_DIR, it's assumed that current source
121+# path ends with ${path}.
122+#
123+# The generated file will be named after the last segment of the plugin name, e.g. Foo.qmltypes.
124+#
125+# export_qmlplugin(plugin version path
126+# [BINARY_DIR path]
127+# [DESTINATION path]
128+# [TARGET_PREFIX string] # Will be prefixed to the target name
129+# [ENVIRONMENT string] # Will be added to qmlplugindump's env
130+# [TARGETS target1 [target2 ...]] # Targets to depend on and install (e.g. the plugin shared object)
131+# )
132+#
133+# Created target:
134+# - ${TARGET_PREFIX}${plugin}-qmltypes - Generates the qmltypes file in the binary dir.
135+
136+macro(export_qmlplugin PLUGIN VERSION PATH)
137+ set(single BINARY_DIR DESTINATION TARGET_PREFIX ENVIRONMENT)
138+ set(multi TARGETS)
139+ cmake_parse_arguments(QMLPLUGIN "" "${single}" "${multi}" ${ARGN})
140+
141+ get_target_property(qmlplugindump_executable qmlplugindump LOCATION)
142+
143+ if(QMLPLUGIN_BINARY_DIR)
144+ set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
145+ else()
146+ # Find import path to point qmlplugindump at
147+ string(REGEX REPLACE "${PATH}$" "" QMLPLUGIN_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
148+ set(qmlplugin_dir ${CMAKE_CURRENT_BINARY_DIR})
149+ endif()
150+
151+ # Find the last segment of the plugin name to use as qmltypes basename
152+ string(REGEX MATCH "[^.]+$" plugin_suffix ${PLUGIN})
153+ set(target_prefix ${QMLPLUGIN_TARGET_PREFIX}${PLUGIN})
154+ set(qmltypes_path ${qmlplugin_dir}/${plugin_suffix}.qmltypes)
155+
156+ # Only generate typeinfo if not cross compiling
157 if(NOT CMAKE_CROSSCOMPILING)
158- # create the plugin.qmltypes file
159- add_custom_target(${PLUGIN}-qmltypes ALL
160- COMMAND ${qmlplugindump_exe} -notrelocatable ${PLUGIN} ${VERSION} ${CMAKE_BINARY_DIR}/plugins > ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
161+ add_custom_target(${target_prefix}-qmltypes ALL
162+ COMMAND env ${QMLPLUGIN_ENVIRONMENT} ${qmlplugindump_executable} -notrelocatable
163+ ${PLUGIN} ${VERSION} ${QMLPLUGIN_BINARY_DIR} > ${qmltypes_path}
164 )
165- add_dependencies(${PLUGIN}-qmltypes ${PLUGIN}-qmlfiles ${qmlplugin_TARGETS})
166+ add_dependencies(${target_prefix}-qmltypes ${target_prefix}-qmlfiles ${QMLPLUGIN_TARGETS})
167
168- # install the qmltypes file.
169- install(FILES ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
170- DESTINATION ${SHELL_INSTALL_QML}/${PLUGIN_SUBPATH}
171- )
172+ if (QMLPLUGIN_DESTINATION)
173+ # Install the typeinfo file
174+ install(FILES ${qmltypes_path}
175+ DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
176+ )
177+ endif()
178 endif()
179
180- # install the additional targets
181- install(TARGETS ${qmlplugin_TARGETS}
182- DESTINATION ${SHELL_INSTALL_QML}/${PLUGIN_SUBPATH}
183+ set_target_properties(${QMLPLUGIN_TARGETS} PROPERTIES
184+ ARCHIVE_OUTPUT_DIRECTORY ${qmlplugin_dir}
185+ LIBRARY_OUTPUT_DIRECTORY ${qmlplugin_dir}
186+ RUNTIME_OUTPUT_DIRECTORY ${qmlplugin_dir}
187 )
188-endmacro(export_qmlplugin)
189+
190+ if (QMLPLUGIN_DESTINATION)
191+ # Install additional targets
192+ install(TARGETS ${QMLPLUGIN_TARGETS}
193+ DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
194+ )
195+ endif()
196+endmacro()
197
198=== modified file 'plugins/AccountsService/CMakeLists.txt'
199--- plugins/AccountsService/CMakeLists.txt 2013-09-05 18:09:41 +0000
200+++ plugins/AccountsService/CMakeLists.txt 2014-05-15 15:00:34 +0000
201@@ -1,5 +1,3 @@
202-include(Plugins)
203-
204 add_definitions(-DSM_BUSNAME=systemBus)
205
206 add_library(AccountsService-qml MODULE
207@@ -10,8 +8,7 @@
208
209 qt5_use_modules(AccountsService-qml DBus Qml)
210
211-export_qmlfiles(AccountsService AccountsService)
212-export_qmlplugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)
213+add_unity8_plugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)
214
215 set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
216 set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1")
217
218=== modified file 'plugins/AccountsService/qmldir'
219--- plugins/AccountsService/qmldir 2013-07-24 18:29:21 +0000
220+++ plugins/AccountsService/qmldir 2014-05-15 15:00:34 +0000
221@@ -1,3 +1,3 @@
222 module AccountsService
223 plugin AccountsService-qml
224-typeinfo plugin.qmltypes
225+typeinfo AccountsService.qmltypes
226
227=== modified file 'plugins/CMakeLists.txt'
228--- plugins/CMakeLists.txt 2014-04-30 10:06:33 +0000
229+++ plugins/CMakeLists.txt 2014-05-15 15:00:34 +0000
230@@ -1,3 +1,16 @@
231+include(QmlPlugins)
232+
233+# Set up and install a plugin for unity8.
234+#
235+# add_unity8_plugin(plugin version path
236+# [...] # See export_qmlfiles and export_qmlplugin documentation for more options
237+# )
238+
239+macro(add_unity8_plugin PLUGIN VERSION PATH)
240+ export_qmlfiles(${PLUGIN} ${PATH} DESTINATION ${SHELL_INSTALL_QML} ${ARGN})
241+ export_qmlplugin(${PLUGIN} ${VERSION} ${PATH} DESTINATION ${SHELL_INSTALL_QML} ${ARGN})
242+endmacro()
243+
244 add_subdirectory(AccountsService)
245 add_subdirectory(HudClient)
246 add_subdirectory(LightDM)
247
248=== modified file 'plugins/Dash/CMakeLists.txt'
249--- plugins/Dash/CMakeLists.txt 2014-04-30 10:06:33 +0000
250+++ plugins/Dash/CMakeLists.txt 2014-05-15 15:00:34 +0000
251@@ -1,6 +1,3 @@
252-# export_qmlplugin macro
253-include(Plugins)
254-
255 # There's no cmake var for v8 include path :-/
256 # so create one
257 LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
258@@ -41,6 +38,4 @@
259
260 qt5_use_modules(Dash-qml Qml Quick)
261
262-# export the qmldir qmltypes and plugin files
263-export_qmlfiles(Dash Dash)
264-export_qmlplugin(Dash 0.1 Dash TARGETS Dash-qml)
265+add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
266
267=== modified file 'plugins/Dash/qmldir'
268--- plugins/Dash/qmldir 2014-04-30 10:06:33 +0000
269+++ plugins/Dash/qmldir 2014-05-15 15:00:34 +0000
270@@ -1,4 +1,4 @@
271 module Dash
272 plugin Dash-qml
273-typeinfo plugin.qmltypes
274+typeinfo Dash.qmltypes
275 singleton CardCreatorCache 0.1 CardCreatorCache.qml
276
277=== modified file 'plugins/HudClient/CMakeLists.txt'
278--- plugins/HudClient/CMakeLists.txt 2013-07-08 15:12:28 +0000
279+++ plugins/HudClient/CMakeLists.txt 2014-05-15 15:00:34 +0000
280@@ -1,6 +1,3 @@
281-# export_qmlplugin macro
282-include(Plugins)
283-
284 find_package(Qt5Core REQUIRED)
285 find_package(Qt5Quick REQUIRED)
286 pkg_search_module(DEE dee-1.0 REQUIRED)
287@@ -38,6 +35,4 @@
288
289 qt5_use_modules(HudClientQml Qml)
290
291-# export the qmldir qmltypes and plugin files
292-export_qmlfiles(HudClient HudClient)
293-export_qmlplugin(HudClient 0.1 HudClient TARGETS HudClientQml)
294+add_unity8_plugin(HudClient 0.1 HudClient TARGETS HudClientQml)
295
296=== modified file 'plugins/HudClient/qmldir'
297--- plugins/HudClient/qmldir 2013-08-22 12:38:53 +0000
298+++ plugins/HudClient/qmldir 2014-05-15 15:00:34 +0000
299@@ -1,3 +1,3 @@
300 module HudClient
301 plugin HudClientQml
302-typeinfo plugin.qmltypes
303+typeinfo HudClient.qmltypes
304
305=== modified file 'plugins/LightDM/CMakeLists.txt'
306--- plugins/LightDM/CMakeLists.txt 2013-12-17 14:56:25 +0000
307+++ plugins/LightDM/CMakeLists.txt 2014-05-15 15:00:34 +0000
308@@ -1,6 +1,3 @@
309-# export_qmlplugin macro
310-include(Plugins)
311-
312 # Dependencies
313 include(FindPkgConfig)
314 pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
315@@ -37,6 +34,4 @@
316
317 qt5_use_modules(LightDM-qml DBus Gui Qml)
318
319-# export the qmldir qmltypes and plugin files
320-export_qmlfiles(LightDM LightDM)
321-export_qmlplugin(LightDM 0.1 LightDM TARGETS LightDM-qml)
322+add_unity8_plugin(LightDM 0.1 LightDM TARGETS LightDM-qml)
323
324=== modified file 'plugins/LightDM/qmldir'
325--- plugins/LightDM/qmldir 2013-07-04 09:32:44 +0000
326+++ plugins/LightDM/qmldir 2014-05-15 15:00:34 +0000
327@@ -1,3 +1,3 @@
328 module LightDM
329 plugin LightDM-qml
330-typeinfo plugin.qmltypes
331+typeinfo LightDM.qmltypes
332
333=== modified file 'plugins/Powerd/CMakeLists.txt'
334--- plugins/Powerd/CMakeLists.txt 2014-03-26 17:54:40 +0000
335+++ plugins/Powerd/CMakeLists.txt 2014-05-15 15:00:34 +0000
336@@ -1,4 +1,3 @@
337-include(Plugins)
338 include(FindPkgConfig)
339
340 pkg_search_module(GIO REQUIRED gio-2.0)
341@@ -17,5 +16,4 @@
342 qt5_use_modules(Powerd-qml DBus Qml)
343 target_link_libraries(Powerd-qml ${GIO_LDFLAGS})
344
345-export_qmlfiles(Powerd Powerd)
346-export_qmlplugin(Powerd 0.1 Powerd TARGETS Powerd-qml)
347+add_unity8_plugin(Powerd 0.1 Powerd TARGETS Powerd-qml)
348
349=== modified file 'plugins/Powerd/qmldir'
350--- plugins/Powerd/qmldir 2013-08-02 16:18:28 +0000
351+++ plugins/Powerd/qmldir 2014-05-15 15:00:34 +0000
352@@ -1,3 +1,3 @@
353 module Powerd
354 plugin Powerd-qml
355-typeinfo plugin.qmltypes
356+typeinfo Powerd.qmltypes
357
358=== modified file 'plugins/SessionBroadcast/CMakeLists.txt'
359--- plugins/SessionBroadcast/CMakeLists.txt 2013-09-12 17:58:21 +0000
360+++ plugins/SessionBroadcast/CMakeLists.txt 2014-05-15 15:00:34 +0000
361@@ -1,5 +1,3 @@
362-include(Plugins)
363-
364 add_definitions(-DSM_BUSNAME=systemBus)
365
366 add_library(SessionBroadcast-qml MODULE
367@@ -9,5 +7,4 @@
368
369 qt5_use_modules(SessionBroadcast-qml DBus Qml)
370
371-export_qmlfiles(SessionBroadcast SessionBroadcast)
372-export_qmlplugin(SessionBroadcast 0.1 SessionBroadcast TARGETS SessionBroadcast-qml)
373+add_unity8_plugin(SessionBroadcast 0.1 SessionBroadcast TARGETS SessionBroadcast-qml)
374
375=== modified file 'plugins/SessionBroadcast/qmldir'
376--- plugins/SessionBroadcast/qmldir 2013-09-12 17:58:21 +0000
377+++ plugins/SessionBroadcast/qmldir 2014-05-15 15:00:34 +0000
378@@ -1,3 +1,3 @@
379 module SessionBroadcast
380 plugin SessionBroadcast-qml
381-typeinfo plugin.qmltypes
382+typeinfo SessionBroadcast.qmltypes
383
384=== modified file 'plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt'
385--- plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt 2013-08-13 08:49:52 +0000
386+++ plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt 2014-05-15 15:00:34 +0000
387@@ -1,6 +1,3 @@
388-# export_qmlplugin macro
389-include(Plugins)
390-
391 include_directories(
392 ${CMAKE_CURRENT_SOURCE_DIR}
393 ${CMAKE_CURRENT_BINARY_DIR}
394@@ -17,6 +14,4 @@
395
396 qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
397
398-# export the qmldir qmltypes and plugin files
399-export_qmlfiles(Ubuntu.DownloadDaemonListener Ubuntu/DownloadDaemonListener)
400-export_qmlplugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
401+add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
402
403=== modified file 'plugins/Ubuntu/DownloadDaemonListener/qmldir'
404--- plugins/Ubuntu/DownloadDaemonListener/qmldir 2013-07-24 14:18:23 +0000
405+++ plugins/Ubuntu/DownloadDaemonListener/qmldir 2014-05-15 15:00:34 +0000
406@@ -1,3 +1,3 @@
407 module Ubuntu.DownloadDaemonListener
408 plugin DownloadDaemonListener
409-typeinfo plugins.qmltypes
410+typeinfo DownloadDaemonListener.qmltypes
411
412=== modified file 'plugins/Ubuntu/Gestures/CMakeLists.txt'
413--- plugins/Ubuntu/Gestures/CMakeLists.txt 2013-11-22 13:43:40 +0000
414+++ plugins/Ubuntu/Gestures/CMakeLists.txt 2014-05-15 15:00:34 +0000
415@@ -1,6 +1,3 @@
416-# export_qmlplugin macro
417-include(Plugins)
418-
419 set(UbuntuGestureQml_SOURCES
420 plugin.cpp
421 AxisVelocityCalculator.cpp
422@@ -19,6 +16,4 @@
423 # So that Foo.cpp can #include "Foo.moc"
424 include_directories(${CMAKE_CURRENT_BINARY_DIR})
425
426-# export the qmldir qmltypes and plugin files
427-export_qmlfiles(Ubuntu.Gestures Ubuntu/Gestures)
428-export_qmlplugin(Ubuntu.Gestures 0.1 Ubuntu/Gestures TARGETS UbuntuGestureQml)
429+add_unity8_plugin(Ubuntu.Gestures 0.1 Ubuntu/Gestures TARGETS UbuntuGestureQml)
430
431=== modified file 'plugins/Ubuntu/Gestures/qmldir'
432--- plugins/Ubuntu/Gestures/qmldir 2013-07-04 09:32:44 +0000
433+++ plugins/Ubuntu/Gestures/qmldir 2014-05-15 15:00:34 +0000
434@@ -1,3 +1,3 @@
435 module Ubuntu.Gestures
436 plugin UbuntuGestureQml
437-typeinfo plugin.qmltypes
438+typeinfo Gestures.qmltypes
439
440=== modified file 'plugins/Unity/Indicators/CMakeLists.txt'
441--- plugins/Unity/Indicators/CMakeLists.txt 2014-04-09 14:51:09 +0000
442+++ plugins/Unity/Indicators/CMakeLists.txt 2014-05-15 15:00:34 +0000
443@@ -1,6 +1,3 @@
444-# export_qmlplugin macro
445-include(Plugins)
446-
447 project(IndicatorsQml)
448
449 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
450@@ -10,8 +7,6 @@
451 find_package(Qt5Core REQUIRED)
452 find_package(Qt5Quick REQUIRED)
453
454-add_subdirectory(qml)
455-
456 include_directories(
457 ${CMAKE_CURRENT_SOURCE_DIR}
458 ${CMAKE_CURRENT_BINARY_DIR}
459@@ -56,5 +51,7 @@
460
461 qt5_use_modules(IndicatorsQml Core Qml Quick)
462
463-# export the qmltypes and plugin files
464-export_qmlplugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)
465+add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators
466+ SEARCH_PATH qml
467+ TARGETS IndicatorsQml
468+)
469
470=== removed file 'plugins/Unity/Indicators/qml/CMakeLists.txt'
471--- plugins/Unity/Indicators/qml/CMakeLists.txt 2013-07-08 15:12:28 +0000
472+++ plugins/Unity/Indicators/qml/CMakeLists.txt 1970-01-01 00:00:00 +0000
473@@ -1,5 +0,0 @@
474-# export_qmlplugin macro
475-include(Plugins)
476-
477-# export the qmldir, *.qml files.
478-export_qmlfiles(Unity.Indicators Unity/Indicators)
479
480=== modified file 'plugins/Unity/Indicators/qml/qmldir'
481--- plugins/Unity/Indicators/qml/qmldir 2013-12-18 09:44:19 +0000
482+++ plugins/Unity/Indicators/qml/qmldir 2014-05-15 15:00:34 +0000
483@@ -1,6 +1,6 @@
484 module Unity.Indicators
485 plugin IndicatorsQml
486-typeinfo plugin.qmltypes
487+typeinfo Indicators.qmltypes
488
489 CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
490 IndicatorBase 0.1 IndicatorBase.qml
491
492=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
493--- plugins/Unity/Launcher/CMakeLists.txt 2013-09-12 12:29:56 +0000
494+++ plugins/Unity/Launcher/CMakeLists.txt 2014-05-15 15:00:34 +0000
495@@ -32,6 +32,4 @@
496
497 qt5_use_modules(UnityLauncher-qml DBus Qml)
498
499-# export the qmldir and qmltypes files
500-export_qmlfiles(Unity.Launcher Unity/Launcher)
501-export_qmlplugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
502+add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
503
504=== modified file 'plugins/Unity/Launcher/qmldir'
505--- plugins/Unity/Launcher/qmldir 2013-07-16 08:32:38 +0000
506+++ plugins/Unity/Launcher/qmldir 2014-05-15 15:00:34 +0000
507@@ -1,3 +1,3 @@
508 module Unity.Launcher
509 plugin UnityLauncher-qml
510-typeinfo plugin.qmltypes
511+typeinfo Launcher.qmltypes
512
513=== modified file 'plugins/Utils/CMakeLists.txt'
514--- plugins/Utils/CMakeLists.txt 2014-05-07 08:27:59 +0000
515+++ plugins/Utils/CMakeLists.txt 2014-05-15 15:00:34 +0000
516@@ -33,6 +33,4 @@
517
518 qt5_use_modules(Utils-qml Qml Quick DBus Network XmlPatterns Gui Concurrent)
519
520-# export the qmldir qmltypes and plugin files
521-export_qmlfiles(Utils Utils)
522-export_qmlplugin(Utils 0.1 Utils TARGETS Utils-qml)
523+add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)
524
525=== modified file 'plugins/Utils/qmldir'
526--- plugins/Utils/qmldir 2013-07-04 09:32:44 +0000
527+++ plugins/Utils/qmldir 2014-05-15 15:00:34 +0000
528@@ -1,3 +1,3 @@
529 module Utils
530 plugin Utils-qml
531-typeinfo plugin.qmltypes
532+typeinfo Utils.qmltypes
533
534=== modified file 'tests/mocks/AccountsService/CMakeLists.txt'
535--- tests/mocks/AccountsService/CMakeLists.txt 2013-11-25 17:26:15 +0000
536+++ tests/mocks/AccountsService/CMakeLists.txt 2014-05-15 15:00:34 +0000
537@@ -7,15 +7,4 @@
538
539 qt5_use_modules(MockAccountsService-qml DBus Qml)
540
541-# copy files into build directory for shadow builds
542-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
543- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
544- )
545-
546-install(TARGETS MockAccountsService-qml
547- DESTINATION ${SHELL_INSTALL_QML}/mocks/AccountsService
548- )
549-
550-install(FILES qmldir
551- DESTINATION ${SHELL_INSTALL_QML}/mocks/AccountsService
552- )
553+add_unity8_mock(AccountsService 0.1 AccountsService TARGETS MockAccountsService-qml)
554
555=== modified file 'tests/mocks/AccountsService/qmldir'
556--- tests/mocks/AccountsService/qmldir 2013-08-12 19:08:02 +0000
557+++ tests/mocks/AccountsService/qmldir 2014-05-15 15:00:34 +0000
558@@ -1,2 +1,3 @@
559 module AccountsService
560 plugin MockAccountsService-qml
561+typeinfo AccountsService.qmltypes
562
563=== modified file 'tests/mocks/CMakeLists.txt'
564--- tests/mocks/CMakeLists.txt 2013-11-14 11:48:33 +0000
565+++ tests/mocks/CMakeLists.txt 2014-05-15 15:00:34 +0000
566@@ -1,3 +1,33 @@
567+include(QmlPlugins)
568+
569+# Set up and optionally install a mock plugin for unity8.
570+#
571+# add_unity8_mock(plugin version path
572+# [PREFIX string] # Install the plugin to the specified prefix under unity8 private plugin directory
573+# [...] # See export_qmlfiles and export_qmlplugin documentation for more options
574+# )
575+
576+macro(add_unity8_mock PLUGIN VERSION PATH)
577+ set(single PREFIX)
578+ cmake_parse_arguments(MOCK "" "${single}" "" ${ARGN})
579+
580+ if(MOCK_PREFIX)
581+ export_qmlfiles(${PLUGIN} ${PATH}
582+ DESTINATION ${SHELL_INSTALL_QML}/${MOCK_PREFIX}
583+ TARGET_PREFIX ${MOCK_PREFIX}-Mock
584+ ${MOCK_UNPARSED_ARGUMENTS}
585+ )
586+ export_qmlplugin(${PLUGIN} ${VERSION} ${PATH}
587+ DESTINATION ${SHELL_INSTALL_QML}/${MOCK_PREFIX}
588+ TARGET_PREFIX ${MOCK_PREFIX}-Mock
589+ ${MOCK_UNPARSED_ARGUMENTS}
590+ )
591+ else()
592+ export_qmlfiles(${PLUGIN} ${PATH} TARGET_PREFIX Mock ${MOCK_UNPARSED_ARGUMENTS})
593+ export_qmlplugin(${PLUGIN} ${VERSION} ${PATH} TARGET_PREFIX Mock ${MOCK_UNPARSED_ARGUMENTS})
594+ endif()
595+endmacro()
596+
597 add_subdirectory(AccountsService)
598 add_subdirectory(GSettings.1.0)
599 add_subdirectory(HudClient)
600
601=== modified file 'tests/mocks/GSettings.1.0/CMakeLists.txt'
602--- tests/mocks/GSettings.1.0/CMakeLists.txt 2013-08-14 11:18:24 +0000
603+++ tests/mocks/GSettings.1.0/CMakeLists.txt 2014-05-15 15:00:34 +0000
604@@ -17,7 +17,4 @@
605
606 qt5_use_modules(FakeGSettingsQml Qml)
607
608-# copy qmldir file into build directory for shadow builds
609-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
610- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
611- )
612+add_unity8_mock(GSettings 1.0 GSettings.1.0 TARGETS FakeGSettingsQml)
613
614=== modified file 'tests/mocks/GSettings.1.0/qmldir'
615--- tests/mocks/GSettings.1.0/qmldir 2013-08-12 13:05:38 +0000
616+++ tests/mocks/GSettings.1.0/qmldir 2014-05-15 15:00:34 +0000
617@@ -1,2 +1,3 @@
618 module GSettings
619 plugin FakeGSettingsQml
620+typeinfo GSettings.qmltypes
621
622=== modified file 'tests/mocks/HudClient/CMakeLists.txt'
623--- tests/mocks/HudClient/CMakeLists.txt 2013-08-13 09:10:59 +0000
624+++ tests/mocks/HudClient/CMakeLists.txt 2014-05-15 15:00:34 +0000
625@@ -35,7 +35,4 @@
626
627 qt5_use_modules(FakeHudClientQml Qml)
628
629-# copy qmldir file into build directory for shadow builds
630-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
631- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
632- )
633+add_unity8_mock(HudClient 0.1 HudClient TARGETS FakeHudClientQml)
634
635=== modified file 'tests/mocks/HudClient/qmldir'
636--- tests/mocks/HudClient/qmldir 2013-06-05 22:03:08 +0000
637+++ tests/mocks/HudClient/qmldir 2014-05-15 15:00:34 +0000
638@@ -1,1 +1,3 @@
639+module HudClient
640 plugin FakeHudClientQml
641+typeinfo HudClient.qmltypes
642
643=== modified file 'tests/mocks/LightDM/CMakeLists.txt'
644--- tests/mocks/LightDM/CMakeLists.txt 2014-01-14 21:01:28 +0000
645+++ tests/mocks/LightDM/CMakeLists.txt 2014-05-15 15:00:34 +0000
646@@ -43,15 +43,8 @@
647
648 qt5_use_modules(MockLightDM-qml DBus Gui Qml)
649
650-# copy qmldir file into build directory for shadow builds
651-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
652- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
653- )
654-
655-install(TARGETS MockLightDM-qml
656- DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM
657- )
658-
659-install(FILES qmldir
660- DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM
661- )
662+add_unity8_mock(LightDM 0.1 LightDM
663+ PREFIX mocks
664+ TARGETS MockLightDM-qml
665+ ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/full"
666+)
667
668=== modified file 'tests/mocks/LightDM/qmldir'
669--- tests/mocks/LightDM/qmldir 2013-06-05 22:03:08 +0000
670+++ tests/mocks/LightDM/qmldir 2014-05-15 15:00:34 +0000
671@@ -1,2 +1,3 @@
672 module LightDM
673 plugin MockLightDM-qml
674+typeinfo LightDM.qmltypes
675
676=== modified file 'tests/mocks/Powerd/CMakeLists.txt'
677--- tests/mocks/Powerd/CMakeLists.txt 2013-11-25 17:26:15 +0000
678+++ tests/mocks/Powerd/CMakeLists.txt 2014-05-15 15:00:34 +0000
679@@ -7,15 +7,4 @@
680
681 qt5_use_modules(MockPowerd-qml Qml)
682
683-# copy qmldir file into build directory for shadow builds
684-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
685- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
686- )
687-
688-install(TARGETS MockPowerd-qml
689- DESTINATION ${SHELL_INSTALL_QML}/mocks/Powerd
690- )
691-
692-install(FILES qmldir
693- DESTINATION ${SHELL_INSTALL_QML}/mocks/Powerd
694- )
695+add_unity8_mock(Powerd 0.1 Powerd TARGETS MockPowerd-qml)
696
697=== modified file 'tests/mocks/Powerd/qmldir'
698--- tests/mocks/Powerd/qmldir 2013-08-09 14:35:36 +0000
699+++ tests/mocks/Powerd/qmldir 2014-05-15 15:00:34 +0000
700@@ -1,2 +1,3 @@
701 module Powerd
702 plugin MockPowerd-qml
703+typeinfo Powerd.qmltypes
704
705=== modified file 'tests/mocks/QMenuModel/CMakeLists.txt'
706--- tests/mocks/QMenuModel/CMakeLists.txt 2013-10-11 17:16:52 +0000
707+++ tests/mocks/QMenuModel/CMakeLists.txt 2014-05-15 15:00:34 +0000
708@@ -1,15 +1,3 @@
709-file(GLOB QMLFILES
710- *.qml
711- *.js
712- qmldir
713-)
714-
715-# copy files into build directory for shadow builds
716-add_custom_target(QMenuModelQmlFiles ALL
717- COMMAND cp ${QMLFILES} ${CMAKE_CURRENT_BINARY_DIR}
718- DEPENDS ${QMLFILES}
719-)
720-
721 include_directories(
722 ${Qt5Core_INCLUDE_DIRS}
723 ${Qt5Quick_INCLUDE_DIRS}
724@@ -32,3 +20,5 @@
725 set_target_properties(QMenuModelQml PROPERTIES
726 OUTPUT_NAME qmenumodel
727 VERSION 0)
728+
729+add_unity8_mock(QMenuModel 0.1 QMenuModel TARGETS QMenuModelQml)
730
731=== modified file 'tests/mocks/QMenuModel/qmldir'
732--- tests/mocks/QMenuModel/qmldir 2013-10-14 09:39:13 +0000
733+++ tests/mocks/QMenuModel/qmldir 2014-05-15 15:00:34 +0000
734@@ -1,5 +1,6 @@
735 module QMenuModel
736 plugin qmenumodel
737+typeinfo QMenuModel.qmltypes
738
739 QDBusActionGroup 0.1 QDBusActionGroup.qml
740 UnityMenuAction 0.1 UnityMenuAction.qml
741
742=== modified file 'tests/mocks/QtMultimedia/CMakeLists.txt'
743--- tests/mocks/QtMultimedia/CMakeLists.txt 2013-11-27 11:27:19 +0000
744+++ tests/mocks/QtMultimedia/CMakeLists.txt 2014-05-15 15:00:34 +0000
745@@ -5,15 +5,4 @@
746
747 qt5_use_modules(QtMultimedia-qml Qml)
748
749-# copy qmldir file into build directory for shadow builds
750-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
751- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
752- )
753-
754-install(TARGETS QtMultimedia-qml
755- DESTINATION ${SHELL_INSTALL_QML}/mocks/QtMultimedia
756- )
757-
758-install(FILES qmldir
759- DESTINATION ${SHELL_INSTALL_QML}/mocks/QtMultimedia
760- )
761+add_unity8_mock(QtMultimedia 5.0 QtMultimedia TARGETS QtMultimedia-qml)
762
763=== modified file 'tests/mocks/QtMultimedia/qmldir'
764--- tests/mocks/QtMultimedia/qmldir 2013-11-14 11:48:33 +0000
765+++ tests/mocks/QtMultimedia/qmldir 2014-05-15 15:00:34 +0000
766@@ -1,2 +1,3 @@
767 module QtMultimedia
768 plugin QtMultimedia-qml
769+typeinfo QtMultimedia.qmltypes
770
771=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt'
772--- tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt 2013-11-25 17:26:15 +0000
773+++ tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt 2014-05-15 15:00:34 +0000
774@@ -7,12 +7,4 @@
775
776 qt5_use_modules(FakeUbuntuDownloadDaemonListenerQml Core Quick)
777
778-# copy files into build directory for shadow builds
779-add_custom_target(UbuntuDownloadQmlDirFile ALL
780- COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
781- DEPENDS qmldir
782-)
783-
784-install(TARGETS FakeUbuntuDownloadDaemonListenerQml
785- DESTINATION ${SHELL_INSTALL_QML}/mocks/Ubuntu/DownloadDaemonListener
786- )
787+add_unity8_mock(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS FakeUbuntuDownloadDaemonListenerQml)
788
789=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/qmldir'
790--- tests/mocks/Ubuntu/DownloadDaemonListener/qmldir 2013-08-05 14:52:55 +0000
791+++ tests/mocks/Ubuntu/DownloadDaemonListener/qmldir 2014-05-15 15:00:34 +0000
792@@ -1,2 +1,3 @@
793 module Ubuntu.DownloadDaemonListener
794 plugin FakeUbuntuDownloadDaemonListenerQml
795+typeinfo DownloadDaemonListener.qmltypes
796
797=== modified file 'tests/mocks/Ubuntu/Thumbnailer/CMakeLists.txt'
798--- tests/mocks/Ubuntu/Thumbnailer/CMakeLists.txt 2014-04-01 15:18:40 +0000
799+++ tests/mocks/Ubuntu/Thumbnailer/CMakeLists.txt 2014-05-15 15:00:34 +0000
800@@ -1,7 +1,1 @@
801-# copy files into build directory for shadow builds
802-add_custom_target(UbuntuThumbnailerQmlDirFile ALL
803- COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
804- DEPENDS qmldir
805-)
806-
807-install(FILES qmldir DESTINATION ${SHELL_INSTALL_QML}/mocks/Ubuntu/Thumbnailer)
808+add_unity8_mock(Ubuntu.Thumbnailer 0.1 Ubuntu/Thumbnailer)
809
810=== modified file 'tests/mocks/Ubuntu/Thumbnailer/qmldir'
811--- tests/mocks/Ubuntu/Thumbnailer/qmldir 2014-04-01 15:25:26 +0000
812+++ tests/mocks/Ubuntu/Thumbnailer/qmldir 2014-05-15 15:00:34 +0000
813@@ -1,2 +1,4 @@
814 module Ubuntu.Thumbnailer
815+typeinfo Thumbnailer.qmltypes
816+
817 Dummy 0.1 Dummy.qml
818
819=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
820--- tests/mocks/Unity/Application/CMakeLists.txt 2014-04-02 11:19:54 +0000
821+++ tests/mocks/Unity/Application/CMakeLists.txt 2014-05-15 15:00:34 +0000
822@@ -12,40 +12,14 @@
823
824 add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
825
826+add_library(NonMirUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
827+set_target_properties(NonMirUnityApplicationQml PROPERTIES OUTPUT_NAME FakeUnityApplicationQml)
828+
829 qt5_use_modules(FakeUnityApplicationQml Core Quick)
830-
831-# copy files into build directory for shadow builds
832-add_custom_target(UnityAppQmlDirFile ALL
833- COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
834- DEPENDS qmldir
835-)
836-add_custom_target(InputFilterAreaQmlFile ALL
837- COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/InputFilterArea.qml" ${CMAKE_CURRENT_BINARY_DIR}
838- DEPENDS InputFilterArea.qml
839-)
840-add_custom_target(OSKControllerQmlFile ALL
841- COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/OSKController.qml" ${CMAKE_CURRENT_BINARY_DIR}
842- DEPENDS OSKController.qml
843-)
844-
845-install(TARGETS FakeUnityApplicationQml
846- DESTINATION ${SHELL_INSTALL_QML}/mocks/Unity/Application
847- )
848-
849-install(FILES qmldir InputFilterArea.qml OSKController.qml
850- DESTINATION ${SHELL_INSTALL_QML}/mocks/Unity/Application
851- )
852-
853-# Duplicate the mock to nonmirplugins
854-# In shadow builds we just link it, in real installs we also install it to the other path
855-add_custom_target(OSKControllerQmlFile2 ALL
856- COMMAND mkdir -p ${CMAKE_BINARY_DIR}/nonmirplugins/Unity && rm -f ${CMAKE_BINARY_DIR}/nonmirplugins/Unity/Application && ln -s ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}/nonmirplugins/Unity
857- DEPENDS qmldir
858-)
859-install(TARGETS FakeUnityApplicationQml
860- DESTINATION ${SHELL_INSTALL_QML}/nonmirplugins/Unity/Application
861- )
862-
863-install(FILES qmldir InputFilterArea.qml OSKController.qml
864- DESTINATION ${SHELL_INSTALL_QML}/nonmirplugins/Unity/Application
865- )
866+qt5_use_modules(NonMirUnityApplicationQml Core Quick)
867+
868+add_unity8_mock(Unity.Application 0.1 Unity/Application PREFIX mocks TARGETS FakeUnityApplicationQml)
869+add_unity8_mock(Unity.Application 0.1 Unity/Application
870+ PREFIX nonmirplugins
871+ TARGETS NonMirUnityApplicationQml
872+ BINARY_DIR ${CMAKE_BINARY_DIR}/nonmirplugins)
873
874=== modified file 'tests/mocks/Unity/Application/qmldir'
875--- tests/mocks/Unity/Application/qmldir 2013-09-10 15:03:47 +0000
876+++ tests/mocks/Unity/Application/qmldir 2014-05-15 15:00:34 +0000
877@@ -1,4 +1,6 @@
878 module Unity.Application
879 plugin FakeUnityApplicationQml
880+typeinfo Application.qmltypes
881+
882 InputFilterArea 0.1 InputFilterArea.qml
883 OSKController 0.1 OSKController.qml
884
885=== modified file 'tests/mocks/Unity/CMakeLists.txt'
886--- tests/mocks/Unity/CMakeLists.txt 2014-02-25 15:43:42 +0000
887+++ tests/mocks/Unity/CMakeLists.txt 2014-05-15 15:00:34 +0000
888@@ -39,15 +39,4 @@
889
890 qt5_use_modules(FakeUnityQml Qml)
891
892-# copy qmldir file into build directory for shadow builds
893-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
894- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
895- )
896-
897-install(TARGETS FakeUnityQml
898- DESTINATION ${SHELL_INSTALL_QML}/scopefakes/Unity
899- )
900-
901-install(FILES qmldir
902- DESTINATION ${SHELL_INSTALL_QML}/scopefakes/Unity
903- )
904+add_unity8_mock(Unity 0.2 Unity PREFIX scopefakes TARGETS FakeUnityQml)
905
906=== modified file 'tests/mocks/Unity/Indicators/CMakeLists.txt'
907--- tests/mocks/Unity/Indicators/CMakeLists.txt 2014-03-03 11:55:00 +0000
908+++ tests/mocks/Unity/Indicators/CMakeLists.txt 2014-05-15 15:00:34 +0000
909@@ -37,17 +37,4 @@
910
911 qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
912
913-file(GLOB IndicatorsFake_QMLFILES
914- *.qml
915- qml/FakeMenuPage.qml
916-)
917-
918-# copy qmldir file into build directory for shadow builds
919-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
920- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
921-)
922-
923-# copy qmldir file into build directory for shadow builds
924-file(COPY ${IndicatorsFake_QMLFILES}
925- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
926-)
927+add_unity8_mock(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsFakeQml)
928
929=== renamed file 'tests/mocks/Unity/Indicators/qml/FakeMenuPage.qml' => 'tests/mocks/Unity/Indicators/FakeMenuPage.qml'
930=== modified file 'tests/mocks/Unity/Indicators/qmldir'
931--- tests/mocks/Unity/Indicators/qmldir 2013-12-13 11:18:03 +0000
932+++ tests/mocks/Unity/Indicators/qmldir 2014-05-15 15:00:34 +0000
933@@ -1,5 +1,6 @@
934 module Unity.Indicators
935 plugin IndicatorsFakeQml
936+typeinfo Indicators.qmltypes
937
938 CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
939 IndicatorBase 0.1 IndicatorBase.qml
940
941=== modified file 'tests/mocks/Unity/Launcher/CMakeLists.txt'
942--- tests/mocks/Unity/Launcher/CMakeLists.txt 2013-12-13 01:02:53 +0000
943+++ tests/mocks/Unity/Launcher/CMakeLists.txt 2014-05-15 15:00:34 +0000
944@@ -20,8 +20,4 @@
945
946 qt5_use_modules(MockLauncherPlugin Core Quick)
947
948-# copy files into build directory for shadow builds
949-add_custom_target(LauncherPluginQmlDirFile ALL
950- COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
951- DEPENDS qmldir
952-)
953+add_unity8_mock(Unity.Launcher 0.1 Unity/Launcher TARGETS MockLauncherPlugin)
954
955=== modified file 'tests/mocks/Unity/Launcher/qmldir'
956--- tests/mocks/Unity/Launcher/qmldir 2013-07-05 11:25:54 +0000
957+++ tests/mocks/Unity/Launcher/qmldir 2014-05-15 15:00:34 +0000
958@@ -1,2 +1,3 @@
959 module Unity.Launcher
960 plugin MockLauncherPlugin
961+typeinfo Launcher.qmltypes
962
963=== modified file 'tests/mocks/Unity/Notifications/CMakeLists.txt'
964--- tests/mocks/Unity/Notifications/CMakeLists.txt 2013-07-26 11:10:55 +0000
965+++ tests/mocks/Unity/Notifications/CMakeLists.txt 2014-05-15 15:00:34 +0000
966@@ -1,11 +1,1 @@
967-file(GLOB QMLFILES
968- *.qml
969- *.js
970- qmldir
971-)
972-
973-# copy files into build directory for shadow builds
974-add_custom_target(NotificationsQmlFiles ALL
975- COMMAND cp ${QMLFILES} ${CMAKE_CURRENT_BINARY_DIR}
976- DEPENDS ${QMLFILES}
977-)
978+add_unity8_mock(Unity.Notifications 1.0 Unity/Notifications)
979
980=== modified file 'tests/mocks/Unity/Notifications/qmldir'
981--- tests/mocks/Unity/Notifications/qmldir 2013-06-19 08:12:15 +0000
982+++ tests/mocks/Unity/Notifications/qmldir 2014-05-15 15:00:34 +0000
983@@ -1,2 +1,3 @@
984 module Unity.Notifications
985 Notification 1.0 notification.js
986+typeinfo Notifications.qmltypes
987
988=== modified file 'tests/mocks/Unity/qmldir'
989--- tests/mocks/Unity/qmldir 2013-06-05 22:03:08 +0000
990+++ tests/mocks/Unity/qmldir 2014-05-15 15:00:34 +0000
991@@ -1,2 +1,3 @@
992 module Unity
993 plugin FakeUnityQml
994+typeinfo Unity.qmltypes
995
996=== modified file 'tests/utils/modules/Unity/Test/CMakeLists.txt'
997--- tests/utils/modules/Unity/Test/CMakeLists.txt 2013-12-17 14:56:25 +0000
998+++ tests/utils/modules/Unity/Test/CMakeLists.txt 2014-05-15 15:00:34 +0000
999@@ -1,3 +1,5 @@
1000+include(QmlPlugins)
1001+
1002 add_definitions(-DQT_NO_KEYWORDS)
1003
1004 include_directories(
1005@@ -14,10 +16,5 @@
1006
1007 qt5_use_modules(UnityTestQml Core Quick Test)
1008
1009-# copy qml files into build directory for shadow builds
1010-file(GLOB QML_JS_FILES *.js *.qml qmldir)
1011-
1012-add_custom_target(UnityTestQmlJsFiles ALL
1013- COMMAND cp ${QML_JS_FILES} ${CMAKE_CURRENT_BINARY_DIR}
1014- DEPENDS ${QML_JS_FILES}
1015-)
1016+export_qmlfiles(Unity.Test Unity/Test)
1017+export_qmlplugin(Unity.Test 0.1 Unity/Test TARGETS UnityTestQml)
1018
1019=== modified file 'tests/utils/modules/Unity/Test/qmldir'
1020--- tests/utils/modules/Unity/Test/qmldir 2013-06-05 22:03:08 +0000
1021+++ tests/utils/modules/Unity/Test/qmldir 2014-05-15 15:00:34 +0000
1022@@ -1,3 +1,5 @@
1023 module Unity.Test
1024 plugin UnityTestQml
1025+typeinfo Test.qmltypes
1026+
1027 UnityTestCase 0.1 UnityTestCase.qml

Subscribers

People subscribed via source and target branches