[tracker/sam/merge-libraries: 18/19] Merge libtracker-sparql-backend with libtracker-sparql

[Carlos Garnacho <carlosg src gnome org>]

commit a2d6b0820d72c98ab045e4dc6843cef6d9575b2e
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Jun 22 16:02:57 2020 +0200

    Merge libtracker-sparql-backend with libtracker-sparql
    
    One more step towards the unification of libtracker-sparql.

 src/libtracker-sparql-backend/.gitignore           |  1 -
 src/libtracker-sparql-backend/meson.build          | 65 ---------------------
 .../bus/.gitignore                                 |  0
 .../bus/meson.build                                |  0
 .../bus/tracker-bus-fd-cursor.vala                 |  0
 .../bus/tracker-bus-statement.vala                 |  0
 .../bus/tracker-bus.vala                           |  0
 .../bus/tracker-namespace.vala                     |  0
 .../direct/meson.build                             |  0
 .../direct/tracker-direct-statement.c              |  0
 .../direct/tracker-direct-statement.h              |  0
 .../direct/tracker-direct.c                        |  0
 .../direct/tracker-direct.h                        |  0
 .../direct/tracker-direct.vapi                     |  0
 src/libtracker-sparql/meson.build                  | 66 ++++++++++++++++++++++
 .../remote/meson.build                             |  0
 .../remote/tracker-json-cursor.vala                |  0
 .../remote/tracker-remote.vala                     |  0
 .../remote/tracker-xml-cursor.vala                 |  0
 .../tracker-backend.vala                           |  0
 src/meson.build                                    | 11 ++--
 21 files changed, 70 insertions(+), 73 deletions(-)
---
diff --git a/src/libtracker-sparql-backend/bus/.gitignore b/src/libtracker-sparql/bus/.gitignore
similarity index 100%
rename from src/libtracker-sparql-backend/bus/.gitignore
rename to src/libtracker-sparql/bus/.gitignore
diff --git a/src/libtracker-sparql-backend/bus/meson.build b/src/libtracker-sparql/bus/meson.build
similarity index 100%
rename from src/libtracker-sparql-backend/bus/meson.build
rename to src/libtracker-sparql/bus/meson.build
diff --git a/src/libtracker-sparql-backend/bus/tracker-bus-fd-cursor.vala 
b/src/libtracker-sparql/bus/tracker-bus-fd-cursor.vala
similarity index 100%
rename from src/libtracker-sparql-backend/bus/tracker-bus-fd-cursor.vala
rename to src/libtracker-sparql/bus/tracker-bus-fd-cursor.vala
diff --git a/src/libtracker-sparql-backend/bus/tracker-bus-statement.vala 
b/src/libtracker-sparql/bus/tracker-bus-statement.vala
similarity index 100%
rename from src/libtracker-sparql-backend/bus/tracker-bus-statement.vala
rename to src/libtracker-sparql/bus/tracker-bus-statement.vala
diff --git a/src/libtracker-sparql-backend/bus/tracker-bus.vala b/src/libtracker-sparql/bus/tracker-bus.vala
similarity index 100%
rename from src/libtracker-sparql-backend/bus/tracker-bus.vala
rename to src/libtracker-sparql/bus/tracker-bus.vala
diff --git a/src/libtracker-sparql-backend/bus/tracker-namespace.vala 
b/src/libtracker-sparql/bus/tracker-namespace.vala
similarity index 100%
rename from src/libtracker-sparql-backend/bus/tracker-namespace.vala
rename to src/libtracker-sparql/bus/tracker-namespace.vala
diff --git a/src/libtracker-sparql-backend/direct/meson.build b/src/libtracker-sparql/direct/meson.build
similarity index 100%
rename from src/libtracker-sparql-backend/direct/meson.build
rename to src/libtracker-sparql/direct/meson.build
diff --git a/src/libtracker-sparql-backend/direct/tracker-direct-statement.c 
b/src/libtracker-sparql/direct/tracker-direct-statement.c
similarity index 100%
rename from src/libtracker-sparql-backend/direct/tracker-direct-statement.c
rename to src/libtracker-sparql/direct/tracker-direct-statement.c
diff --git a/src/libtracker-sparql-backend/direct/tracker-direct-statement.h 
b/src/libtracker-sparql/direct/tracker-direct-statement.h
similarity index 100%
rename from src/libtracker-sparql-backend/direct/tracker-direct-statement.h
rename to src/libtracker-sparql/direct/tracker-direct-statement.h
diff --git a/src/libtracker-sparql-backend/direct/tracker-direct.c 
b/src/libtracker-sparql/direct/tracker-direct.c
similarity index 100%
rename from src/libtracker-sparql-backend/direct/tracker-direct.c
rename to src/libtracker-sparql/direct/tracker-direct.c
diff --git a/src/libtracker-sparql-backend/direct/tracker-direct.h 
b/src/libtracker-sparql/direct/tracker-direct.h
similarity index 100%
rename from src/libtracker-sparql-backend/direct/tracker-direct.h
rename to src/libtracker-sparql/direct/tracker-direct.h
diff --git a/src/libtracker-sparql-backend/direct/tracker-direct.vapi 
b/src/libtracker-sparql/direct/tracker-direct.vapi
similarity index 100%
rename from src/libtracker-sparql-backend/direct/tracker-direct.vapi
rename to src/libtracker-sparql/direct/tracker-direct.vapi
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index f50bae559..4e37a0a25 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -69,3 +69,69 @@ install_data(
     rename: ['tracker-sparql-' + tracker_api_version + '.deps'],
     install_dir: vapi_dir,
 )
+
+subdir('bus')
+subdir('direct')
+subdir('remote')
+
+libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
+    '../libtracker-common/libtracker-common.vapi',
+    '../libtracker-data/libtracker-data.vapi',
+    'direct/tracker-direct.vapi',
+    'tracker-backend.vala',
+
+    gnu_symbol_visibility: 'hidden',
+
+    soversion: soversion,
+    version: libversion,
+
+    install: true,
+    install_rpath: tracker_internal_libs_dir,
+
+    c_args: [
+       '-include', 'libtracker-sparql/tracker-private.h',
+    ],
+
+    link_whole: [libtracker_sparql_intermediate],
+
+    dependencies: [tracker_common_dep, tracker_sparql_remote_dep, tracker_sparql_bus_dep, 
tracker_sparql_direct_dep, tracker_sparql_vapi_dep],
+)
+
+tracker_sparql_dep = declare_dependency(
+    link_with: libtracker_sparql,
+    include_directories: srcinc,
+    dependencies: [tracker_common_dep],
+)
+
+pkg.generate(libtracker_sparql,
+    description: 'Tracker : A SPARQL triple store library',
+    requires: [glib, gio, gobject, gmodule],
+    subdirs: [
+        'tracker-' + tracker_api_version,
+        'tracker-' + tracker_api_version / 'libtracker-sparql',
+    ],
+    variables: [
+        'exec_prefix=${prefix}',
+        'libexecdir=${prefix}' / get_option('libexecdir'),
+        'datadir=${prefix}' / get_option('datadir'),
+        'tracker_datadir=${datadir}' / tracker_versioned_name,
+        'ontologies_dir=' + tracker_ontologies_dir,
+    ],
+)
+
+tracker_sparql_gir = gnome.generate_gir(libtracker_sparql,
+    sources: libtracker_sparql_c_sources + libtracker_sparql_c_public_headers,
+    nsversion: tracker_api_version,
+    namespace: 'Tracker',
+    identifier_prefix: 'Tracker',
+    symbol_prefix: 'tracker',
+    includes : ['GLib-2.0', 'GObject-2.0', 'Gio-2.0' ],
+    link_with: libtracker_sparql,
+    install: true,
+    extra_args: [
+        '--c-include',
+        'libtracker-sparql/tracker-sparql.h',
+        '-DTRACKER_COMPILATION',
+    ])
+
+tracker_sparql_uninstalled_dir = meson.current_build_dir()
diff --git a/src/libtracker-sparql-backend/remote/meson.build b/src/libtracker-sparql/remote/meson.build
similarity index 100%
rename from src/libtracker-sparql-backend/remote/meson.build
rename to src/libtracker-sparql/remote/meson.build
diff --git a/src/libtracker-sparql-backend/remote/tracker-json-cursor.vala 
b/src/libtracker-sparql/remote/tracker-json-cursor.vala
similarity index 100%
rename from src/libtracker-sparql-backend/remote/tracker-json-cursor.vala
rename to src/libtracker-sparql/remote/tracker-json-cursor.vala
diff --git a/src/libtracker-sparql-backend/remote/tracker-remote.vala 
b/src/libtracker-sparql/remote/tracker-remote.vala
similarity index 100%
rename from src/libtracker-sparql-backend/remote/tracker-remote.vala
rename to src/libtracker-sparql/remote/tracker-remote.vala
diff --git a/src/libtracker-sparql-backend/remote/tracker-xml-cursor.vala 
b/src/libtracker-sparql/remote/tracker-xml-cursor.vala
similarity index 100%
rename from src/libtracker-sparql-backend/remote/tracker-xml-cursor.vala
rename to src/libtracker-sparql/remote/tracker-xml-cursor.vala
diff --git a/src/libtracker-sparql-backend/tracker-backend.vala b/src/libtracker-sparql/tracker-backend.vala
similarity index 100%
rename from src/libtracker-sparql-backend/tracker-backend.vala
rename to src/libtracker-sparql/tracker-backend.vala
diff --git a/src/meson.build b/src/meson.build
index 87d41623f..2f9817ece 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,11 +1,6 @@
 # Shared common code
 subdir('libtracker-common')
 
-# Intermediate library of RDF & SPARQL helper functions.
-# This gets used internally and also becomes part of the
-# public libtracker-sparql library.
-subdir('libtracker-sparql')
-
 # Public ontologies
 subdir('ontologies')
 
@@ -14,8 +9,10 @@ subdir('gvdb')
 subdir('libtracker-fts')
 subdir('libtracker-data')
 
-# Public libtracker-sparql library
-subdir('libtracker-sparql-backend')
+# Intermediate library of RDF & SPARQL helper functions.
+# This gets used internally and also becomes part of the
+# public libtracker-sparql library.
+subdir('libtracker-sparql')
 
 # Public commandline control tool
 subdir('tracker')