diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2019-09-15 22:34:19 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2019-09-15 22:34:19 +0000 |
| commit | 478fd3f4ae5b8af9bdc1c2f0c5a8745cc200302d (patch) | |
| tree | 15834f2c90c460466cb465faf3ec9a8988f09741 | |
| parent | f03d2bf82989f0403be7484b070d04b9cb9645d1 (diff) | |
| parent | cb82cbfc8958063d942437c4ce40e28b2d91c497 (diff) | |
| download | tracker-478fd3f4ae5b8af9bdc1c2f0c5a8745cc200302d.tar.gz | |
Merge branch 'sam/meson-cli-dir' into 'master'
Add a variable needed for run-uninstalled script to work
See merge request GNOME/tracker!138
| -rw-r--r-- | README.md | 5 | ||||
| -rw-r--r-- | meson.build | 1 |
2 files changed, 3 insertions, 3 deletions
@@ -108,10 +108,9 @@ If run with no arguments, the script will start an interactive shell. Any arguments after a `--` sentinel are treated as a command to run in a non-interactive shell. -So, let's see the status of the Tracker daemons. They should be all stopped -right now. +Now check that it runs the correct version of the Tracker CLI: - ./run-uninstalled -- tracker daemon status + ./run-uninstalled -- tracker --version Let's try and index some content. (Subtitute ~/Music for any other location where you have interesting data). We need to explicitly tell the script to wait diff --git a/meson.build b/meson.build index af7ad6bc7..df8764756 100644 --- a/meson.build +++ b/meson.build @@ -338,6 +338,7 @@ test_c_args = tracker_c_args + [ '-DTOP_SRCDIR="@0@"'.format(source_root), ] +tracker_uninstalled_cli_dir = join_paths(meson.current_build_dir(), 'src', 'tracker') tracker_uninstalled_domain_rule = join_paths(meson.current_source_dir(), 'src', 'tracker-store', 'default.rule') tracker_uninstalled_nepomuk_ontologies_dir = join_paths(meson.current_source_dir(), 'src', 'ontologies', 'nepomuk') tracker_uninstalled_stop_words_dir = join_paths(meson.current_source_dir(), 'src', 'libtracker-common', 'stop-words') |