[tracker-miners/wip/carlosg/parallel-installable: 8/27] tracker-miner-fs: Install versioned executable
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/parallel-installable: 8/27] tracker-miner-fs: Install versioned executable
- Date: Sat, 14 Mar 2020 22:15:52 +0000 (UTC)
commit 278521c835fe9c2309676bacf9c6854f3ee5d50b
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Feb 23 19:52:11 2020 +0100
tracker-miner-fs: Install versioned executable
This is now installed as tracker-miner-fs-3, and referenced as such
everywhere.
src/miners/fs/meson.build | 7 ++++---
src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in | 2 +-
src/miners/fs/tracker-miner-fs.desktop.in.in | 2 +-
src/miners/fs/tracker-miner-fs.service.in | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index 67a0fa24a..86fed58da 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -26,7 +26,8 @@ elif battery_detection_library_name == 'hal'
tracker_miner_fs_deps += hal
endif
-executable('tracker-miner-fs', sources,
+executable('tracker-miner-fs-@0@'.format(tracker_api_major),
+ sources,
dependencies: tracker_miner_fs_deps,
c_args: tracker_c_args,
install: true,
@@ -53,7 +54,7 @@ desktop_file_untranslated = configure_file(
desktop_file = custom_target('tracker-miner-fs-desktop-file',
input: desktop_file_untranslated,
- output: 'tracker-miner-fs.desktop',
+ output: 'tracker-miner-fs-@0@.desktop'.format(tracker_api_major),
command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(),
'po'), '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
@@ -61,7 +62,7 @@ desktop_file = custom_target('tracker-miner-fs-desktop-file',
if get_option('systemd_user_services')
configure_file(
input: 'tracker-miner-fs.service.in',
- output: 'tracker-miner-fs.service',
+ output: 'tracker-miner-fs-@0@.service'.format(tracker_api_major),
configuration: conf,
install: true,
install_dir: systemd_user_services_dir)
diff --git a/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in
b/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in
index 690f9a640..9fe05fe8d 100644
--- a/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in
+++ b/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in
@@ -1,6 +1,6 @@
[D-BUS Service]
Name=org.freedesktop.Tracker3.Miner.Files
-Exec=@libexecdir@/tracker-miner-fs
+Exec=@libexecdir@/tracker-miner-fs-3
SystemdService=tracker-miner-fs.service
# Miner details needed for tracker-control
diff --git a/src/miners/fs/tracker-miner-fs.desktop.in.in b/src/miners/fs/tracker-miner-fs.desktop.in.in
index 29d5364c6..c4e5c2b3e 100644
--- a/src/miners/fs/tracker-miner-fs.desktop.in.in
+++ b/src/miners/fs/tracker-miner-fs.desktop.in.in
@@ -2,7 +2,7 @@
_Name=Tracker File System Miner
_Comment=Crawls and processes files on the file system
Icon=
-Exec=@libexecdir@/tracker-miner-fs
+Exec=@libexecdir@/tracker-miner-fs-3
Terminal=false
Type=Application
Categories=Utility;
diff --git a/src/miners/fs/tracker-miner-fs.service.in b/src/miners/fs/tracker-miner-fs.service.in
index d0c1646d2..cde1d8e34 100644
--- a/src/miners/fs/tracker-miner-fs.service.in
+++ b/src/miners/fs/tracker-miner-fs.service.in
@@ -4,7 +4,7 @@ Description=Tracker file system data miner
[Service]
Type=dbus
BusName=org.freedesktop.Tracker3.Miner.Files
-ExecStart=@libexecdir@/tracker-miner-fs
+ExecStart=@libexecdir@/tracker-miner-fs-3
Restart=on-failure
# Don't restart after tracker daemon -k (aka tracker-control -k)
RestartPreventExitStatus=SIGKILL
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]