From a76b28bd726519ac8020b43bf865045686a1712d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 6 Sep 2018 16:29:26 +0200 Subject: [PATCH] data: Move D-Bus interface descriptions into a subdir We'll soon move the inlined XML of all interfaces we export or consume into separate files. That's a significant increase from the interfaces for which we install documentation, so it makes sense to use a dedicated subdir. https://gitlab.gnome.org/GNOME/gnome-shell/issues/537 --- data/dbus-interfaces/meson.build | 8 ++++++++ data/{ => dbus-interfaces}/org.gnome.Shell.PadOsd.xml | 0 .../org.gnome.Shell.Screencast.xml | 0 .../org.gnome.Shell.Screenshot.xml | 0 .../org.gnome.ShellSearchProvider.xml | 0 .../org.gnome.ShellSearchProvider2.xml | 0 data/meson.build | 11 +---------- 7 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 data/dbus-interfaces/meson.build rename data/{ => dbus-interfaces}/org.gnome.Shell.PadOsd.xml (100%) rename data/{ => dbus-interfaces}/org.gnome.Shell.Screencast.xml (100%) rename data/{ => dbus-interfaces}/org.gnome.Shell.Screenshot.xml (100%) rename data/{ => dbus-interfaces}/org.gnome.ShellSearchProvider.xml (100%) rename data/{ => dbus-interfaces}/org.gnome.ShellSearchProvider2.xml (100%) diff --git a/data/dbus-interfaces/meson.build b/data/dbus-interfaces/meson.build new file mode 100644 index 000000000..0de8ae30a --- /dev/null +++ b/data/dbus-interfaces/meson.build @@ -0,0 +1,8 @@ +dbus_interfaces = [ + 'org.gnome.Shell.PadOsd.xml', + 'org.gnome.Shell.Screencast.xml', + 'org.gnome.Shell.Screenshot.xml', + 'org.gnome.ShellSearchProvider.xml', + 'org.gnome.ShellSearchProvider2.xml' +] +install_data(dbus_interfaces, install_dir: ifacedir) diff --git a/data/org.gnome.Shell.PadOsd.xml b/data/dbus-interfaces/org.gnome.Shell.PadOsd.xml similarity index 100% rename from data/org.gnome.Shell.PadOsd.xml rename to data/dbus-interfaces/org.gnome.Shell.PadOsd.xml diff --git a/data/org.gnome.Shell.Screencast.xml b/data/dbus-interfaces/org.gnome.Shell.Screencast.xml similarity index 100% rename from data/org.gnome.Shell.Screencast.xml rename to data/dbus-interfaces/org.gnome.Shell.Screencast.xml diff --git a/data/org.gnome.Shell.Screenshot.xml b/data/dbus-interfaces/org.gnome.Shell.Screenshot.xml similarity index 100% rename from data/org.gnome.Shell.Screenshot.xml rename to data/dbus-interfaces/org.gnome.Shell.Screenshot.xml diff --git a/data/org.gnome.ShellSearchProvider.xml b/data/dbus-interfaces/org.gnome.ShellSearchProvider.xml similarity index 100% rename from data/org.gnome.ShellSearchProvider.xml rename to data/dbus-interfaces/org.gnome.ShellSearchProvider.xml diff --git a/data/org.gnome.ShellSearchProvider2.xml b/data/dbus-interfaces/org.gnome.ShellSearchProvider2.xml similarity index 100% rename from data/org.gnome.ShellSearchProvider2.xml rename to data/dbus-interfaces/org.gnome.ShellSearchProvider2.xml diff --git a/data/meson.build b/data/meson.build index 68e3ab81f..e0b879cd1 100644 --- a/data/meson.build +++ b/data/meson.build @@ -41,16 +41,7 @@ foreach service_file : service_files endforeach -dbus_interfaces = [ - 'org.gnome.Shell.PadOsd.xml', - 'org.gnome.Shell.Screencast.xml', - 'org.gnome.Shell.Screenshot.xml', - 'org.gnome.ShellSearchProvider.xml', - 'org.gnome.ShellSearchProvider2.xml' -] -install_data(dbus_interfaces, install_dir: ifacedir) - - +subdir('dbus-interfaces') subdir('theme') theme_resources = gnome.compile_resources(