[tracker-miners/sam/run-uninstalled-fixes] build: Fix run-uninstalled script to work when Tracker isn't installed



commit f52bd1d965deffe74b7693b198f8ef3edda725fe
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun Sep 29 17:26:12 2019 +0200

    build: Fix run-uninstalled script to work when Tracker isn't installed
    
    When I first wrote this script, I tested with my prefix set to
    ~/opt/tracker where I actually had an installed instance of Tracker.
    When I deleted this the script stopped working.
    
    This commit fixes the script so that it's actually possible to run
    Tracker commands immediately after building Tracker.
    
    Depends on: https://gitlab.gnome.org/GNOME/tracker/merge_requests/149
    
    Fixes: https://gitlab.gnome.org/GNOME/tracker-miners/issues/80

 meson.build                                               |  7 +++++++
 run-uninstalled.in                                        | 15 ++++++++++-----
 tests/services/meson.build                                |  6 ++++++
 .../org.freedesktop.Tracker1.Miner.Extract.service.in     |  5 +++++
 .../org.freedesktop.Tracker1.Miner.Files.service.in       |  5 +++++
 5 files changed, 33 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 91d229014..d26753e16 100644
--- a/meson.build
+++ b/meson.build
@@ -429,7 +429,14 @@ meson.add_install_script('meson_integration_commands.sh', glib_compile_schemas.p
 
 run_uninstalled_conf = configuration_data()
 run_uninstalled_conf.set('tracker_uninstalled_cli_dir', tracker_uninstalled_cli_dir)
+run_uninstalled_conf.set('tracker_uninstalled_domain_rule', tracker_uninstalled_domain_rule)
+run_uninstalled_conf.set('tracker_uninstalled_extract_rules_dir', tracker_uninstalled_extract_rules_dir)
+run_uninstalled_conf.set('tracker_uninstalled_extractors_dir', meson.current_build_dir() / 'src' / 
'tracker-extract')
+run_uninstalled_conf.set('tracker_uninstalled_miner_services_dir', tracker_uninstalled_miner_services_dir)
+run_uninstalled_conf.set('tracker_uninstalled_nepomuk_ontologies_dir', 
tracker_uninstalled_nepomuk_ontologies_dir)
+run_uninstalled_conf.set('tracker_uninstalled_stop_words_dir', tracker_uninstalled_stop_words_dir)
 run_uninstalled_conf.set('tracker_uninstalled_testutils_dir', tracker_uninstalled_testutils_dir)
+run_uninstalled_conf.set('tracker_uninstalled_writeback_modules_dir', 
tracker_uninstalled_writeback_modules_dir)
 configure_file(
   input: 'run-uninstalled.in',
   output: 'run-uninstalled',
diff --git a/run-uninstalled.in b/run-uninstalled.in
index 2f960be47..4178480b4 100755
--- a/run-uninstalled.in
+++ b/run-uninstalled.in
@@ -25,11 +25,8 @@ import os
 import pathlib
 import sys
 
-TRACKER_UNINSTALLED_CLI_DIR = "@tracker_uninstalled_cli_dir@"
-TRACKER_UNINSTALLED_TESTUTILS_DIR = "@tracker_uninstalled_testutils_dir@"
-
-cli_dir = TRACKER_UNINSTALLED_CLI_DIR
-testutils_dir = TRACKER_UNINSTALLED_TESTUTILS_DIR
+cli_dir = "@tracker_uninstalled_cli_dir@"
+testutils_dir = "@tracker_uninstalled_testutils_dir@"
 
 build_directory = pathlib.Path(__file__).parent
 dbus_config = build_directory.joinpath('tests/test-bus.conf')
@@ -44,5 +41,13 @@ env['PATH'] = ':'.join([cli_dir] + path)
 pythonpath = env.get('PYTHONPATH', '').split(':')
 env['PYTHONPATH'] = ':'.join([testutils_dir] + pythonpath)
 
+env['TRACKER_DB_ONTOLOGIES_DIR'] = "@tracker_uninstalled_nepomuk_ontologies_dir@"
+env['TRACKER_EXTRACTOR_RULES_DIR'] = "@tracker_uninstalled_extract_rules_dir@"
+env['TRACKER_EXTRACTORS_DIR'] = "@tracker_uninstalled_extractors_dir@"
+env['TRACKER_LANGUAGE_STOP_WORDS_DIR'] = "@tracker_uninstalled_stop_words_dir@"
+env['TRACKER_MINER_SERVICES_DIR'] = "@tracker_uninstalled_miner_services_dir@"
+env['TRACKER_TEST_DOMAIN_ONTOLOGY_RULE'] = "@tracker_uninstalled_domain_rule@"
+env['TRACKER_WRITEBACK_MODULES_DIR'] = "@tracker_uninstalled_writeback_modules_dir@"
+
 args = [sys.executable, '-m', 'trackertestutils', '--dbus-config', dbus_config] + sys.argv[1:]
 os.execve(sys.executable, args, env)
diff --git a/tests/services/meson.build b/tests/services/meson.build
index 15308348f..fad894d4a 100644
--- a/tests/services/meson.build
+++ b/tests/services/meson.build
@@ -1,3 +1,7 @@
+# This directory contains service files used by dbus-daemon to automatically
+# activate the daemons as needed. These files are used when running Tracker
+# from the build tree.
+
 tracker_extract_test_dbus_service_file = configure_file(
     input: 'org.freedesktop.Tracker1.Miner.Extract.service.in',
     output: 'org.freedesktop.Tracker1.Miner.Extract.service',
@@ -12,3 +16,5 @@ tracker_writeback_test_dbus_service_file = configure_file(
     input: 'org.freedesktop.Tracker1.Writeback.service.in',
     output: 'org.freedesktop.Tracker1.Writeback.service',
     configuration: conf)
+
+subdir('miners')
diff --git a/tests/services/org.freedesktop.Tracker1.Miner.Extract.service.in 
b/tests/services/org.freedesktop.Tracker1.Miner.Extract.service.in
index ac5011bb3..05cd0aa76 100644
--- a/tests/services/org.freedesktop.Tracker1.Miner.Extract.service.in
+++ b/tests/services/org.freedesktop.Tracker1.Miner.Extract.service.in
@@ -2,3 +2,8 @@
 Name=org.freedesktop.Tracker1.Miner.Extract
 Exec=@abs_top_builddir@/src/tracker-extract/tracker-extract
 SystemdService=tracker-extract.service
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Extract
+NameSuffix=Miner.Extract
+DisplayName=Extractor
diff --git a/tests/services/org.freedesktop.Tracker1.Miner.Files.service.in 
b/tests/services/org.freedesktop.Tracker1.Miner.Files.service.in
index e29d3cc92..929a8003f 100644
--- a/tests/services/org.freedesktop.Tracker1.Miner.Files.service.in
+++ b/tests/services/org.freedesktop.Tracker1.Miner.Files.service.in
@@ -2,3 +2,8 @@
 Name=org.freedesktop.Tracker1.Miner.Files
 Exec=@abs_top_builddir@/src/miners/fs/tracker-miner-fs --initial-sleep=0
 SystemdService=tracker-miner-fs.service
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Files
+NameSuffix=Miner.Files
+DisplayName=File System


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