[gnome-builder/wip/chergert/razzledazzle] build: use externally installed template-glib library
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/wip/chergert/razzledazzle] build: use externally installed template-glib library
- Date: Sat, 3 Jun 2017 02:20:16 +0000 (UTC)
commit 37a6501baa8d44d02961c3112c9bce4c928df948
Author: Christian Hergert <chergert redhat com>
Date: Fri Jun 2 19:19:46 2017 -0700
build: use externally installed template-glib library
contrib/tmpl/Template-1.0.metadata | 2 -
contrib/tmpl/meson.build | 180 ----
contrib/tmpl/tmpl-branch-node.c | 262 ------
contrib/tmpl/tmpl-branch-node.h | 43 -
contrib/tmpl/tmpl-condition-node.c | 176 ----
contrib/tmpl/tmpl-condition-node.h | 40 -
contrib/tmpl/tmpl-debug.h.in | 80 --
contrib/tmpl/tmpl-enums.c.in | 42 -
contrib/tmpl/tmpl-enums.h.in | 24 -
contrib/tmpl/tmpl-error.c | 25 -
contrib/tmpl/tmpl-error.h | 58 --
contrib/tmpl/tmpl-expr-eval.c | 1517 -------------------------------
contrib/tmpl/tmpl-expr-node.c | 112 ---
contrib/tmpl/tmpl-expr-node.h | 36 -
contrib/tmpl/tmpl-expr-parser-private.h | 48 -
contrib/tmpl/tmpl-expr-parser.y | 205 -----
contrib/tmpl/tmpl-expr-private.h | 158 ----
contrib/tmpl/tmpl-expr-scanner.l | 185 ----
contrib/tmpl/tmpl-expr-types.h | 96 --
contrib/tmpl/tmpl-expr.c | 351 -------
contrib/tmpl/tmpl-expr.h | 70 --
contrib/tmpl/tmpl-gi-private.h | 38 -
contrib/tmpl/tmpl-gi.c | 393 --------
contrib/tmpl/tmpl-glib.h | 38 -
contrib/tmpl/tmpl-iter-node.c | 188 ----
contrib/tmpl/tmpl-iter-node.h | 42 -
contrib/tmpl/tmpl-iterator.c | 155 ----
contrib/tmpl/tmpl-iterator.h | 54 --
contrib/tmpl/tmpl-lexer.c | 199 ----
contrib/tmpl/tmpl-lexer.h | 49 -
contrib/tmpl/tmpl-node.c | 338 -------
contrib/tmpl/tmpl-node.h | 66 --
contrib/tmpl/tmpl-parser.c | 267 ------
contrib/tmpl/tmpl-parser.h | 48 -
contrib/tmpl/tmpl-scope.c | 362 --------
contrib/tmpl/tmpl-scope.h | 73 --
contrib/tmpl/tmpl-symbol.c | 237 -----
contrib/tmpl/tmpl-symbol.h | 54 --
contrib/tmpl/tmpl-template-locator.c | 207 -----
contrib/tmpl/tmpl-template-locator.h | 57 --
contrib/tmpl/tmpl-template.c | 563 ------------
contrib/tmpl/tmpl-template.h | 76 --
contrib/tmpl/tmpl-text-node.c | 105 ---
contrib/tmpl/tmpl-text-node.h | 37 -
contrib/tmpl/tmpl-token-input-stream.c | 337 -------
contrib/tmpl/tmpl-token-input-stream.h | 43 -
contrib/tmpl/tmpl-token.c | 181 ----
contrib/tmpl/tmpl-token.h | 57 --
contrib/tmpl/tmpl-util-private.h | 36 -
contrib/tmpl/tmpl-util.c | 171 ----
libide/meson.build | 23 +-
meson.build | 2 +-
52 files changed, 13 insertions(+), 8193 deletions(-)
---
diff --git a/libide/meson.build b/libide/meson.build
index 78e0eaa..b7712be 100644
--- a/libide/meson.build
+++ b/libide/meson.build
@@ -610,7 +610,7 @@ libide_deps = [
libgtk_dep,
libpeas_dep,
libdazzle_dep,
- libtmpl_dep,
+ libtemplate_glib_dep,
libxml_dep,
libgd_dep,
libnautilus_dep,
@@ -686,6 +686,7 @@ libide_dep = declare_dependency(
libgtk_dep,
libgtksource_dep,
libdazzle_dep,
+ libtemplate_glib_dep,
libjson_glib_dep ],
link_with: libide,
include_directories: include_directories('.'),
@@ -700,6 +701,7 @@ libide_plugin_dep = declare_dependency(
libgtk_dep,
libgtksource_dep,
libdazzle_dep,
+ libtemplate_glib_dep,
libjson_glib_dep ],
)
@@ -711,8 +713,7 @@ if get_option('with_introspection')
namespace: 'Ide',
symbol_prefix: 'ide',
identifier_prefix: 'Ide',
- link_with: [ libtmpl ],
- includes: [ 'Gio-2.0', 'GtkSource-3.0', 'Peas-1.0', 'Dazzle-1.0', 'Json-1.0', libtmpl_gir[0]
],
+ includes: [ 'Gio-2.0', 'GtkSource-3.0', 'Peas-1.0', 'Dazzle-1.0', 'Json-1.0', 'Template-1.0'
],
install: true,
install_dir_gir: pkggirdir,
install_dir_typelib: pkgtypelibdir,
@@ -734,14 +735,14 @@ if get_option('with_introspection')
install: true,
install_dir: pkgvapidir,
packages: [
- 'gio-2.0',
- 'gtk+-3.0',
- 'gtksourceview-3.0',
- 'libpeas-1.0',
- 'json-glib-1.0',
- 'libdazzle-1.0',
- libtmpl_vapi,
- ],
+ 'gio-2.0',
+ 'gtk+-3.0',
+ 'gtksourceview-3.0',
+ 'json-glib-1.0',
+ 'libdazzle-1.0',
+ 'libpeas-1.0',
+ 'template-glib-1.0',
+ ],
)
endif
diff --git a/meson.build b/meson.build
index 8682d99..acdc1ef 100644
--- a/meson.build
+++ b/meson.build
@@ -126,6 +126,7 @@ libpeas_dep = dependency('libpeas-1.0', version: '>= 1.18.0')
libm_dep = cc.find_library('m', required: false)
libjson_glib_dep = dependency('json-glib-1.0', version: '>= 1.2.0')
libdazzle_dep = dependency('libdazzle-1.0', version: '>= 0.1.0')
+libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.25.2')
if get_option('with_flatpak') or get_option('with_git')
libgit_dep = dependency('libgit2-glib-1.0', version: '>= 0.25.0')
@@ -178,7 +179,6 @@ subdir('contrib/gd')
subdir('contrib/jsonrpc-glib')
subdir('contrib/libeditorconfig')
subdir('contrib/nautilus')
-subdir('contrib/tmpl')
subdir('contrib/xml')
subdir('contrib/gstyle') # Depends on libxml
subdir('libide')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]