Unity 8

Merge lp:~nick-dedekind/unity8/plugins.qmltypes into lp:unity8

plugins.qmltypes
Merge into trunk

Proposed by Nick Dedekind on 2013-07-02

Status:	Merged
Approved by:	Daniel d'Andrada on 2013-07-08
Approved revision:	76
Merged at revision:	86
Proposed branch:	lp:~nick-dedekind/unity8/plugins.qmltypes
Merge into:	lp:unity8
Diff against target:	268 lines (+81/-73) 13 files modified cmake/modules/Plugins.cmake (+48/-0) plugins/HudClient/CMakeLists.txt (+5/-12) plugins/HudClient/qmldir (+1/-0) plugins/LightDM/CMakeLists.txt (+5/-12) plugins/LightDM/qmldir (+1/-0) plugins/ListViewWithPageHeader/CMakeLists.txt (+5/-12) plugins/ListViewWithPageHeader/qmldir (+1/-0) plugins/Ubuntu/Gestures/CMakeLists.txt (+5/-13) plugins/Ubuntu/Gestures/qmldir (+1/-0) plugins/Unity/CMakeLists.txt (+5/-12) plugins/Unity/qmldir (+1/-0) plugins/Utils/CMakeLists.txt (+2/-12) plugins/Utils/qmldir (+1/-0)
To merge this branch:	bzr merge lp:~nick-dedekind/unity8/plugins.qmltypes
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel d'Andrada (community)			Approve on 2013-07-08
PS Jenkins bot (community)	continuous-integration		Approve on 2013-07-08
Michael Zanetti (community)			Needs Fixing on 2013-07-04
Michał Sawicz		2013-07-02	Needs Fixing on 2013-07-02
Review via email: mp+172517@code.launchpad.net

Commit message

Added plugin cmake procedure for qmltypes files.

Description of the change

Added plugin cmake procedure for qmltypes files.

lp:~nick-dedekind/unity8/plugins.qmltypes updated on 2013-07-02

69. By Nick Dedekind on 2013-07-02: added eof new lines.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-02:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-02:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-07-02:

cd /tmp/buildd/unity8-7.81.3/obj-x86_64-linux-gnu/plugins/Ubuntu/Gestures && qmlplugindump -notrelocatable Ubuntu.Gestures 0.1 /tmp/buildd/unity8-7.81.3/obj-x86_64-linux-gnu/plugins > /tmp/buildd/unity8-7.81.3/obj-x86_64-linux-gnu/plugins/Ubuntu/Gestures/UbuntuGestures.qmltypes
QFontDatabase: Cannot find font directory '/usr/lib/x86_64-linux-gnu/fonts' - is Qt installed correctly?
QFontDatabase: Cannot find font directory '/usr/lib/x86_64-linux-gnu/fonts' - is Qt installed correctly?
QFontDatabase: Cannot find font directory '/usr/lib/x86_64-linux-gnu/fonts' - is Qt installed correctly?
QFontDatabase: Cannot find font directory '/usr/lib/x86_64-linux-gnu/fonts' - is Qt installed correctly?
QQmlComponent: Component is not ready
"file:///tmp/buildd/unity8-7.81.3/obj-x86_64-linux-gnu/plugins/typelist.qml:2:1: module "Ubuntu.Gestures" is not installed"

Looks like you need to export QML2_IMPORT_PATH for this.

review: Needs Fixing

lp:~nick-dedekind/unity8/plugins.qmltypes updated on 2013-07-03

70. By Nick Dedekind on 2013-07-03: Use targets for qmldir. Added dep to qmldir target for qmltypes target
71. By Nick Dedekind on 2013-07-03: merged with trunk

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2013-07-03:

> cd /tmp/buildd/unity8-7.81.3/obj-x86_64-linux-gnu/plugins/Ubuntu/Gestures &&
> qmlplugindump -notrelocatable Ubuntu.Gestures 0.1 /tmp/buildd/unity8-7.81.3
> /obj-x86_64-linux-gnu/plugins > /tmp/buildd/unity8-7.81.3/obj-x86_64-linux-
> gnu/plugins/Ubuntu/Gestures/UbuntuGestures.qmltypes
> QFontDatabase: Cannot find font directory '/usr/lib/x86_64-linux-gnu/fonts' -
> is Qt installed correctly?
> QFontDatabase: Cannot find font directory '/usr/lib/x86_64-linux-gnu/fonts' -
> is Qt installed correctly?
> QFontDatabase: Cannot find font directory '/usr/lib/x86_64-linux-gnu/fonts' -
> is Qt installed correctly?
> QFontDatabase: Cannot find font directory '/usr/lib/x86_64-linux-gnu/fonts' -
> is Qt installed correctly?
> QQmlComponent: Component is not ready
> "file:///tmp/buildd/unity8-7.81.3/obj-x86_64-linux-
> gnu/plugins/typelist.qml:2:1: module "Ubuntu.Gestures" is not installed"
>
> Looks like you need to export QML2_IMPORT_PATH for this.

Was a dependency issue. qmltype was being created before there was a qmldir in the build folder. I've changed the plugins to use a custom target for the qmldir (+other files if needed) and added a dep to that target.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-03:

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

review: Approve (continuous-integration)

lp:~nick-dedekind/unity8/plugins.qmltypes updated on 2013-07-04

72. By Nick Dedekind on 2013-07-04: Use macro for exporting a plugin.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-04:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-07-04:

Conflicting with latest trunk.

review: Needs Fixing

lp:~nick-dedekind/unity8/plugins.qmltypes updated on 2013-07-04

73. By Nick Dedekind on 2013-07-04: merged with trunk
74. By Nick Dedekind on 2013-07-04: fixed up some plugin paths

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-04:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-07-05:

cmake/modules/Plugins.cmake, lines 3-6:

  # add_qml_test(plugin version plugin_export sub_path [DEPENDS target1 [target2 ...]])
  #
  # plugin_export folder where plugin will be found (plugins/modules/imports)
  # TARGETS additional install targets (eg the plugin shared object)

Have to update this documentation.

Other than that, it looks good!

review: Needs Fixing

lp:~nick-dedekind/unity8/plugins.qmltypes updated on 2013-07-05

75. By Nick Dedekind on 2013-07-05: update Plugins.cmake documentation

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-05:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-05:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-05:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-07-05:

7 +# add_qml_test(plugin version sub_path [TARGETS target1 [target2 ...]])
8 +#
9 +# TARGETS additional install targets (eg the plugin shared object)
10 +#
11 +# Two targets will be created:
12 +# - PluginName-qmlfiles - Copies the qml files (*.qml, *.js, qmldir) into the shadow build folder.
13 +# - PluginName-qmltypes - Generates the qmltypes file in the shadow build folder.

Almost there. The name of the macro is "export_qmlplugin", not "add_qml_test". :)
Secondly, on line 7 you call the variable "plugin", but on lines 12 and 13 you call it "PluginName". Be consistent to avoid confusing the reader.

review: Needs Fixing

lp:~nick-dedekind/unity8/plugins.qmltypes updated on 2013-07-08

76. By Nick Dedekind on 2013-07-08: fixed inconsistent documentation.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-08:

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

review: Approve (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2013-07-08:

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Nick Dedekind

Unity Team

 === added file 'cmake/modules/Plugins.cmake'
 --- cmake/modules/Plugins.cmake	1970-01-01 00:00:00 +0000
 +++ cmake/modules/Plugins.cmake	2013-07-08 08:22:27 +0000
@@ -0,0 +1,48 @@
++# Creates targets for copying and installing qmlfiles and generating the qmltypes file for a plugin
++#
++# export_qmlplugin(plugin version sub_path [TARGETS target1 [target2 ...]])
++#
++# TARGETS additional install targets (eg the plugin shared object)
++#
++# Two targets will be created:
++#   - plugin-qmlfiles - Copies the qml files (*.qml, *.js, qmldir) into the shadow build folder.
++#   - plugin-qmltypes - Generates the qmltypes file in the shadow build folder.
++
++
++macro(export_qmlplugin PLUGIN VERSION PLUGIN_SUBPATH)
++    set(multi_value_keywords TARGETS)
++    cmake_parse_arguments(qmlplugin "" "" "${multi_value_keywords}" ${ARGN})
++
++    file(GLOB QMLFILES
++        *.qml
++        *.js
++        qmldir
++    )
++
++    # copy the qmldir file
++    add_custom_target(${PLUGIN}-qmlfiles ALL
++                        COMMAND cp ${QMLFILES} ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}
++                        DEPENDS ${QMLFILES}
++    )
++
++    # create the plugin.qmltypes file
++    add_custom_target(${PLUGIN}-qmltypes ALL
++        COMMAND qmlplugindump -notrelocatable ${PLUGIN} ${VERSION} ${CMAKE_BINARY_DIR}/plugins > ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
++    )
++    add_dependencies(${PLUGIN}-qmltypes ${PLUGIN}-qmlfiles ${qmlplugin_TARGETS})
++
++    # install the qmldir file.
++    install(FILES ${QMLFILES}
++        DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}
++    )
++
++    # install the qmltypes file.
++    install(FILES ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
++        DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}
++    )
++
++    # install the additional targets
++    install(TARGETS ${qmlplugin_TARGETS}
++        DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/${PLUGIN_SUBPATH}
++    )
++endmacro(export_qmlplugin)
 \ No newline at end of file
 === modified file 'plugins/HudClient/CMakeLists.txt'
 --- plugins/HudClient/CMakeLists.txt	2013-06-26 09:52:31 +0000
 +++ plugins/HudClient/CMakeLists.txt	2013-07-08 08:22:27 +0000
@@ -1,3 +1,6 @@
++# export_qmlplugin macro
++include(Plugins)
++
  find_package(Qt5Core REQUIRED)
  find_package(Qt5Quick REQUIRED)
  pkg_search_module(DEE dee-1.0 REQUIRED)
@@ -35,15 +38,5 @@
  qt5_use_modules(HudClientQml Qml)
--# copy qmldir file into build directory for shadow builds
--file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
--    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
--    )
--
--install(TARGETS HudClientQml
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/HudClient
--    )
--
--install(FILES qmldir
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/HudClient
--    )
++# export the qmldir and qmltypes files
++export_qmlplugin(HudClient 0.1 HudClient TARGETS HudClientQml)
 === modified file 'plugins/HudClient/qmldir'
 --- plugins/HudClient/qmldir	2013-06-05 22:03:08 +0000
 +++ plugins/HudClient/qmldir	2013-07-08 08:22:27 +0000
@@ -1,1 +1,2 @@
  plugin HudClientQml
++typeinfo plugin.qmltypes
 === modified file 'plugins/LightDM/CMakeLists.txt'
 --- plugins/LightDM/CMakeLists.txt	2013-07-03 12:11:19 +0000
 +++ plugins/LightDM/CMakeLists.txt	2013-07-08 08:22:27 +0000
@@ -1,3 +1,6 @@
++# export_qmlplugin macro
++include(Plugins)
++
  # Dependencies
  include(FindPkgConfig)
  pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
@@ -32,15 +35,5 @@
  qt5_use_modules(LightDM-qml Gui Qml)
--# copy qmldir file into build directory for shadow builds
--file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
--    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
--    )
--
--install(TARGETS LightDM-qml
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/LightDM
--    )
--
--install(FILES qmldir
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/LightDM
--    )
++# export the qmldir and qmltypes files
++export_qmlplugin(LightDM 0.1 LightDM TARGETS LightDM-qml)
 === modified file 'plugins/LightDM/qmldir'
 --- plugins/LightDM/qmldir	2013-06-05 22:03:08 +0000
 +++ plugins/LightDM/qmldir	2013-07-08 08:22:27 +0000
@@ -1,2 +1,3 @@
  module LightDM
  plugin LightDM-qml
++typeinfo plugin.qmltypes
 === modified file 'plugins/ListViewWithPageHeader/CMakeLists.txt'
 --- plugins/ListViewWithPageHeader/CMakeLists.txt	2013-07-02 17:36:12 +0000
 +++ plugins/ListViewWithPageHeader/CMakeLists.txt	2013-07-08 08:22:27 +0000
@@ -1,3 +1,6 @@
++# export_qmlplugin macro
++include(Plugins)
++
  # There's no cmake var for v8 include path :-/
  # so create one
  LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
@@ -30,15 +33,5 @@
  qt5_use_modules(ListViewWithPageHeader-qml Qml Quick)
--# copy qmldir file into build directory for shadow builds
--file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
--    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
--    )
--
--install(TARGETS ListViewWithPageHeader-qml
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/ListViewWithPageHeader
--    )
--
--install(FILES qmldir
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/ListViewWithPageHeader
--    )
++# export the qmldir and qmltypes files
++export_qmlplugin(ListViewWithPageHeader 0.1 ListViewWithPageHeader TARGETS ListViewWithPageHeader-qml)
 === modified file 'plugins/ListViewWithPageHeader/qmldir'
 --- plugins/ListViewWithPageHeader/qmldir	2013-06-07 13:52:42 +0000
 +++ plugins/ListViewWithPageHeader/qmldir	2013-07-08 08:22:27 +0000
@@ -1,2 +1,3 @@
  module ListViewWithPageHeader
  plugin ListViewWithPageHeader-qml
++typeinfo plugin.qmltypes
 === modified file 'plugins/Ubuntu/Gestures/CMakeLists.txt'
 --- plugins/Ubuntu/Gestures/CMakeLists.txt	2013-06-26 09:52:31 +0000
 +++ plugins/Ubuntu/Gestures/CMakeLists.txt	2013-07-08 08:22:27 +0000
@@ -1,3 +1,6 @@
++# export_qmlplugin macro
++include(Plugins)
++
  set(CMAKE_AUTOMOC ON)
  include(FindPkgConfig)
@@ -20,16 +23,5 @@
  # So that Foo.cpp can #include "Foo.moc"
  include_directories(${CMAKE_CURRENT_BINARY_DIR})
--# copy files into build directory for shadow builds
--add_custom_target(UbuntuGestureQmlDirFile ALL
--    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
--    DEPENDS qmldir
--)
--
--install(TARGETS UbuntuGestureQml
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Ubuntu/Gestures
--    )
--
--install(FILES qmldir
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Ubuntu/Gestures
--    )
++# export the qmldir and qmltypes files
++export_qmlplugin(Ubuntu.Gestures 0.1 Ubuntu/Gestures TARGETS UbuntuGestureQml)
 === modified file 'plugins/Ubuntu/Gestures/qmldir'
 --- plugins/Ubuntu/Gestures/qmldir	2013-06-05 22:03:08 +0000
 +++ plugins/Ubuntu/Gestures/qmldir	2013-07-08 08:22:27 +0000
@@ -1,2 +1,3 @@
  module Ubuntu.Gestures
  plugin UbuntuGestureQml
++typeinfo plugin.qmltypes
 === modified file 'plugins/Unity/CMakeLists.txt'
 --- plugins/Unity/CMakeLists.txt	2013-07-04 10:34:48 +0000
 +++ plugins/Unity/CMakeLists.txt	2013-07-08 08:22:27 +0000
@@ -1,3 +1,6 @@
++# export_qmlplugin macro
++include(Plugins)
++
  # Dependencies
  include(FindPkgConfig)
  pkg_check_modules(QTDEE REQUIRED libdee-qt5)
@@ -43,15 +46,5 @@
  qt5_use_modules(Unity-qml Qml)
--# copy qmldir file into build directory for shadow builds
--file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
--    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
--    )
--
--install(TARGETS Unity-qml
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity
--    )
--
--install(FILES qmldir
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Unity
--    )
++# export the qmldir and qmltypes files
++export_qmlplugin(Unity 0.1 Unity TARGETS Unity-qml)
 === modified file 'plugins/Unity/qmldir'
 --- plugins/Unity/qmldir	2013-06-05 22:03:08 +0000
 +++ plugins/Unity/qmldir	2013-07-08 08:22:27 +0000
@@ -1,2 +1,3 @@
  module Unity
  plugin Unity-qml
++typeinfo plugin.qmltypes
 === modified file 'plugins/Utils/CMakeLists.txt'
 --- plugins/Utils/CMakeLists.txt	2013-06-26 09:52:31 +0000
 +++ plugins/Utils/CMakeLists.txt	2013-07-08 08:22:27 +0000
@@ -22,15 +22,5 @@
  qt5_use_modules(Utils-qml Qml Quick)
--# copy qmldir file into build directory for shadow builds
--file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
--    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
--    )
--
--install(TARGETS Utils-qml
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Utils
--    )
--
--install(FILES qmldir
--    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/Utils
--    )
++# export the qmldir and qmltypes files
++export_qmlplugin(Utils 0.1 Utils TARGETS Utils-qml)
 === modified file 'plugins/Utils/qmldir'
 --- plugins/Utils/qmldir	2013-06-05 22:03:08 +0000
 +++ plugins/Utils/qmldir	2013-07-08 08:22:27 +0000
@@ -1,2 +1,3 @@
  module Utils
  plugin Utils-qml
++typeinfo plugin.qmltypes