[tracker/wip/carlosg/rewrite-bus-impl] build: Cleanse of Vala dependencies
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/carlosg/rewrite-bus-impl] build: Cleanse of Vala dependencies
- Date: Sun, 17 Jul 2022 01:56:58 +0000 (UTC)
commit 848aa0ad7a23e405bb1802281357dc24f496fda7
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Jul 17 02:17:21 2022 +0200
build: Cleanse of Vala dependencies
.gitlab-ci.yml | 3 +--
meson.build | 6 +-----
src/libtracker-sparql/meson.build | 10 ----------
3 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25cdd5cec..347b26d02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,7 +107,7 @@ check-merge-request:
.tracker.alpine@common:
variables:
BASE_TAG: '2022-03-07.0'
- FDO_DISTRIBUTION_PACKAGES: 'alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev
gobject-introspection-dev gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson py3-gobject3
py3-setuptools py3-tappy sqlite-dev vala gcovr'
+ FDO_DISTRIBUTION_PACKAGES: 'alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev
gobject-introspection-dev gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson py3-gobject3
py3-setuptools py3-tappy sqlite-dev gcovr'
.tracker.fedora:35@x86_64:
extends: .tracker.fedora@common
@@ -294,7 +294,6 @@ build-alpine-latest@x86_64:
- gcovr --root=.. --filter='\.\./src/'
--exclude=../utils --exclude=../examples --exclude=../docs/reference
--exclude='\.\./build/.*\.[ch]$' --exclude='.*/tests/.*\.[ch]$'
- --exclude='\.\./src/.*\.vala$'
--json --print-summary --output=../coverage-${CI_JOB_NAME}.json 2>/dev/null
- popd
- |
diff --git a/meson.build b/meson.build
index ebb9acca1..a34364b66 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('tracker', 'c', 'vala',
+project('tracker', 'c',
version: '3.4.0.alpha',
meson_version: '>=0.51',
default_options: [
@@ -122,10 +122,6 @@ add_project_arguments('-DTRACKER_COMPILATION',
'-DG_LOG_DOMAIN="Tracker"',
'-DG_LOG_STRUCTURED=1',
language: 'c')
-add_project_arguments(['-D', 'TRACKER_COMPILATION'],
- ['-D', 'G_LOG_DOMAIN="Tracker"'],
- ['-D', 'G_LOG_STRUCTURED=1'],
- language: 'vala')
if get_option('buildtype') == 'plain'
# Default case is to allow TRACKER_DEBUG which is very useful for
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index 149dfd33d..4891f288d 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -19,7 +19,6 @@ enum_types = gnome.mkenums('tracker-sparql-enum-types',
)
tracker_sparql_vapi = files('tracker-sparql.vapi')
-tracker_sparql_vapi_dep = meson.get_compiler('vala').find_library('tracker-sparql', dirs:
meson.current_source_dir())
libtracker_sparql_c_sources = files(
'tracker-batch.c',
@@ -90,7 +89,6 @@ install_data(
libtracker_sparql_dependencies = [
tracker_common_dep,
- tracker_sparql_vapi_dep,
gmodule,
libdl,
json_glib,
@@ -114,14 +112,6 @@ libtracker_sparql_private = static_library('tracker-sparql-private',
'-DBUILDROOT="@0@"'.format(meson.build_root()),
] + tracker_c_args,
- vala_args: [
- '--debug',
- '--pkg', 'posix',
- # FIXME: Meson has code to add --target-glib automatically, but it
- # doesn't seem to work here.
- '--target-glib', glib_required,
- ],
-
dependencies: [libtracker_sparql_dependencies],
gnu_symbol_visibility: 'hidden',
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]