From b106579d0ffe288a7cab446726d5c1c042a1576e Mon Sep 17 00:00:00 2001 From: Vlad Zagorodniy Date: Sat, 2 Feb 2019 21:47:46 +0200 Subject: [PATCH] Move package structure plugins to plugins dir Summary: Package structure plugins are not that special so move them to the corresponding directory. Test Plan: Compiles. Reviewers: #kwin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D18685 --- CMakeLists.txt | 1 - plugins/CMakeLists.txt | 1 + {packageplugins => plugins/kpackage}/CMakeLists.txt | 0 {packageplugins => plugins/kpackage}/aurorae/CMakeLists.txt | 0 {packageplugins => plugins/kpackage}/aurorae/aurorae.cpp | 0 {packageplugins => plugins/kpackage}/aurorae/aurorae.h | 0 .../kpackage}/aurorae/kwin-packagestructure-aurorae.desktop | 0 {packageplugins => plugins/kpackage}/decoration/CMakeLists.txt | 0 {packageplugins => plugins/kpackage}/decoration/decoration.cpp | 0 {packageplugins => plugins/kpackage}/decoration/decoration.h | 0 .../decoration/kwin-packagestructure-decoration.desktop | 0 {packageplugins => plugins/kpackage}/effect/CMakeLists.txt | 0 {packageplugins => plugins/kpackage}/effect/effect.cpp | 0 {packageplugins => plugins/kpackage}/effect/effect.h | 0 .../kpackage}/effect/kwin-packagestructure-effect.desktop | 0 {packageplugins => plugins/kpackage}/scripts/CMakeLists.txt | 0 .../kpackage}/scripts/kwin-packagestructure-scripts.desktop | 0 {packageplugins => plugins/kpackage}/scripts/scripts.cpp | 0 {packageplugins => plugins/kpackage}/scripts/scripts.h | 0 .../kpackage}/windowswitcher/CMakeLists.txt | 0 .../windowswitcher/kwin-packagestructure-windowswitcher.desktop | 0 .../kpackage}/windowswitcher/windowswitcher.cpp | 0 .../kpackage}/windowswitcher/windowswitcher.h | 0 23 files changed, 1 insertion(+), 1 deletion(-) rename {packageplugins => plugins/kpackage}/CMakeLists.txt (100%) rename {packageplugins => plugins/kpackage}/aurorae/CMakeLists.txt (100%) rename {packageplugins => plugins/kpackage}/aurorae/aurorae.cpp (100%) rename {packageplugins => plugins/kpackage}/aurorae/aurorae.h (100%) rename {packageplugins => plugins/kpackage}/aurorae/kwin-packagestructure-aurorae.desktop (100%) rename {packageplugins => plugins/kpackage}/decoration/CMakeLists.txt (100%) rename {packageplugins => plugins/kpackage}/decoration/decoration.cpp (100%) rename {packageplugins => plugins/kpackage}/decoration/decoration.h (100%) rename {packageplugins => plugins/kpackage}/decoration/kwin-packagestructure-decoration.desktop (100%) rename {packageplugins => plugins/kpackage}/effect/CMakeLists.txt (100%) rename {packageplugins => plugins/kpackage}/effect/effect.cpp (100%) rename {packageplugins => plugins/kpackage}/effect/effect.h (100%) rename {packageplugins => plugins/kpackage}/effect/kwin-packagestructure-effect.desktop (100%) rename {packageplugins => plugins/kpackage}/scripts/CMakeLists.txt (100%) rename {packageplugins => plugins/kpackage}/scripts/kwin-packagestructure-scripts.desktop (100%) rename {packageplugins => plugins/kpackage}/scripts/scripts.cpp (100%) rename {packageplugins => plugins/kpackage}/scripts/scripts.h (100%) rename {packageplugins => plugins/kpackage}/windowswitcher/CMakeLists.txt (100%) rename {packageplugins => plugins/kpackage}/windowswitcher/kwin-packagestructure-windowswitcher.desktop (100%) rename {packageplugins => plugins/kpackage}/windowswitcher/windowswitcher.cpp (100%) rename {packageplugins => plugins/kpackage}/windowswitcher/windowswitcher.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec780a9d50..3f966d1892 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -723,7 +723,6 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kwin_export.h DESTINATION ${INCLUDE_I install( FILES scripting/kwinscript.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) add_subdirectory(qml) -add_subdirectory(packageplugins) if (BUILD_TESTING) add_subdirectory(autotests) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 98b66cb35a..1624fb2b97 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -4,6 +4,7 @@ add_subdirectory(idletime) add_subdirectory(platforms) add_subdirectory(scenes) add_subdirectory(windowsystem) +add_subdirectory(kpackage) if(KWIN_BUILD_DECORATIONS) add_subdirectory(kdecorations) diff --git a/packageplugins/CMakeLists.txt b/plugins/kpackage/CMakeLists.txt similarity index 100% rename from packageplugins/CMakeLists.txt rename to plugins/kpackage/CMakeLists.txt diff --git a/packageplugins/aurorae/CMakeLists.txt b/plugins/kpackage/aurorae/CMakeLists.txt similarity index 100% rename from packageplugins/aurorae/CMakeLists.txt rename to plugins/kpackage/aurorae/CMakeLists.txt diff --git a/packageplugins/aurorae/aurorae.cpp b/plugins/kpackage/aurorae/aurorae.cpp similarity index 100% rename from packageplugins/aurorae/aurorae.cpp rename to plugins/kpackage/aurorae/aurorae.cpp diff --git a/packageplugins/aurorae/aurorae.h b/plugins/kpackage/aurorae/aurorae.h similarity index 100% rename from packageplugins/aurorae/aurorae.h rename to plugins/kpackage/aurorae/aurorae.h diff --git a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.desktop similarity index 100% rename from packageplugins/aurorae/kwin-packagestructure-aurorae.desktop rename to plugins/kpackage/aurorae/kwin-packagestructure-aurorae.desktop diff --git a/packageplugins/decoration/CMakeLists.txt b/plugins/kpackage/decoration/CMakeLists.txt similarity index 100% rename from packageplugins/decoration/CMakeLists.txt rename to plugins/kpackage/decoration/CMakeLists.txt diff --git a/packageplugins/decoration/decoration.cpp b/plugins/kpackage/decoration/decoration.cpp similarity index 100% rename from packageplugins/decoration/decoration.cpp rename to plugins/kpackage/decoration/decoration.cpp diff --git a/packageplugins/decoration/decoration.h b/plugins/kpackage/decoration/decoration.h similarity index 100% rename from packageplugins/decoration/decoration.h rename to plugins/kpackage/decoration/decoration.h diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/plugins/kpackage/decoration/kwin-packagestructure-decoration.desktop similarity index 100% rename from packageplugins/decoration/kwin-packagestructure-decoration.desktop rename to plugins/kpackage/decoration/kwin-packagestructure-decoration.desktop diff --git a/packageplugins/effect/CMakeLists.txt b/plugins/kpackage/effect/CMakeLists.txt similarity index 100% rename from packageplugins/effect/CMakeLists.txt rename to plugins/kpackage/effect/CMakeLists.txt diff --git a/packageplugins/effect/effect.cpp b/plugins/kpackage/effect/effect.cpp similarity index 100% rename from packageplugins/effect/effect.cpp rename to plugins/kpackage/effect/effect.cpp diff --git a/packageplugins/effect/effect.h b/plugins/kpackage/effect/effect.h similarity index 100% rename from packageplugins/effect/effect.h rename to plugins/kpackage/effect/effect.h diff --git a/packageplugins/effect/kwin-packagestructure-effect.desktop b/plugins/kpackage/effect/kwin-packagestructure-effect.desktop similarity index 100% rename from packageplugins/effect/kwin-packagestructure-effect.desktop rename to plugins/kpackage/effect/kwin-packagestructure-effect.desktop diff --git a/packageplugins/scripts/CMakeLists.txt b/plugins/kpackage/scripts/CMakeLists.txt similarity index 100% rename from packageplugins/scripts/CMakeLists.txt rename to plugins/kpackage/scripts/CMakeLists.txt diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/plugins/kpackage/scripts/kwin-packagestructure-scripts.desktop similarity index 100% rename from packageplugins/scripts/kwin-packagestructure-scripts.desktop rename to plugins/kpackage/scripts/kwin-packagestructure-scripts.desktop diff --git a/packageplugins/scripts/scripts.cpp b/plugins/kpackage/scripts/scripts.cpp similarity index 100% rename from packageplugins/scripts/scripts.cpp rename to plugins/kpackage/scripts/scripts.cpp diff --git a/packageplugins/scripts/scripts.h b/plugins/kpackage/scripts/scripts.h similarity index 100% rename from packageplugins/scripts/scripts.h rename to plugins/kpackage/scripts/scripts.h diff --git a/packageplugins/windowswitcher/CMakeLists.txt b/plugins/kpackage/windowswitcher/CMakeLists.txt similarity index 100% rename from packageplugins/windowswitcher/CMakeLists.txt rename to plugins/kpackage/windowswitcher/CMakeLists.txt diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.desktop similarity index 100% rename from packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop rename to plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.desktop diff --git a/packageplugins/windowswitcher/windowswitcher.cpp b/plugins/kpackage/windowswitcher/windowswitcher.cpp similarity index 100% rename from packageplugins/windowswitcher/windowswitcher.cpp rename to plugins/kpackage/windowswitcher/windowswitcher.cpp diff --git a/packageplugins/windowswitcher/windowswitcher.h b/plugins/kpackage/windowswitcher/windowswitcher.h similarity index 100% rename from packageplugins/windowswitcher/windowswitcher.h rename to plugins/kpackage/windowswitcher/windowswitcher.h