[tracker-miners/wip/carlosg/apps-in-miner-fs] miners: Drop tracker-miner-apps



commit c5e1e935fdfbe5aca0e838736a933d70cd553c4e
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sat Nov 10 17:27:38 2018 +0100

    miners: Drop tracker-miner-apps
    
    Now that all functionality has been taken over by tracker-miner-fs,
    this miner can disappear.

 meson.build                                        |   2 -
 meson_options.txt                                  |   2 -
 po/POTFILES.in                                     |   3 -
 src/create-miner-symlinks.sh                       |   8 +-
 src/meson.build                                    |   2 +-
 src/miners/apps/.gitignore                         |   2 -
 src/miners/apps/meson.build                        |  45 -
 ...sktop.Tracker1.Miner.Applications.service.in.in |  10 -
 src/miners/apps/tracker-main.c                     | 323 -------
 src/miners/apps/tracker-miner-applications.c       | 976 ---------------------
 src/miners/apps/tracker-miner-applications.h       |  52 --
 src/miners/apps/tracker-miner-apps.desktop.in.in   |  18 -
 src/miners/apps/tracker-miner-apps.service.in      |  10 -
 src/miners/meson.build                             |   3 -
 14 files changed, 3 insertions(+), 1453 deletions(-)
---
diff --git a/meson.build b/meson.build
index c0418d5f0..14fdc9575 100644
--- a/meson.build
+++ b/meson.build
@@ -104,7 +104,6 @@ libmath = cc.find_library('m', required: false)
 uuid = cc.find_library('uuid')
 
 have_tracker_extract = get_option('extract')
-have_tracker_miner_apps = get_option('miner_apps')
 have_tracker_miner_fs = get_option('miner_fs')
 have_tracker_miner_rss = get_option('miner_rss')
 have_tracker_writeback = get_option('writeback')
@@ -409,7 +408,6 @@ summary = [
   '    Build with Journal support:             ' + get_option('journal').to_string(),
   '\nData Miners / Writebacks:',
   '    FS (File System):                       ' + have_tracker_miner_fs.to_string(),
-  '    Applications:                           ' + have_tracker_miner_apps.to_string(),
   '    RSS:                                    ' + have_tracker_miner_rss.to_string(),
   '   Extract (secondary extraction):     ' + have_tracker_extract.to_string(),
   '   Writeback (writing changes back):   ' + have_tracker_writeback.to_string(),
diff --git a/meson_options.txt b/meson_options.txt
index a91ac6c0f..04120b12e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -11,8 +11,6 @@ option('guarantee_metadata', type: 'boolean', value: true,
        description: 'Set nie:title and nie:contentCreated from filename and mtime if no metadata available')
 option('journal', type: 'boolean', value: true,
        description: 'Enable database journal backup mechanism')
-option('miner_apps', type: 'boolean', value: true,
-       description: 'Enable the Tracker applications miner')
 option('miner_fs', type: 'boolean', value: true,
        description: 'Enable the Tracker filesystem miner')
 option('miner_rss', type: 'boolean', value: true,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2cb9f8255..c4fd6ddcf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,9 +2,6 @@
 # Please keep this file sorted alphabetically.
 src/libtracker-miners-common/tracker-dbus.c
 src/libtracker-miners-common/tracker-utils.c
-src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in
-src/miners/apps/tracker-main.c
-src/miners/apps/tracker-miner-apps.desktop.in.in
 src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
 src/miners/fs/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
 src/miners/fs/tracker-main.c
diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh
index 114cc54c8..79560b9e2 100644
--- a/src/create-miner-symlinks.sh
+++ b/src/create-miner-symlinks.sh
@@ -8,14 +8,10 @@ set -e
 
 dbus_services_dir="$1"
 tracker_miner_services_dir="$2"
-have_tracker_miner_apps="$3"
-have_tracker_miner_fs="$4"
-have_tracker_miner_rss="$5"
+have_tracker_miner_fs="$3"
+have_tracker_miner_rss="$4"
 
 mkdir -p ${DESTDIR}/${tracker_miner_services_dir}
-if [[ "$have_tracker_miner_apps" -eq "true" ]]; then
-  ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" 
"${DESTDIR}/${tracker_miner_services_dir}/"
-fi
 ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" 
"${DESTDIR}/${tracker_miner_services_dir}/"
 if [[ "$have_tracker_miner_fs" -eq "true" ]]; then
   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" 
"${DESTDIR}/${tracker_miner_services_dir}/"
diff --git a/src/meson.build b/src/meson.build
index 5a32eed59..61a83023f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -31,4 +31,4 @@ custom_target('tracker-miners-settings-enums',
     install: true,
     install_dir: gsettings_schema_dir)
 
-meson.add_install_script('create-miner-symlinks.sh', dbus_services_dir, tracker_miner_services_dir, 
have_tracker_miner_apps.to_string(), have_tracker_miner_fs.to_string(), have_tracker_miner_rss.to_string())
+meson.add_install_script('create-miner-symlinks.sh', dbus_services_dir, tracker_miner_services_dir, 
have_tracker_miner_fs.to_string(), have_tracker_miner_rss.to_string())
diff --git a/src/miners/meson.build b/src/miners/meson.build
index fda214725..7ba06f277 100644
--- a/src/miners/meson.build
+++ b/src/miners/meson.build
@@ -6,6 +6,3 @@ if have_tracker_miner_rss
   subdir('rss')
 endif
 
-if have_tracker_miner_apps
-  subdir('apps')
-endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]