[tracker-miners/wip/carlosg/parallel-installable: 3/19] tracker-extract: Install versioned executable
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/parallel-installable: 3/19] tracker-extract: Install versioned executable
- Date: Mon, 6 Apr 2020 15:47:23 +0000 (UTC)
commit 2b05c8e61d65b1ca1028a7f110b35dec17bb4eb3
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Feb 23 19:55:32 2020 +0100
tracker-extract: Install versioned executable
This is now installed as tracker-extract-3, and referenced as such
everywhere.
src/tracker-extract/meson.build | 6 +++---
.../org.freedesktop.Tracker3.Miner.Extract.service.in.in | 4 ++--
src/tracker-extract/tracker-extract.desktop.in.in | 2 +-
src/tracker-extract/tracker-extract.service.in | 2 +-
src/tracker/tracker-extract.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index 540415e1a..51b679f68 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -160,7 +160,7 @@ if libgsf.found()
tracker_extract_dependencies += libgsf
endif
-executable('tracker-extract',
+executable('tracker-extract-@0@'.format(tracker_api_major),
tracker_extract_sources,
# Manually add the root dir to work around https://github.com/mesonbuild/meson/issues/1387
c_args: tracker_c_args + ['-I' + meson.build_root()],
@@ -188,7 +188,7 @@ desktop_file_untranslated = configure_file(
desktop_file = custom_target('tracker-extract-desktop-file',
input: desktop_file_untranslated,
- output: 'tracker-extract.desktop',
+ output: 'tracker-extract-@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'))
@@ -196,7 +196,7 @@ desktop_file = custom_target('tracker-extract-desktop-file',
if get_option('systemd_user_services')
configure_file(
input: 'tracker-extract.service.in',
- output: 'tracker-extract.service',
+ output: 'tracker-extract-@0@.service'.format(tracker_api_major),
configuration: conf,
install: true,
install_dir: systemd_user_services_dir)
diff --git a/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in.in
b/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in.in
index 7dd901e3d..4c1f86bea 100644
--- a/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in.in
+++ b/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in.in
@@ -1,7 +1,7 @@
[D-BUS Service]
Name=org.freedesktop.Tracker3.Miner.Extract
-Exec=@libexecdir@/tracker-extract
-SystemdService=tracker-extract.service
+Exec=@libexecdir@/tracker-extract-3
+SystemdService=tracker-extract-3.service
# Miner details needed for tracker-control
Path=/org/freedesktop/Tracker3/Miner/Extract
diff --git a/src/tracker-extract/tracker-extract.desktop.in.in
b/src/tracker-extract/tracker-extract.desktop.in.in
index 7b2ab1dea..ba060538f 100644
--- a/src/tracker-extract/tracker-extract.desktop.in.in
+++ b/src/tracker-extract/tracker-extract.desktop.in.in
@@ -2,7 +2,7 @@
_Name=Tracker Metadata Extractor
_Comment=Extracts metadata from local files
Icon=
-Exec=@libexecdir@/tracker-extract
+Exec=@libexecdir@/tracker-extract-3
Terminal=false
Type=Application
Categories=Utility;
diff --git a/src/tracker-extract/tracker-extract.service.in b/src/tracker-extract/tracker-extract.service.in
index affc225a7..e7df1fddd 100644
--- a/src/tracker-extract/tracker-extract.service.in
+++ b/src/tracker-extract/tracker-extract.service.in
@@ -5,7 +5,7 @@ ConditionUser=!root
[Service]
Type=dbus
BusName=org.freedesktop.Tracker3.Miner.Extract
-ExecStart=@libexecdir@/tracker-extract
+ExecStart=@libexecdir@/tracker-extract-3
Restart=on-abnormal
# Don't restart after tracker daemon -k (aka tracker-control -k)
RestartPreventExitStatus=SIGKILL
diff --git a/src/tracker/tracker-extract.c b/src/tracker/tracker-extract.c
index bd7bf7e19..5b97136bc 100644
--- a/src/tracker/tracker-extract.c
+++ b/src/tracker/tracker-extract.c
@@ -62,7 +62,7 @@ extract_files (TrackerVerbosity verbosity,
snprintf (verbosity_str, 2, "%i", verbosity);
- tracker_extract_path = g_build_filename(LIBEXECDIR, "tracker-extract", NULL);
+ tracker_extract_path = g_build_filename(LIBEXECDIR, "tracker-extract-3", NULL);
for (p = filenames; *p; p++) {
char *argv[] = {tracker_extract_path,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]