[tracker-miners/wip/carlosg/stable-content-urns: 2/7] build: Integrate TrackerMinerFiles extraction into tracker:extractorHash




commit 8a1a5faaf57a1b66beffb5c66c600fe79c44749b
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Dec 13 12:57:12 2021 +0100

    build: Integrate TrackerMinerFiles extraction into tracker:extractorHash
    
    This will allow file re-extraction if there are changes to the extraction code
    in TrackerMinerFiles.

 src/meson.build                 | 6 +++---
 src/miners/fs/meson.build       | 4 +++-
 src/tracker-extract/meson.build | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 3d5567eb8..3cd8ce44f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,14 +3,14 @@ subdir('libtracker-miners-common')
 subdir('libtracker-extract')
 subdir('libtracker-miner')
 
+# Public miners
+subdir('miners')
+
 # Public data extract tool & modules
 if get_option('extract')
   subdir('tracker-extract')
 endif
 
-# Public miners
-subdir('miners')
-
 # Control Proxy
 subdir('tracker-control')
 
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index 326034d53..5aa3478da 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -1,10 +1,12 @@
+files_extract = files('tracker-miner-files-methods.c')
+
 sources = [
     'tracker-config.c',
     'tracker-extract-watchdog.c',
     'tracker-main.c',
     'tracker-miner-files.c',
-    'tracker-miner-files-methods.c',
     'tracker-storage.c',
+    files_extract,
 ]
 
 tracker_miner_fs_deps = [
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index 88ce49fb9..129d87431 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -116,7 +116,7 @@ foreach module : modules
     install: true,
     install_dir: tracker_extract_modules_dir)
 
-  hash = run_command('calculate-hash.sh', sources)
+  hash = run_command('calculate-hash.sh', [sources] + files_extract)
 
   foreach rule : rules
     configure_file(input: rule,


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