From 6cd9b2ba256a5e6c63100bfbd8ef9903976eaccd Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Mon, 15 Jul 2019 16:12:38 +0200 Subject: [PATCH] Install KPackages with kpackage_install_package Summary: Removes a bunch of boilerplate CMake code and allows kpackage to do some smart things, e.g. drops our runtime dependency on the DesktopFileParser and we get to just use json directly. Test Plan: Ran kwin, now it doesn't use the desktop to json translation path, everything still works. Reviewers: #kwin, zzag Reviewed By: #kwin, zzag Subscribers: davidedmundson, zzag, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D22474 --- effects/CMakeLists.txt | 30 +++++++++---------- effects/dialogparent/CMakeLists.txt | 1 - effects/dialogparent/package/CMakeLists.txt | 8 ----- effects/dimscreen/CMakeLists.txt | 1 - effects/dimscreen/package/CMakeLists.txt | 12 -------- effects/eyeonscreen/CMakeLists.txt | 1 - effects/eyeonscreen/package/CMakeLists.txt | 8 ----- effects/fadingpopups/CMakeLists.txt | 1 - effects/fadingpopups/package/CMakeLists.txt | 12 -------- effects/frozenapp/CMakeLists.txt | 1 - effects/frozenapp/package/CMakeLists.txt | 8 ----- effects/login/CMakeLists.txt | 1 - effects/login/package/CMakeLists.txt | 8 ----- effects/logout/CMakeLists.txt | 1 - effects/logout/package/CMakeLists.txt | 8 ----- effects/maximize/CMakeLists.txt | 1 - effects/maximize/package/CMakeLists.txt | 8 ----- effects/morphingpopups/CMakeLists.txt | 1 - effects/morphingpopups/package/CMakeLists.txt | 9 ------ effects/scale/CMakeLists.txt | 1 - effects/scale/package/CMakeLists.txt | 11 ------- effects/squash/CMakeLists.txt | 1 - effects/squash/package/CMakeLists.txt | 11 ------- effects/translucency/CMakeLists.txt | 1 - effects/translucency/package/CMakeLists.txt | 8 ----- effects/windowaperture/CMakeLists.txt | 1 - effects/windowaperture/package/CMakeLists.txt | 9 ------ scripts/CMakeLists.txt | 15 +++------- 28 files changed, 19 insertions(+), 159 deletions(-) delete mode 100644 effects/dialogparent/CMakeLists.txt delete mode 100644 effects/dialogparent/package/CMakeLists.txt delete mode 100644 effects/dimscreen/CMakeLists.txt delete mode 100644 effects/dimscreen/package/CMakeLists.txt delete mode 100644 effects/eyeonscreen/CMakeLists.txt delete mode 100644 effects/eyeonscreen/package/CMakeLists.txt delete mode 100644 effects/fadingpopups/CMakeLists.txt delete mode 100644 effects/fadingpopups/package/CMakeLists.txt delete mode 100644 effects/frozenapp/CMakeLists.txt delete mode 100644 effects/frozenapp/package/CMakeLists.txt delete mode 100644 effects/login/CMakeLists.txt delete mode 100644 effects/login/package/CMakeLists.txt delete mode 100644 effects/logout/CMakeLists.txt delete mode 100644 effects/logout/package/CMakeLists.txt delete mode 100644 effects/maximize/CMakeLists.txt delete mode 100644 effects/maximize/package/CMakeLists.txt delete mode 100644 effects/morphingpopups/CMakeLists.txt delete mode 100644 effects/morphingpopups/package/CMakeLists.txt delete mode 100644 effects/scale/CMakeLists.txt delete mode 100644 effects/scale/package/CMakeLists.txt delete mode 100644 effects/squash/CMakeLists.txt delete mode 100644 effects/squash/package/CMakeLists.txt delete mode 100644 effects/translucency/CMakeLists.txt delete mode 100644 effects/translucency/package/CMakeLists.txt delete mode 100644 effects/windowaperture/CMakeLists.txt delete mode 100644 effects/windowaperture/package/CMakeLists.txt diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index 1f5ff2d0d0..fe814d9f13 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -131,21 +131,21 @@ kconfig_add_kcfg_files(kwin4_effect_builtins_sources ) # scripted effects -add_subdirectory( dialogparent ) -add_subdirectory( dimscreen ) -add_subdirectory( eyeonscreen ) -add_subdirectory( fade ) -add_subdirectory( fadedesktop ) -add_subdirectory( fadingpopups ) -add_subdirectory( frozenapp ) -add_subdirectory( login ) -add_subdirectory( logout ) -add_subdirectory( maximize ) -add_subdirectory( morphingpopups ) -add_subdirectory( scale ) -add_subdirectory( squash ) -add_subdirectory( translucency ) -add_subdirectory( windowaperture ) +kpackage_install_package(dialogparent/package kwin4_effect_dialogparent effects kwin) +kpackage_install_package(dimscreen/package kwin4_effect_dimscreen effects kwin) +kpackage_install_package(eyeonscreen/package kwin4_effect_eyeonscreen effects kwin) +kpackage_install_package(fade/package kwin4_effect_fade effects kwin) +kpackage_install_package(fadedesktop/package kwin4_effect_fadedesktop effects kwin) +kpackage_install_package(fadingpopups/package kwin4_effect_fadingpopups effects kwin) +kpackage_install_package(frozenapp/package kwin4_effect_frozenapp effects kwin) +kpackage_install_package(login/package kwin4_effect_login effects kwin) +kpackage_install_package(logout/package kwin4_effect_logout effects kwin) +kpackage_install_package(maximize/package kwin4_effect_maximize effects kwin) +kpackage_install_package(morphingpopups/package kwin4_effect_morphingpopups effects kwin) +kpackage_install_package(scale/package kwin4_effect_scale effects kwin) +kpackage_install_package(squash/package kwin4_effect_squash effects kwin) +kpackage_install_package(translucency/package kwin4_effect_translucency effects kwin) +kpackage_install_package(windowaperture/package kwin4_effect_windowaperture effects kwin) ############################################################################### # Built-in effects go here diff --git a/effects/dialogparent/CMakeLists.txt b/effects/dialogparent/CMakeLists.txt deleted file mode 100644 index 1242620d48..0000000000 --- a/effects/dialogparent/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(package) diff --git a/effects/dialogparent/package/CMakeLists.txt b/effects/dialogparent/package/CMakeLists.txt deleted file mode 100644 index a993129857..0000000000 --- a/effects/dialogparent/package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -install(DIRECTORY contents DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_dialogparent) -install(FILES metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_dialogparent) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_dialogparent.desktop) - -file(COPY contents metadata.desktop DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_dialogparent) diff --git a/effects/dimscreen/CMakeLists.txt b/effects/dimscreen/CMakeLists.txt deleted file mode 100644 index 1242620d48..0000000000 --- a/effects/dimscreen/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(package) diff --git a/effects/dimscreen/package/CMakeLists.txt b/effects/dimscreen/package/CMakeLists.txt deleted file mode 100644 index f94606a65c..0000000000 --- a/effects/dimscreen/package/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_dimscreen) - -install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_dimscreen) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_dimscreen.desktop) - -file(COPY contents metadata.desktop - DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_dimscreen) diff --git a/effects/eyeonscreen/CMakeLists.txt b/effects/eyeonscreen/CMakeLists.txt deleted file mode 100644 index 28f40b3371..0000000000 --- a/effects/eyeonscreen/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory( package ) diff --git a/effects/eyeonscreen/package/CMakeLists.txt b/effects/eyeonscreen/package/CMakeLists.txt deleted file mode 100644 index 7c7f0c92ef..0000000000 --- a/effects/eyeonscreen/package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -install(DIRECTORY contents DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_eyeonscreen) -install(FILES metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_eyeonscreen) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_eyeonscreen.desktop) - -file(COPY contents metadata.desktop DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_eyeonscreen) diff --git a/effects/fadingpopups/CMakeLists.txt b/effects/fadingpopups/CMakeLists.txt deleted file mode 100644 index 1242620d48..0000000000 --- a/effects/fadingpopups/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(package) diff --git a/effects/fadingpopups/package/CMakeLists.txt b/effects/fadingpopups/package/CMakeLists.txt deleted file mode 100644 index 5ec9fcc9a2..0000000000 --- a/effects/fadingpopups/package/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_fadingpopups) - -install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_fadingpopups) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_fadingpopups.desktop) - -file(COPY contents metadata.desktop - DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_fadingpopups) diff --git a/effects/frozenapp/CMakeLists.txt b/effects/frozenapp/CMakeLists.txt deleted file mode 100644 index 1242620d48..0000000000 --- a/effects/frozenapp/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(package) diff --git a/effects/frozenapp/package/CMakeLists.txt b/effects/frozenapp/package/CMakeLists.txt deleted file mode 100644 index 7ea3aea3f1..0000000000 --- a/effects/frozenapp/package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -install(DIRECTORY contents DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_frozenapp) -install(FILES metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_frozenapp) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_frozenapp.desktop) - -file(COPY contents metadata.desktop DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_frozenapp) diff --git a/effects/login/CMakeLists.txt b/effects/login/CMakeLists.txt deleted file mode 100644 index 1242620d48..0000000000 --- a/effects/login/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(package) diff --git a/effects/login/package/CMakeLists.txt b/effects/login/package/CMakeLists.txt deleted file mode 100644 index 82c816931e..0000000000 --- a/effects/login/package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -install(DIRECTORY contents DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_login) -install(FILES metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_login) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_login.desktop) - -file(COPY contents metadata.desktop DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_login) diff --git a/effects/logout/CMakeLists.txt b/effects/logout/CMakeLists.txt deleted file mode 100644 index 1242620d48..0000000000 --- a/effects/logout/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(package) diff --git a/effects/logout/package/CMakeLists.txt b/effects/logout/package/CMakeLists.txt deleted file mode 100644 index c44afa779f..0000000000 --- a/effects/logout/package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -install(DIRECTORY contents DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_logout) -install(FILES metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_logout) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_logout.desktop) - -file(COPY contents metadata.desktop DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_logout) diff --git a/effects/maximize/CMakeLists.txt b/effects/maximize/CMakeLists.txt deleted file mode 100644 index 28f40b3371..0000000000 --- a/effects/maximize/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory( package ) diff --git a/effects/maximize/package/CMakeLists.txt b/effects/maximize/package/CMakeLists.txt deleted file mode 100644 index 72b4513033..0000000000 --- a/effects/maximize/package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -install(DIRECTORY contents DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_maximize) -install(FILES metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_maximize) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_maximize.desktop) - -file(COPY contents metadata.desktop DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_maximize) diff --git a/effects/morphingpopups/CMakeLists.txt b/effects/morphingpopups/CMakeLists.txt deleted file mode 100644 index 28f40b3371..0000000000 --- a/effects/morphingpopups/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory( package ) diff --git a/effects/morphingpopups/package/CMakeLists.txt b/effects/morphingpopups/package/CMakeLists.txt deleted file mode 100644 index c0cf23748d..0000000000 --- a/effects/morphingpopups/package/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -install(DIRECTORY contents DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_morphingpopups) -install(FILES metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_morphingpopups) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_morphingpopups.desktop) - -file(COPY contents metadata.desktop - DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_morphingpopups) diff --git a/effects/scale/CMakeLists.txt b/effects/scale/CMakeLists.txt deleted file mode 100644 index 1242620d48..0000000000 --- a/effects/scale/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(package) diff --git a/effects/scale/package/CMakeLists.txt b/effects/scale/package/CMakeLists.txt deleted file mode 100644 index 5ea8bcc3e5..0000000000 --- a/effects/scale/package/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_scale) - -install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_scale) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_scale.desktop) - -file(COPY contents metadata.desktop DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_scale) diff --git a/effects/squash/CMakeLists.txt b/effects/squash/CMakeLists.txt deleted file mode 100644 index 1242620d48..0000000000 --- a/effects/squash/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(package) diff --git a/effects/squash/package/CMakeLists.txt b/effects/squash/package/CMakeLists.txt deleted file mode 100644 index 50dbe59859..0000000000 --- a/effects/squash/package/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -install(DIRECTORY contents - DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_squash) - -install(FILES metadata.desktop - DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_squash) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_squash.desktop) - -file(COPY contents metadata.desktop DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_squash) diff --git a/effects/translucency/CMakeLists.txt b/effects/translucency/CMakeLists.txt deleted file mode 100644 index 1242620d48..0000000000 --- a/effects/translucency/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(package) diff --git a/effects/translucency/package/CMakeLists.txt b/effects/translucency/package/CMakeLists.txt deleted file mode 100644 index 4dbf1533b0..0000000000 --- a/effects/translucency/package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -install(DIRECTORY contents DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_translucency) -install(FILES metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_translucency) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_translucency.desktop) - -file(COPY contents metadata.desktop DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_translucency) diff --git a/effects/windowaperture/CMakeLists.txt b/effects/windowaperture/CMakeLists.txt deleted file mode 100644 index 28f40b3371..0000000000 --- a/effects/windowaperture/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory( package ) diff --git a/effects/windowaperture/package/CMakeLists.txt b/effects/windowaperture/package/CMakeLists.txt deleted file mode 100644 index 42a0117063..0000000000 --- a/effects/windowaperture/package/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -install(DIRECTORY contents DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_windowaperture) -install(FILES metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_windowaperture) - -install(FILES metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} - RENAME kwin4_effect_windowaperture.desktop) - -file(COPY contents metadata.desktop - DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_windowaperture) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 3f7cf0d9c1..87e585fee4 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -1,11 +1,4 @@ -# packages -install( DIRECTORY videowall DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/scripts ) -install( DIRECTORY synchronizeskipswitcher DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/scripts ) -install( DIRECTORY desktopchangeosd DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/scripts ) -install( DIRECTORY minimizeall DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/scripts ) - -# service files -install( FILES videowall/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME kwin-script-videowall.desktop ) -install( FILES synchronizeskipswitcher/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME kwin-script-synchronizeskipswitcher.desktop ) -install( FILES desktopchangeosd/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME kwin-script-desktopchangeosd.desktop ) -install( FILES minimizeall/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME kwin-script-minimizeall.desktop ) +kpackage_install_package(videowall videowall scripts kwin) +kpackage_install_package(synchronizeskipswitcher synchronizeskipswitcher scripts kwin) +kpackage_install_package(desktopchangeosd desktopchangeosd scripts kwin) +kpackage_install_package(minimizeall minimizeall scripts kwin)