Commit 4664aa29 authored by Niels De Graef's avatar Niels De Graef

meson: Fix omitted Gir annotations in the VAPIs

Because some backend libraries have a different VAPI/GIR namespace, we
need to make sure this doesn't get omitted in the generated VAPI files.
See the comments in the code for more info.

Spotted by @ricotz at !9 (comment 491440)
parent 8db8fd59
......@@ -5,6 +5,16 @@ eds_backendlib_sources = files(
'edsf-persona.vala',
)
eds_backendlib_sources += configure_file(
input: namespace_vala_in,
output: 'namespace.vala',
configuration: {
'BACKENDLIB_GIR_NAME': eds_backendlib_gir_name.split('-')[0],
'BACKENDLIB_GIR_VERSION': folks_api_version,
'BACKENDLIB_NAMESPACE': 'Edsf',
},
)
eds_backendlib_deps = [
backend_deps,
libebook_dep,
......
......@@ -5,6 +5,16 @@ libsocialweb_backendlib_sources = files(
'swf-persona.vala',
)
libsocialweb_backendlib_sources += configure_file(
input: namespace_vala_in,
output: 'namespace.vala',
configuration: {
'BACKENDLIB_GIR_NAME': libsocialweb_backendlib_gir_name.split('-')[0],
'BACKENDLIB_GIR_VERSION': folks_api_version,
'BACKENDLIB_NAMESPACE': 'Swf',
},
)
libsocialweb_backendlib_deps = [
backend_deps,
libsocialweb_dep,
......
......@@ -11,6 +11,14 @@ common_backendlib_vala_flags = [
'--includedir', meson.project_name(),
]
# Namespace Vala file
#
# FIXME: This can be removed once the backend namespaces have been sanitised.
# https://gitlab.gnome.org/GNOME/folks/issues/73
#
# This file sets namespace and version attributes for GIR.
namespace_vala_in = files('namespace.vala.in')
# A subdirectory for each type of backend
subdir('dummy')
subdir('key-file')
......
// FIXME: This can be removed once the backend namespaces have been sanitised.
// https://gitlab.gnome.org/GNOME/folks/issues/73
//
// This file sets namespace and version attributes for GIR.
[CCode (gir_namespace = "@BACKENDLIB_GIR_NAME@", gir_version = "@BACKENDLIB_GIR_VERSION@")]
namespace @BACKENDLIB_NAMESPACE@ { }
......@@ -74,6 +74,16 @@ telepathy_backendlib_sources = files(
'tpf-persona.vala',
)
telepathy_backendlib_sources += configure_file(
input: namespace_vala_in,
output: 'namespace.vala',
configuration: {
'BACKENDLIB_GIR_NAME': telepathy_backendlib_gir_name.split('-')[0],
'BACKENDLIB_GIR_VERSION': folks_api_version,
'BACKENDLIB_NAMESPACE': 'Tpf',
},
)
telepathy_backendlib_deps = [
backend_deps,
telepathy_glib_dep,
......
......@@ -6,6 +6,16 @@ tracker_backendlib_sources = files(
'trf-util.vala',
)
tracker_backendlib_sources += configure_file(
input: namespace_vala_in,
output: 'namespace.vala',
configuration: {
'BACKENDLIB_GIR_NAME': tracker_backendlib_gir_name.split('-')[0],
'BACKENDLIB_GIR_VERSION': folks_api_version,
'BACKENDLIB_NAMESPACE': 'Trf',
},
)
tracker_backendlib_deps = [
backend_deps,
tracker_sparql_dep,
......
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