Review Request 117617: New syntax for ecm_install_icons()

Kevin Ottens ervin at kde.org
Thu Apr 24 22:22:18 UTC 2014


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/117617/#review56432
-----------------------------------------------------------

Ship it!


Ship It!

- Kevin Ottens


On April 17, 2014, 7:40 p.m., Alex Merry wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/117617/
> -----------------------------------------------------------
> 
> (Updated April 17, 2014, 7:40 p.m.)
> 
> 
> Review request for Build System, Extra Cmake Modules and KDE Frameworks.
> 
> 
> Repository: extra-cmake-modules
> 
> 
> Description
> -------
> 
> Apologies for the slightly ridiculous changeset. The unit tests involve lots of (mostly identical) files.
> 
> 
> New syntax for ecm_install_icons()
> 
> This requires the icon files to be specified (which is better than
> globbing, because the build system will then be able to tell when files
> are added or removed and re-run CMake).
> 
> It also removes the theme name from the filename pattern: the old code
> used a shorthand theme name for a small number of themes, and didn't
> allow any other themes. Extending this to arbitrary themes could cause
> problems with themes that have numbers or hyphens (or whatever other
> delimiter character was used) in their names. Most users are likely to
> just want to install to a single theme anyway (based on a random
> sampling of users of kde4_install_icons), so that is what the new syntax
> requires.
> 
> The old syntax still works and behaves as before.
> 
> ecm_update_iconcache is renamed to _ecm_update_iconcache - it was never
> documented as public API anyway.
> 
> 
> Diffs
> -----
> 
>   modules/ECMInstallIcons.cmake d83003bac633d14ec538af539c3b414992c5f8e4 
>   tests/CMakeLists.txt e464a0305bd71364463c3132103ffe02dcb94eb6 
>   tests/ECMInstallIconsTest/128-devices-drive-removable-media-usb-pendrive.png PRE-CREATION 
>   tests/ECMInstallIconsTest/128-emblems-emblem-mounted.png PRE-CREATION 
>   tests/ECMInstallIconsTest/128-places-home.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/16-actions-badext.txt PRE-CREATION 
>   tests/ECMInstallIconsTest/16-actions-computer.png PRE-CREATION 
>   tests/ECMInstallIconsTest/16-animations-loading.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/16-apps-cmake.png PRE-CREATION 
>   tests/ECMInstallIconsTest/16-categories-system-help.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/16-emotes-face-smile.png PRE-CREATION 
>   tests/ECMInstallIconsTest/16-intl-something.png PRE-CREATION 
>   tests/ECMInstallIconsTest/16-status-user-online.png PRE-CREATION 
>   tests/ECMInstallIconsTest/CMakeLists.txt PRE-CREATION 
>   tests/ECMInstallIconsTest/aa-actions-badsize.png PRE-CREATION 
>   tests/ECMInstallIconsTest/badlynamedfile.png PRE-CREATION 
>   tests/ECMInstallIconsTest/check_tree.cmake.in PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/badly-named-files-test/hicolor/16x16/actions/badext.txt PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/128x128/devices/l10n/en_US/drive-removable-media-usb-pendrive.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/128x128/emblems/l10n/en_US/emblem-mounted.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/128x128/places/l10n/en_US/home.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/16x16/actions/l10n/en_US/computer.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/16x16/animations/l10n/en_US/loading.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/16x16/apps/l10n/en_US/cmake.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/16x16/categories/l10n/en_US/system-help.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/16x16/emotes/l10n/en_US/face-smile.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/16x16/intl/l10n/en_US/something.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/16x16/status/l10n/en_US/user-online.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/lang-test/hicolor/scalable/mimetypes/l10n/en_US/fonts-package.svgz PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/128x128/devices/drive-removable-media-usb-pendrive.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/128x128/emblems/emblem-mounted.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/128x128/places/home.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/16x16/actions/computer.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/16x16/animations/loading.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/16x16/apps/cmake.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/16x16/categories/system-help.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/16x16/emotes/face-smile.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/16x16/intl/something.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/16x16/status/user-online.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/multi-file-test/hicolor/scalable/mimetypes/fonts-package.svgz PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/single-file-test/hicolor/16x16/actions/computer.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/devices/l10n/en_US/drive-removable-media-usb-pendrive.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/emblems/l10n/en_US/emblem-mounted.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/128x128/places/l10n/en_US/home.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/actions/l10n/en_US/computer.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/animations/l10n/en_US/loading.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/apps/l10n/en_US/cmake.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/categories/l10n/en_US/system-help.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/emotes/l10n/en_US/face-smile.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/intl/l10n/en_US/something.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/16x16/status/l10n/en_US/user-online.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-lang-test/oxygen/scalable/mimetypes/l10n/en_US/fonts-package.svgz PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/128x128/devices/drive-removable-media-usb-pendrive.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/128x128/emblems/emblem-mounted.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/128x128/places/home.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/16x16/actions/computer.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/16x16/animations/loading.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/16x16/apps/cmake.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/16x16/categories/system-help.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/16x16/emotes/face-smile.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/16x16/intl/something.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/16x16/status/user-online.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/themed-test/theme-name-2/scalable/mimetypes/fonts-package.svgz PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/crystalsvg/128x128/emblems/emblem-mounted.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/crystalsvg/128x128/emblems/l10n/en_US/emblem-mounted.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/128x128/devices/drive-removable-media-usb-pendrive.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/128x128/places/home.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/128x128/places/l10n/en_US/home.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/16x16/actions/computer.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/16x16/actions/l10n/en_US/computer.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/16x16/animations/loading.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/16x16/apps/cmake.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/16x16/emotes/face-smile.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/16x16/intl/something.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/hicolor/16x16/status/user-online.png PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/locolor/scalable/mimetypes/fonts-package.svgz PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/locolor/scalable/mimetypes/l10n/en_US/fonts-package.svgz PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/oxygen/16x16/categories/l10n/en_US/system-help.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/expected-tree/v1-icons/oxygen/16x16/categories/system-help.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/sc-mimetypes-fonts-package.svgz PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax-l10n/CMakeLists.txt PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax-l10n/cr128-emblems-emblem-mounted.png PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax-l10n/hi128-places-home.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax-l10n/hi16-actions-computer.png PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax-l10n/losc-mimetypes-fonts-package.svgz PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax-l10n/ox16-categories-system-help.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/CMakeLists.txt PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/cr128-emblems-emblem-mounted.png PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/hi128-devices-drive-removable-media-usb-pendrive.png PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/hi128-places-home.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/hi16-actions-computer.png PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/hi16-animations-loading.mng PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/hi16-apps-cmake.png PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/hi16-emotes-face-smile.png PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/hi16-intl-something.png PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/hi16-status-user-online.png PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/losc-mimetypes-fonts-package.svgz PRE-CREATION 
>   tests/ECMInstallIconsTest/v1-syntax/ox16-categories-system-help.mng PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/117617/diff/
> 
> 
> Testing
> -------
> 
> Tests (included as part of commit) pass.
> 
> 
> Thanks,
> 
> Alex Merry
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-buildsystem/attachments/20140424/5bf816a9/attachment-0001.html>


More information about the Kde-buildsystem mailing list