[tracker/data-in-binary-dirs: 5/8] data: Moved data/dbus/* to their respective src directories
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/data-in-binary-dirs: 5/8] data: Moved data/dbus/* to their respective src directories
- Date: Thu, 25 Sep 2014 17:16:27 +0000 (UTC)
commit c36ee1e78bb8050648dec048008c187ce58a4929
Author: Martyn Russell <martyn lanedo com>
Date: Thu Sep 25 16:53:41 2014 +0100
data: Moved data/dbus/* to their respective src directories
This way, we keep DBus service and XML config data WITH the process or binary
that it belongs to, keeping all sources grouped together.
configure.ac | 1 -
data/Makefile.am | 2 +-
data/dbus/.gitignore | 1 -
data/dbus/Makefile.am | 61 -----------
data/dbus/tracker-miner-web.xml | 113 --------------------
src/libtracker-miner/Makefile.am | 6 +
.../libtracker-miner}/tracker-miner.xml | 0
src/miners/apps/.gitignore | 1 +
src/miners/apps/Makefile.am | 13 ++-
...edesktop.Tracker1.Miner.Applications.service.in | 0
src/miners/fs/.gitignore | 1 +
src/miners/fs/Makefile.am | 16 +++-
...org.freedesktop.Tracker1.Miner.Files.service.in | 0
.../miners/fs}/tracker-miner-files-index.xml | 0
src/miners/rss/.gitignore | 1 +
src/miners/rss/Makefile.am | 13 ++-
.../org.freedesktop.Tracker1.Miner.RSS.service.in | 0
src/miners/user-guides/.gitignore | 1 +
src/miners/user-guides/Makefile.am | 13 ++-
...reedesktop.Tracker1.Miner.Userguides.service.in | 0
src/plugins/evolution/.gitignore | 1 +
src/plugins/evolution/Makefile.am | 24 +++--
...rg.freedesktop.Tracker1.Miner.EMails.service.in | 0
src/tracker-extract/.gitignore | 2 +-
src/tracker-extract/Makefile.am | 22 +++-
...g.freedesktop.Tracker1.Miner.Extract.service.in | 0
.../tracker-extract}/tracker-extract-priority.xml | 0
.../tracker-extract}/tracker-extract.xml | 0
src/tracker-store/.gitignore | 1 +
src/tracker-store/Makefile.am | 20 +++-
.../org.freedesktop.Tracker1.service.in | 0
.../dbus => src/tracker-store}/tracker-backup.xml | 0
.../tracker-store}/tracker-resources.xml | 0
.../tracker-store}/tracker-statistics.xml | 0
.../dbus => src/tracker-store}/tracker-status.xml | 0
src/tracker-writeback/.gitignore | 1 +
src/tracker-writeback/Makefile.am | 16 +++
.../org.freedesktop.Tracker1.Writeback.service.in | 0
.../tracker-writeback}/tracker-writeback.xml | 0
39 files changed, 131 insertions(+), 199 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 552141b..fc6afe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2556,7 +2556,6 @@ AM_CONDITIONAL(HAVE_ARTWORK, test "x$have_artwork" = "xyes")
##################################################################
AC_CONFIG_FILES([
- data/dbus/Makefile
data/gschemas/Makefile
data/languages/Makefile
data/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index e9d74cb..aa3f18c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = dbus languages miners gschemas
+SUBDIRS = languages miners gschemas
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 222df57..d9c7c8d 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -196,3 +196,9 @@ build-vapi: TrackerMiner-$(TRACKER_API_VERSION).gir
@vapigen --library tracker-miner --metadatadir $(top_srcdir) --pkg gio-2.0 --vapidir
$(top_builddir)/src/libtracker-sparql --pkg tracker-sparql-$(TRACKER_API_VERSION)
TrackerMiner-$(TRACKER_API_VERSION).gir
endif
+
+# DBus interfaces (XML files)
+configdir = $(datadir)/tracker
+config_DATA = tracker-miner.xml
+
+EXTRA_DIST += $(config_DATA)
diff --git a/data/dbus/tracker-miner.xml b/src/libtracker-miner/tracker-miner.xml
similarity index 100%
rename from data/dbus/tracker-miner.xml
rename to src/libtracker-miner/tracker-miner.xml
diff --git a/src/miners/apps/.gitignore b/src/miners/apps/.gitignore
index ecce41d..2d014f8 100644
--- a/src/miners/apps/.gitignore
+++ b/src/miners/apps/.gitignore
@@ -1 +1,2 @@
tracker-miner-apps
+*.service
diff --git a/src/miners/apps/Makefile.am b/src/miners/apps/Makefile.am
index 18f0c3c..9c69381 100644
--- a/src/miners/apps/Makefile.am
+++ b/src/miners/apps/Makefile.am
@@ -21,6 +21,15 @@ tracker_miner_apps_LDADD = \
$(BUILD_LIBS) \
$(TRACKER_MINER_APPS_LIBS)
+# DBus interfaces (XML files) and services
+service_in_files = org.freedesktop.Tracker1.Miner.Applications.service.in
+
+%.service: %.service.in
+ @sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Applications.service
+
# Desktop files: First we fix the VERSION and libexecdir
tracker-miner-apps.desktop.in: tracker-miner-apps.desktop.in.in
@sed -e "s|@libexecdir[ ]|${libexecdir}|" \
@@ -34,5 +43,5 @@ autostart_DATA = tracker-miner-apps.desktop
@INTLTOOL_DESKTOP_RULE@
-CLEANFILES = $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST = $(desktop_in_in_files)
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST = $(desktop_in_in_files) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Applications.service.in
b/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in
similarity index 100%
rename from data/dbus/org.freedesktop.Tracker1.Miner.Applications.service.in
rename to src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in
diff --git a/src/miners/fs/.gitignore b/src/miners/fs/.gitignore
index 175a9f5..064ac11 100644
--- a/src/miners/fs/.gitignore
+++ b/src/miners/fs/.gitignore
@@ -1 +1,2 @@
tracker-miner-fs
+*.service
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index 0787525..495d724 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -50,6 +50,18 @@ tracker_miner_fs_LDADD = \
$(BUILD_LIBS) \
$(TRACKER_MINER_FS_LIBS)
+# DBus interfaces (XML files) and services
+configdir = $(datadir)/tracker
+config_DATA = tracker-miner-files-index.xml
+
+service_in_files = org.freedesktop.Tracker1.Miner.Files.service.in
+
+%.service: %.service.in
+ @sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Files.service
+
# Desktop files: First we fix the VERSION and libexecdir
if HAVE_LIBMEDIAART
requires="libmediaart-1.0"
@@ -69,5 +81,5 @@ autostart_DATA = tracker-miner-fs.desktop
@INTLTOOL_DESKTOP_RULE@
-CLEANFILES = $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST = $(desktop_in_in_files)
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST = $(desktop_in_in_files) $(config_DATA) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Files.service.in
b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
similarity index 100%
rename from data/dbus/org.freedesktop.Tracker1.Miner.Files.service.in
rename to src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
diff --git a/data/dbus/tracker-miner-files-index.xml b/src/miners/fs/tracker-miner-files-index.xml
similarity index 100%
rename from data/dbus/tracker-miner-files-index.xml
rename to src/miners/fs/tracker-miner-files-index.xml
diff --git a/src/miners/rss/.gitignore b/src/miners/rss/.gitignore
index 2cf77a7..62c2dec 100644
--- a/src/miners/rss/.gitignore
+++ b/src/miners/rss/.gitignore
@@ -1 +1,2 @@
tracker-miner-rss
+*.service
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index fc94c38..3555649 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -21,6 +21,15 @@ tracker_miner_rss_LDADD = \
$(BUILD_LIBS) \
$(TRACKER_MINER_RSS_LIBS)
+# DBus interfaces (XML files) and services
+service_in_files = org.freedesktop.Tracker1.Miner.RSS.service.in
+
+%.service: %.service.in
+ @sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.RSS.service
+
# Desktop files: First we fix the VERSION and libexecdir
tracker-miner-rss.desktop.in: tracker-miner-rss.desktop.in.in
@sed -e "s|@libexecdir[ ]|${libexecdir}|" \
@@ -34,5 +43,5 @@ autostart_DATA = tracker-miner-rss.desktop
@INTLTOOL_DESKTOP_RULE@
-CLEANFILES = $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST = $(desktop_in_in_files)
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST = $(desktop_in_in_files) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.RSS.service.in
b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in
similarity index 100%
rename from data/dbus/org.freedesktop.Tracker1.Miner.RSS.service.in
rename to src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in
diff --git a/src/miners/user-guides/.gitignore b/src/miners/user-guides/.gitignore
index b5e2e96..53909a7 100644
--- a/src/miners/user-guides/.gitignore
+++ b/src/miners/user-guides/.gitignore
@@ -1 +1,2 @@
tracker-miner-user-guides
+*.service
diff --git a/src/miners/user-guides/Makefile.am b/src/miners/user-guides/Makefile.am
index 529b7af..6ffe0a9 100644
--- a/src/miners/user-guides/Makefile.am
+++ b/src/miners/user-guides/Makefile.am
@@ -21,6 +21,15 @@ tracker_miner_user_guides_LDADD = \
$(BUILD_LIBS) \
$(TRACKER_MINER_USER_GUIDES_LIBS)
+# DBus interfaces (XML files) and services
+service_in_files = org.freedesktop.Tracker1.Miner.Userguides.service.in
+
+%.service: %.service.in
+ @sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Userguides.service
+
# Desktop files: First we fix the VERSION and libexecdir
tracker-miner-user-guides.desktop.in: tracker-miner-user-guides.desktop.in.in
@sed -e "s|@libexecdir[ ]|${libexecdir}|" \
@@ -34,5 +43,5 @@ autostart_DATA = tracker-miner-user-guides.desktop
@INTLTOOL_DESKTOP_RULE@
-CLEANFILES = $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST = $(desktop_in_in_files)
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST = $(desktop_in_in_files) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Userguides.service.in
b/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in
similarity index 100%
rename from data/dbus/org.freedesktop.Tracker1.Miner.Userguides.service.in
rename to src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in
diff --git a/src/plugins/evolution/.gitignore b/src/plugins/evolution/.gitignore
index f92a4ce..954b620 100644
--- a/src/plugins/evolution/.gitignore
+++ b/src/plugins/evolution/.gitignore
@@ -1 +1,2 @@
*.eplug
+*.service
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index dd9823d..f818ea2 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -35,14 +35,24 @@ liborg_freedesktop_Tracker_evolution_plugin_la_LIBADD = \
$(BUILD_LIBS) \
$(TRACKER_MINER_EVOLUTION_LIBS)
- INTLTOOL_DESKTOP_RULE@
+BUILT_SOURCES = $(eplugin_DATA)
-BUILT_SOURCES = \
+CLEANFILES = \
+ $(BUILT_SOURCES) \
$(eplugin_DATA)
-CLEANFILES = \
- $(BUILT_SOURCES) \
- $(eplugin_DATA)
+EXTRA_DIST = org-freedesktop-Tracker-evolution-plugin.eplug.xml
+
+# DBus interfaces (XML files) and services
+service_in_files = org.freedesktop.Tracker1.Miner.EMails.service.in
+
+%.service: %.service.in
+ @sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.EMails.service
+
+ INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = \
- org-freedesktop-Tracker-evolution-plugin.eplug.xml
+CLEANFILES += $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST += $(desktop_in_in_files) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.EMails.service.in
b/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in
similarity index 100%
rename from data/dbus/org.freedesktop.Tracker1.Miner.EMails.service.in
rename to src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in
diff --git a/src/tracker-extract/.gitignore b/src/tracker-extract/.gitignore
index 9765d48..0ec6299 100644
--- a/src/tracker-extract/.gitignore
+++ b/src/tracker-extract/.gitignore
@@ -2,4 +2,4 @@ tracker-extract
tracker-extract-priority-dbus-stamp
tracker-extract-priority-dbus.c
tracker-extract-priority-dbus.h
-
+*.service
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index f20b33d..2c1adb1 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -571,12 +571,12 @@ tracker-extract-priority-dbus.c: tracker-extract-priority-dbus-stamp
tracker-extract-priority-dbus.h: tracker-extract-priority-dbus-stamp
@:
-tracker-extract-priority-dbus-stamp: Makefile.am $(top_srcdir)/data/dbus/tracker-extract-priority.xml
+tracker-extract-priority-dbus-stamp: Makefile.am
$(top_srcdir)/src/tracker-extract/tracker-extract-priority.xml
$(AM_V_GEN) $(GDBUS_CODEGEN) \
--interface-prefix org.freedesktop.Tracker1.Extract. \
--generate-c-code tracker-extract-priority-dbus \
--c-namespace TrackerExtractDBus \
- $(top_srcdir)/data/dbus/tracker-extract-priority.xml
+ $(top_srcdir)/src/tracker-extract/tracker-extract-priority.xml
touch $@
BUILT_SOURCES = \
@@ -589,6 +589,20 @@ CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = $(rules_files)
+# DBus interfaces (XML files) and services
+configdir = $(datadir)/tracker
+config_DATA = \
+ tracker-extract.xml \
+ tracker-extract-priority.xml
+
+service_in_files = org.freedesktop.Tracker1.Miner.Extract.service.in
+
+%.service: %.service.in
+ @sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Extract.service
+
# Desktop files: First we fix the VERSION and libexecdir
tracker-extract.desktop.in: tracker-extract.desktop.in.in
@sed -e "s|@libexecdir[ ]|${libexecdir}|" \
@@ -602,5 +616,5 @@ autostart_DATA = tracker-extract.desktop
@INTLTOOL_DESKTOP_RULE@
-CLEANFILES += $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST += $(desktop_in_in_files)
+CLEANFILES += $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST += $(desktop_in_in_files) $(config_DATA) $(service_in_files)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Extract.service.in
b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in
similarity index 100%
rename from data/dbus/org.freedesktop.Tracker1.Miner.Extract.service.in
rename to src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in
diff --git a/data/dbus/tracker-extract-priority.xml b/src/tracker-extract/tracker-extract-priority.xml
similarity index 100%
rename from data/dbus/tracker-extract-priority.xml
rename to src/tracker-extract/tracker-extract-priority.xml
diff --git a/data/dbus/tracker-extract.xml b/src/tracker-extract/tracker-extract.xml
similarity index 100%
rename from data/dbus/tracker-extract.xml
rename to src/tracker-extract/tracker-extract.xml
diff --git a/src/tracker-store/.gitignore b/src/tracker-store/.gitignore
index af38b38..38b95cb 100644
--- a/src/tracker-store/.gitignore
+++ b/src/tracker-store/.gitignore
@@ -8,3 +8,4 @@ tracker-status.c
tracker-steroids.c
tracker-store.c
tracker-store.h
+*.service
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 39f9013..1e47ad2 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -66,6 +66,21 @@ EXTRA_DIST = \
tracker-locale-change.vapi \
tracker-writeback.vapi
+
+# DBus interfaces (XML files) and services
+configdir = $(datadir)/tracker
+config_DATA = \
+ tracker-backup.xml \
+ tracker-resources.xml \
+ tracker-statistics.xml \
+ tracker-status.xml
+
+%.service: %.service.in
+ @sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.service
+
# Desktop files: First we fix the VERSION and libexecdir
tracker-store.desktop.in: tracker-store.desktop.in.in
@sed -e "s|@libexecdir[ ]|${libexecdir}|" \
@@ -79,6 +94,7 @@ autostart_DATA = tracker-store.desktop
@INTLTOOL_DESKTOP_RULE@
-CLEANFILES = $(autostart_DATA) $(desktop_in_files)
-EXTRA_DIST += $(desktop_in_in_files)
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
+EXTRA_DIST += $(desktop_in_in_files) $(service_in_files) $(config_DATA)
+
diff --git a/data/dbus/org.freedesktop.Tracker1.service.in
b/src/tracker-store/org.freedesktop.Tracker1.service.in
similarity index 100%
rename from data/dbus/org.freedesktop.Tracker1.service.in
rename to src/tracker-store/org.freedesktop.Tracker1.service.in
diff --git a/data/dbus/tracker-backup.xml b/src/tracker-store/tracker-backup.xml
similarity index 100%
rename from data/dbus/tracker-backup.xml
rename to src/tracker-store/tracker-backup.xml
diff --git a/data/dbus/tracker-resources.xml b/src/tracker-store/tracker-resources.xml
similarity index 100%
rename from data/dbus/tracker-resources.xml
rename to src/tracker-store/tracker-resources.xml
diff --git a/data/dbus/tracker-statistics.xml b/src/tracker-store/tracker-statistics.xml
similarity index 100%
rename from data/dbus/tracker-statistics.xml
rename to src/tracker-store/tracker-statistics.xml
diff --git a/data/dbus/tracker-status.xml b/src/tracker-store/tracker-status.xml
similarity index 100%
rename from data/dbus/tracker-status.xml
rename to src/tracker-store/tracker-status.xml
diff --git a/src/tracker-writeback/.gitignore b/src/tracker-writeback/.gitignore
index c9e76fd..7d4fd4f 100644
--- a/src/tracker-writeback/.gitignore
+++ b/src/tracker-writeback/.gitignore
@@ -1 +1,2 @@
tracker-writeback
+*.service
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index bac5dc1..a00fcdb 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -62,3 +62,19 @@ tracker_writeback_LDADD = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(BUILD_LIBS) \
$(TRACKER_WRITEBACK_LIBS)
+
+# DBus interfaces (XML files) and services
+configdir = $(datadir)/tracker
+config_DATA = tracker-writeback.xml
+
+service_in_files = org.freedesktop.Tracker1.Writeback.service.in
+
+%.service: %.service.in
+ @sed -e "s|@libexecdir[ ]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Writeback.service
+
+EXTRA_DIST = $(service_in_files) $(config_DATA)
+
+CLEANFILES = $(service_DATA)
diff --git a/data/dbus/org.freedesktop.Tracker1.Writeback.service.in
b/src/tracker-writeback/org.freedesktop.Tracker1.Writeback.service.in
similarity index 100%
rename from data/dbus/org.freedesktop.Tracker1.Writeback.service.in
rename to src/tracker-writeback/org.freedesktop.Tracker1.Writeback.service.in
diff --git a/data/dbus/tracker-writeback.xml b/src/tracker-writeback/tracker-writeback.xml
similarity index 100%
rename from data/dbus/tracker-writeback.xml
rename to src/tracker-writeback/tracker-writeback.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]