[tracker] meson: Replace all source_root() and build_root() calls
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] meson: Replace all source_root() and build_root() calls
- Date: Thu, 3 Aug 2017 23:10:09 +0000 (UTC)
commit 439b44f26723fdf15f5ae00dcf5d3f5921165143
Author: Sam Thursfield <sam thursfield codethink co uk>
Date: Fri Aug 4 00:08:35 2017 +0100
meson: Replace all source_root() and build_root() calls
These functions need to be avoided so that Tracker doesn't break when
included via subproject() into another Meson project.
docs/reference/ontology/meson.build | 2 +-
meson.build | 6 +++++-
src/tracker-store/meson.build | 8 ++++----
tests/common/meson.build | 2 +-
tests/libtracker-common/meson.build | 4 ++--
tests/libtracker-data/meson.build | 4 ++--
tests/libtracker-fts/meson.build | 4 ++--
tests/libtracker-sparql/meson.build | 4 ++--
8 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/docs/reference/ontology/meson.build b/docs/reference/ontology/meson.build
index 3767fea..320b1bb 100644
--- a/docs/reference/ontology/meson.build
+++ b/docs/reference/ontology/meson.build
@@ -16,7 +16,7 @@ version_xml = configure_file(input: 'version.xml.in',
generated = custom_target('ontology-doc-generated',
output: 'gen-doc.stamp',
command: [ttl2sgml,
- '-d', meson.source_root() + '/src/ontologies/nepomuk',
+ '-d', join_paths(source_root, 'src/ontologies/nepomuk'),
'-o', join_paths(meson.current_build_dir(), 'xml/')],
depends: ttl2sgml,
# FIXME: this shouldn't be necessary, but currently the 'dependencies'
diff --git a/meson.build b/meson.build
index a27a3dd..26285a6 100644
--- a/meson.build
+++ b/meson.build
@@ -420,6 +420,10 @@ have_tracker_preferences = true
configinc = include_directories('./')
srcinc = include_directories('src/')
+source_root = meson.current_source_dir()
+build_root = meson.current_build_dir()
+po_subdir = join_paths(source_root, 'po')
+
tracker_internal_libs_dir = join_paths(get_option('prefix'), get_option('libdir'), 'tracker-' +
tracker_api_version)
tracker_extract_modules_dir = join_paths(get_option('prefix'), get_option('libdir'),
'tracker-@0@/extract-modules'.format(tracker_api_version))
@@ -471,7 +475,7 @@ endif
summary = [
'\nBuild Configuration:',
' Prefix: ' + get_option('prefix'),
- ' Source code location: ' + meson.source_root(),
+ ' Source code location: ' + meson.current_source_dir(),
' Compiler: ' + cc.get_id(),
'\nFeature Support:',
' Battery/mains power detection: ' + battery_detection_library_name,
diff --git a/src/tracker-store/meson.build b/src/tracker-store/meson.build
index 1c5d374..2a51941 100644
--- a/src/tracker-store/meson.build
+++ b/src/tracker-store/meson.build
@@ -42,7 +42,7 @@ install_data(
dbus_service_file = custom_target('tracker-store-dbus-service-file',
input: 'org.freedesktop.Tracker1.service.in',
output: 'org.freedesktop.Tracker1.service',
- command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(),
'po'), '@INPUT@', '@OUTPUT@'],
+ command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', po_subdir, '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: dbus_services_dir)
@@ -54,7 +54,7 @@ desktop_file_untranslated = configure_file(
desktop_file = custom_target('tracker-store-desktop-file',
input: desktop_file_untranslated,
output: 'tracker-store.desktop',
- command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(),
'po'), '@INPUT@', '@OUTPUT@'],
+ command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', po_subdir, '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
@@ -70,14 +70,14 @@ endif
custom_target('tracker-store-settings-schema',
input: 'org.freedesktop.Tracker.Store.gschema.xml.in',
output: 'org.freedesktop.Tracker.Store.gschema.xml',
- command: ['intltool-merge', '--quiet', '--xml-style', '--utf8', join_paths(meson.source_root(), 'po'),
'@INPUT@', '@OUTPUT@'],
+ command: ['intltool-merge', '--quiet', '--xml-style', '--utf8', po_subdir, '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas'))
custom_target('tracker-store-settings-schemalist',
input: 'org.freedesktop.Tracker.gschema.xml.in',
output: 'org.freedesktop.Tracker.gschema.xml',
- command: ['intltool-merge', '--quiet', '--xml-style', '--utf8', join_paths(meson.source_root(), 'po'),
'@INPUT@', '@OUTPUT@'],
+ command: ['intltool-merge', '--quiet', '--xml-style', '--utf8', po_subdir, '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas'))
diff --git a/tests/common/meson.build b/tests/common/meson.build
index 2598745..184b33d 100644
--- a/tests/common/meson.build
+++ b/tests/common/meson.build
@@ -4,7 +4,7 @@ libtracker_testcommon = library('tracker-testcommon',
'tracker-test-helpers.c',
dependencies: tracker_testcommon_dependencies,
c_args: [
- '-DTEST_TEXT="@0@/tests/libtracker-common/non-utf8.txt"'.format(meson.source_root()),
+ '-DTEST_TEXT="@0@/../libtracker-common/non-utf8.txt"'.format(meson.current_source_dir()),
]
)
diff --git a/tests/libtracker-common/meson.build b/tests/libtracker-common/meson.build
index 6e1588a..fc9b26d 100644
--- a/tests/libtracker-common/meson.build
+++ b/tests/libtracker-common/meson.build
@@ -1,6 +1,6 @@
test_c_args = tracker_c_args + [
- '-DTOP_BUILDDIR="@0@"'.format(meson.build_root()),
- '-DTOP_SRCDIR="@0@"'.format(meson.source_root()),
+ '-DTOP_BUILDDIR="@0@"'.format(build_root),
+ '-DTOP_SRCDIR="@0@"'.format(source_root),
]
date_time_test = executable('tracker-date-time-test',
diff --git a/tests/libtracker-data/meson.build b/tests/libtracker-data/meson.build
index 29b720f..f9d42a5 100644
--- a/tests/libtracker-data/meson.build
+++ b/tests/libtracker-data/meson.build
@@ -1,6 +1,6 @@
test_c_args = tracker_c_args + [
- '-DTOP_BUILDDIR="@0@"'.format(meson.build_root()),
- '-DTOP_SRCDIR="@0@"'.format(meson.source_root()),
+ '-DTOP_BUILDDIR="@0@"'.format(build_root),
+ '-DTOP_SRCDIR="@0@"'.format(source_root),
]
backup_test = executable('tracker-backup-test',
diff --git a/tests/libtracker-fts/meson.build b/tests/libtracker-fts/meson.build
index 09f6891..86245f4 100644
--- a/tests/libtracker-fts/meson.build
+++ b/tests/libtracker-fts/meson.build
@@ -1,6 +1,6 @@
test_c_args = tracker_c_args + [
- '-DTOP_BUILDDIR="@0@/"'.format(meson.build_root()),
- '-DTOP_SRCDIR="@0@/"'.format(meson.source_root()),
+ '-DTOP_BUILDDIR="@0@/"'.format(build_root),
+ '-DTOP_SRCDIR="@0@/"'.format(source_root),
]
fts_test = executable('tracker-fts-test',
diff --git a/tests/libtracker-sparql/meson.build b/tests/libtracker-sparql/meson.build
index 4a5dedd..326c7d7 100644
--- a/tests/libtracker-sparql/meson.build
+++ b/tests/libtracker-sparql/meson.build
@@ -1,7 +1,7 @@
test_c_args = [
'-DTEST',
- '-DTEST_DOMAIN_ONTOLOGY_RULE="@0@/src/tracker-store/default.rule"'.format(meson.current_source_dir()),
- '-DTEST_ONTOLOGIES_DIR="@0@/src/ontologies/nepomuk"'.format(meson.current_source_dir()),
+ '-DTEST_DOMAIN_ONTOLOGY_RULE="@0@/src/tracker-store/default.rule"'.format(source_root),
+ '-DTEST_ONTOLOGIES_DIR="@0@/src/ontologies/nepomuk"'.format(source_root),
]
resource_test = executable('tracker-resource-test',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]