Commit 493e8aae authored by Sam Thursfield's avatar Sam Thursfield

Merge remote-tracking branch 'origin/wip/carlosg/meson-fixes'

See !22
parents 11d9d281 e201cd6c
Pipeline #28913 passed with stage
in 5 minutes and 16 seconds
......@@ -2,6 +2,9 @@ sources = ['tracker-miner-manager.c']
headers = ['tracker-control.h', 'tracker-miner-manager.h']
mapfile = 'tracker-control-2.map'
vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
libtracker_control = library('tracker-control-' + tracker_api_version,
sources,
tracker_common_enum_header,
......@@ -13,6 +16,7 @@ libtracker_control = library('tracker-control-' + tracker_api_version,
# https://github.com/mesonbuild/meson/issues/671
dependencies: [gio, tracker_sparql_dep, tracker_miner_dep],
include_directories: [commoninc, configinc, srcinc],
link_args: vflag,
link_with: libtracker_common,
)
......@@ -31,6 +35,13 @@ tracker_control_gir = gnome.generate_gir(libtracker_control,
install: true,
extra_args: '--c-include=libtracker-control/tracker-control.h')
gnome.generate_vapi(
'tracker-control-' + tracker_api_version,
sources : tracker_control_gir[0],
packages : 'gio-2.0',
install : true,
)
configure_file(
input: 'tracker-control.pc.in',
output: 'tracker-control-@0@.pc'.format(tracker_api_version),
......
{
global:
tracker_miner_manager_*;
local:
*;
};
shared_libtracker_miner_monitor_sources = files('tracker-monitor.c')
shared_libtracker_miner_file_system_sources = files('tracker-file-system.c')
shared_libtracker_miner_crawler_sources = files('tracker-crawler.c')
miner_enums = gnome.mkenums('tracker-miner-enum-types',
sources: 'tracker-miner-enums.h',
c_template: 'tracker-miner-enum-types.c.template',
......@@ -15,6 +11,7 @@ private_sources = [
'tracker-file-data-provider.c',
'tracker-file-notifier.c',
'tracker-file-system.c',
'tracker-monitor.c',
'tracker-priority-queue.c',
'tracker-task-pool.c',
'tracker-sparql-buffer.c',
......@@ -34,9 +31,6 @@ miner_headers = [
]
miner_sources = (
shared_libtracker_miner_monitor_sources +
shared_libtracker_miner_file_system_sources +
shared_libtracker_miner_crawler_sources +
['tracker-data-provider.c',
'tracker-decorator.c',
'tracker-decorator-fs.c',
......@@ -58,6 +52,9 @@ if have_network_manager
tracker_miner_dependencies += network_manager
endif
mapfile = 'tracker-miner-2.map'
vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
libtracker_miner = library(
'tracker-miner-' + tracker_api_version,
miner_enums[0], miner_enums[1], miner_sources,
......@@ -69,6 +66,7 @@ libtracker_miner = library(
# https://github.com/mesonbuild/meson/issues/671
include_directories: [commoninc, configinc, srcinc],
dependencies: [tracker_sparql_dep] + tracker_miner_dependencies,
link_args: vflag,
link_with: [libtracker_miner_private],
)
......@@ -92,6 +90,13 @@ tracker_miner_gir = gnome.generate_gir(libtracker_miner,
'--c-include=libtracker-miner/tracker-miner.h',
])
gnome.generate_vapi(
'tracker-miner-' + tracker_api_version,
sources : tracker_miner_gir[0],
packages : 'gio-2.0',
install : true,
)
configure_file(
input: 'tracker-miner.pc.in',
output: 'tracker-miner-@0@.pc'.format(tracker_api_version),
......@@ -100,3 +105,7 @@ configure_file(
install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'pkgconfig'))
install_headers(miner_headers, subdir: 'tracker-@0@/libtracker-miner'.format(tracker_api_version))
install_data(
'tracker-miner.xml',
install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'tracker'))
{
global:
tracker_data_provider_*;
tracker_miner_*;
tracker_indexing_tree_*;
tracker_directory_flags_*;
tracker_filter_type_*;
tracker_filter_policy_*;
tracker_network_type_*;
tracker_decorator_*;
local:
*;
};
mapfile = 'tracker-sparql-2.map'
vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
'../libtracker-common/libtracker-common.vapi',
'../libtracker-data/libtracker-data.vapi',
......@@ -9,6 +12,7 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
install: true,
install_rpath: tracker_internal_libs_dir,
link_args: vflag,
link_whole: [libtracker_sparql_intermediate_c, libtracker_sparql_intermediate_vala],
# We need to pass this because link_whole doesn't trigger the .vapi
......
{
global:
tracker_sparql_connection_*;
tracker_sparql_cursor_*;
tracker_sparql_builder_*;
tracker_sparql_escape_*;
tracker_sparql_error_*;
tracker_sparql_value_*;
tracker_sparql_get_*;
tracker_namespace_manager_*;
tracker_resource_*;
tracker_notifier_*;
local:
*;
};
......@@ -48,8 +48,5 @@ nepomuk = [
tracker_gresources = gnome.compile_resources('tracker_gresources', 'builtin-ontology.gresource.xml')
install_data(internal_config,
install_dir: tracker_ontologies_dir)
install_data(nepomuk,
install_dir: join_paths(tracker_ontologies_dir, 'nepomuk'))
......@@ -23,6 +23,7 @@ test('functional-ipc-direct-query', direct_query_test,
bus_query_test = executable('test-bus-query',
'test-bus-query.vala',
'test-shared-query.vala',
link_with: [libtracker_bus],
dependencies: [tracker_common_dep, tracker_sparql_dep, tracker_sparql_bus_dep])
test('functional-ipc-bus-query', bus_query_test,
env: test_env)
......@@ -37,6 +38,7 @@ test('functional-ipc-default-update', default_update_test,
bus_update_test = executable('test-bus-update',
'test-bus-update.vala',
'test-shared-update.vala',
link_with: [libtracker_bus],
dependencies: [tracker_common_dep, tracker_sparql_dep, tracker_sparql_bus_dep])
test('functional-ipc-bus-update', bus_update_test,
env: test_env)
......
......@@ -12,7 +12,7 @@ libtracker_data_slow_tests = [
]
libtracker_data_test_environment = environment()
libtracker_data_test_environment.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', '@0@/src/libtracker-common/stop-words'.format(meson.source_root()))
libtracker_data_test_environment.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', '@0@/src/libtracker-common/stop-words'.format(source_root))
libtracker_data_test_deps = [tracker_common_dep, tracker_data_dep]
......
......@@ -19,11 +19,11 @@ libtracker_miner_test_c_args = [
'-DTEST',
'-DTEST_DATA_DIR="@0@/data"'.format(meson.current_source_dir()),
'-DTEST_MINERS_DIR="@0@/mock-miners"'.format(meson.current_source_dir()),
'-DTEST_ONTOLOGIES_DIR="@0@/src/ontologies/nepomuk"'.format(meson.source_root()),
'-DTEST_ONTOLOGIES_DIR="@0@/src/ontologies/nepomuk"'.format(source_root),
]
libtracker_miner_test_environment = environment()
libtracker_miner_test_environment.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', '@0@/src/libtracker-common/stop-words'.format(meson.source_root()))
libtracker_miner_test_environment.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', '@0@/src/libtracker-common/stop-words'.format(source_root))
libtracker_miner_test_deps = [tracker_common_dep, tracker_miner_dep, tracker_sparql_dep]
......@@ -34,7 +34,8 @@ foreach base_name: libtracker_miner_tests
binary = executable(binary_name, source,
dependencies: libtracker_miner_test_deps,
c_args: libtracker_miner_test_c_args)
c_args: libtracker_miner_test_c_args,
link_with: [libtracker_miner_private])
test(test_name, binary,
env: libtracker_miner_test_environment)
......@@ -47,7 +48,8 @@ foreach base_name: libtracker_miner_slow_tests
binary = executable(binary_name, source,
dependencies: libtracker_miner_test_deps,
c_args: libtracker_miner_test_c_args)
c_args: libtracker_miner_test_c_args,
link_with: [libtracker_miner_private])
test(test_name, binary,
env: libtracker_miner_test_environment,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment