[tracker/wip/carlosg/batches-and-resources: 1/11] libtracker-sparql: Define version numbers in headers
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/carlosg/batches-and-resources: 1/11] libtracker-sparql: Define version numbers in headers
- Date: Thu, 26 Nov 2020 22:28:27 +0000 (UTC)
commit 5c4cf8d4d4f32751c4fe76fa992850b1d35bd65a
Author: Carlos Garnacho <carlosg gnome org>
Date: Sat Nov 21 21:23:47 2020 +0100
libtracker-sparql: Define version numbers in headers
This went missed, probably sometime along the meson port. This unbreaks
TRACKER_CHECK_VERSION, and allows using it in other macros.
.../libtracker-sparql-sections.txt | 3 +++
src/libtracker-sparql/meson.build | 6 +++++
src/libtracker-sparql/tracker-private.h | 5 ++--
src/libtracker-sparql/tracker-sparql.h | 1 +
.../tracker-version-generated.h.meson.in | 28 ++++++++++++++++++++++
5 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt
b/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt
index e78d96b0a..efa6ee820 100644
--- a/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt
+++ b/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt
@@ -274,6 +274,9 @@ tracker_interface_age
tracker_check_version
<SUBSECTION>
+TRACKER_MAJOR_VERSION
+TRACKER_MINOR_VERSION
+TRACKER_MICRO_VERSION
TRACKER_CHECK_VERSION
<SUBSECTION Private>
TRACKER_AVAILABLE_IN_ALL
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index 465185753..073a62162 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -1,3 +1,8 @@
+version_header = configure_file(
+ input: 'tracker-version-generated.h.meson.in',
+ output: 'tracker-version-generated.h',
+ configuration: conf)
+
enum_types = gnome.mkenums('tracker-sparql-enum-types',
sources: ['tracker-notifier.h', 'tracker-connection.h'],
c_template: 'tracker-sparql-enum-types.c.template',
@@ -59,6 +64,7 @@ install_headers(
libtracker_sparql_c_public_headers,
'tracker-ontologies.h',
'tracker-sparql.h',
+ version_header,
subdir: 'tracker-@0@/libtracker-sparql'.format(tracker_api_version))
install_data(
diff --git a/src/libtracker-sparql/tracker-private.h b/src/libtracker-sparql/tracker-private.h
index d91f6e7f4..7b96a855b 100644
--- a/src/libtracker-sparql/tracker-private.h
+++ b/src/libtracker-sparql/tracker-private.h
@@ -20,8 +20,9 @@
#ifndef __TRACKER_PRIVATE_H__
#define __TRACKER_PRIVATE_H__
-#include "tracker-cursor.h"
-#include "tracker-endpoint-dbus.h"
+#include <libtracker-sparql/tracker-version-generated.h>
+#include <libtracker-sparql/tracker-cursor.h>
+#include <libtracker-sparql/tracker-endpoint-dbus.h>
typedef struct _TrackerSparqlConnectionClass TrackerSparqlConnectionClass;
diff --git a/src/libtracker-sparql/tracker-sparql.h b/src/libtracker-sparql/tracker-sparql.h
index 60432ff6a..a9f3badad 100644
--- a/src/libtracker-sparql/tracker-sparql.h
+++ b/src/libtracker-sparql/tracker-sparql.h
@@ -22,6 +22,7 @@
#define __LIBTRACKER_SPARQL_INSIDE__
+#include <libtracker-sparql/tracker-version-generated.h>
#include <libtracker-sparql/tracker-version.h>
#include <libtracker-sparql/tracker-error.h>
#include <libtracker-sparql/tracker-connection.h>
diff --git a/src/libtracker-sparql/tracker-version-generated.h.meson.in
b/src/libtracker-sparql/tracker-version-generated.h.meson.in
new file mode 100644
index 000000000..6bff961b1
--- /dev/null
+++ b/src/libtracker-sparql/tracker-version-generated.h.meson.in
@@ -0,0 +1,28 @@
+/* Generated by meson */
+
+/**
+ * TRACKER_MAJOR_VERSION:
+ *
+ * The major version of the Tracker library.
+ *
+ * Like #tracker_major_version, but intended to be used at application compile time.
+ */
+#mesondefine TRACKER_MAJOR_VERSION
+
+/**
+ * TRACKER_MINOR_VERSION:
+ *
+ * The minor version of the Tracker library.
+ *
+ * Like #tracker_minor_version, but intended to be used at application compile time.
+ */
+#mesondefine TRACKER_MINOR_VERSION
+
+/**
+ * TRACKER_MICRO_VERSION:
+ *
+ * The micro version of the Tracker library.
+ *
+ * Like #tracker_micro_version, but intended to be used at application compile time.
+ */
+#mesondefine TRACKER_MICRO_VERSION
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]