[gnome-builder] build: remove Vala vapi generation
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: remove Vala vapi generation
- Date: Sat, 4 Jan 2020 02:49:59 +0000 (UTC)
commit 4339cda810ea87ee05234b00611ecfa66947501f
Author: Christian Hergert <chergert redhat com>
Date: Fri Jan 3 18:48:42 2020 -0800
build: remove Vala vapi generation
We no longer need libide vapi, deps, or metadata. So drop all of
this now that our moratorium on Vala code inside of Builder
itself is in place.
meson.build | 1 -
src/Ide.metadata.in | 4 ----
src/libide.deps | 9 ---------
src/meson.build | 32 --------------------------------
src/plugins/meson.build | 3 ++-
5 files changed, 2 insertions(+), 47 deletions(-)
---
diff --git a/meson.build b/meson.build
index da5a5ca27..a11eba445 100644
--- a/meson.build
+++ b/meson.build
@@ -22,7 +22,6 @@ pkglibdir = join_paths(get_option('libdir'), 'gnome-builder')
pkgincludedir = join_paths(get_option('includedir'), 'gnome-builder')
pkggirdir = join_paths(get_option('datadir'),'gnome-builder', 'gir-1.0')
pkgtypelibdir = join_paths(get_option('libdir'), 'gnome-builder', 'girepository-1.0')
-pkgvapidir = join_paths(get_option('datadir'), 'gnome-builder/vapi')
safe_path = get_option('with_safe_path')
diff --git a/src/meson.build b/src/meson.build
index 113a142ad..01554add7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -133,35 +133,3 @@ libide_gir = gnome.generate_gir(gnome_builder,
install_dir_typelib: pkgtypelibdir,
extra_args: gnome_builder_gir_extra_args,
)
-
-configure_file(
- input: 'libide.deps',
- output: 'libide-' + libide_api_version + '.deps',
- copy: true,
- install: true,
- install_dir: pkgvapidir,
-)
-
-configure_file(
- input: 'Ide.metadata.in',
- output: 'Ide-@0@.@1@.metadata'.format(MAJOR_VERSION, MINOR_VERSION),
- copy: true,
-)
-
-libide_vapi = gnome.generate_vapi('libide-' + libide_api_version,
- sources: libide_gir[0],
- install: true,
- install_dir: pkgvapidir,
- metadata_dirs: [meson.current_build_dir()],
- packages: [ 'gio-2.0',
- 'gtk+-3.0',
- 'gtksourceview-4',
- 'json-glib-1.0',
- 'libdazzle-1.0',
- 'libpeas-1.0',
- 'template-glib-1.0',
- 'vte-2.91' ],
-)
-
-# Must be after vapi generation
-subdir('plugins/vala-pack')
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
index dd3dc631c..316fea869 100644
--- a/src/plugins/meson.build
+++ b/src/plugins/meson.build
@@ -75,6 +75,7 @@ subdir('gjs-symbols')
subdir('gradle')
subdir('greeter')
subdir('grep')
+subdir('gvls')
subdir('history')
subdir('html-completion')
subdir('html-preview')
@@ -119,13 +120,13 @@ subdir('testui')
subdir('todo')
subdir('trim-spaces')
subdir('vagrant')
+subdir('vala-pack')
subdir('valgrind')
subdir('vcsui')
subdir('vim')
subdir('waf')
subdir('words')
subdir('xml-pack')
-subdir('gvls')
plugins = static_library('plugins', plugins_sources,
dependencies: plugins_deps,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]