[gnome-builder] build: Fallback to bundled template-glib
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: Fallback to bundled template-glib
- Date: Tue, 6 Jun 2017 21:04:12 +0000 (UTC)
commit b7c3476a1d728ab8fac4767cb8a4e04019e6c231
Author: Patrick Griffis <tingping tingping se>
Date: Tue Jun 6 16:51:45 2017 -0400
build: Fallback to bundled template-glib
.gitmodules | 3 +++
libide/meson.build | 4 ++--
meson.build | 16 +++++++++++++++-
subprojects/template-glib | 1 +
4 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index c73af41..c314dcf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
[submodule "subprojects/jsonrpc-glib"]
path = subprojects/jsonrpc-glib
url = https://git.gnome.org/browse/jsonrpc-glib
+[submodule "subprojects/template-glib"]
+ path = subprojects/template-glib
+ url = https://git.gnome.org/browse/template-glib
diff --git a/libide/meson.build b/libide/meson.build
index 241e51e..33d8d8d 100644
--- a/libide/meson.build
+++ b/libide/meson.build
@@ -702,7 +702,7 @@ if get_option('with_introspection')
namespace: 'Ide',
symbol_prefix: 'ide',
identifier_prefix: 'Ide',
- includes: [ 'Gio-2.0', 'GtkSource-3.0', 'Peas-1.0', 'Dazzle-1.0', 'Json-1.0', 'Template-1.0'
],
+ includes: [ 'Gio-2.0', 'GtkSource-3.0', 'Peas-1.0', 'Dazzle-1.0', 'Json-1.0',
libtemplate_glib_gir ],
install: true,
install_dir_gir: pkggirdir,
install_dir_typelib: pkgtypelibdir,
@@ -730,7 +730,7 @@ if get_option('with_introspection')
'json-glib-1.0',
'libdazzle-1.0',
'libpeas-1.0',
- 'template-glib-1.0',
+ libtemplate_glib_vapi,
],
)
diff --git a/meson.build b/meson.build
index 2b35058..84ddffa 100644
--- a/meson.build
+++ b/meson.build
@@ -132,11 +132,25 @@ 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')
+libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.25.2', required: false)
libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.25.2',
fallback: ['jsonrpc-glib', 'libjsonrpc_glib_dep']
)
+libtemplate_glib_gir = 'Template-1.0'
+libtemplate_glib_vapi = 'template-glib-1.0'
+if not libtemplate_glib_dep.found()
+ libtemplate_glib = subproject('template-glib',
+ default_options: [
+ 'with_introspection=true',
+ 'with_vapi=true'
+ ]
+ )
+ libtemplate_glib_dep = libtemplate_glib.get_variable('libtemplate_glib_dep')
+ libtemplate_glib_gir = libtemplate_glib.get_variable('libtemplate_glib_gir')[0]
+ libtemplate_glib_vapi = libtemplate_glib.get_variable('libtemplate_glib_vapi')
+endif
+
libgd = subproject('libgd',
default_options: [
'static=false',
diff --git a/subprojects/template-glib b/subprojects/template-glib
new file mode 160000
index 0000000..560a3f8
--- /dev/null
+++ b/subprojects/template-glib
@@ -0,0 +1 @@
+Subproject commit 560a3f8cffe5e5f0a3945a3cf5ac9f0c13660a3a
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]