[gnome-builder] build: terminal is no longer optional
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: terminal is no longer optional
- Date: Wed, 11 Oct 2017 21:31:17 +0000 (UTC)
commit 67486675d0bbe438d62ac0d3dbab1fc20b150f13
Author: Christian Hergert <chergert redhat com>
Date: Wed Oct 11 14:31:03 2017 -0700
build: terminal is no longer optional
Using Builder without the terminal plugin is essentially non-functional
because we use it for VtePty to create PTYs.
meson_options.txt | 1 -
src/plugins/meson.build | 1 -
src/plugins/project-tree/meson.build | 6 ++----
src/plugins/terminal/meson.build | 4 ----
4 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/meson_options.txt b/meson_options.txt
index f44a49e..6687c22 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -67,7 +67,6 @@ option('with_support', type: 'boolean')
option('with_symbol_tree', type: 'boolean')
option('with_sysmon', type: 'boolean')
option('with_sysprof', type: 'boolean')
-option('with_terminal', type: 'boolean')
option('with_todo', type: 'boolean')
option('with_vala_pack', type: 'boolean')
option('with_valgrind', type: 'boolean')
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
index 300ef1d..1039193 100644
--- a/src/plugins/meson.build
+++ b/src/plugins/meson.build
@@ -136,7 +136,6 @@ status += [
'Symbol Tree ........... : @0@'.format(get_option('with_symbol_tree')),
'System Monitor ........ : @0@'.format(get_option('with_sysmon')),
'Sysprof Profiler ...... : @0@'.format(get_option('with_sysprof')),
- 'Terminal .............. : @0@'.format(get_option('with_terminal')),
'Todo .................. : @0@'.format(get_option('with_todo')),
'Vala Language Pack .... : @0@'.format(get_option('with_vala_pack')),
'Valgrind .............. : @0@'.format(get_option('with_valgrind')),
diff --git a/src/plugins/project-tree/meson.build b/src/plugins/project-tree/meson.build
index ac178a6..c18d31b 100644
--- a/src/plugins/project-tree/meson.build
+++ b/src/plugins/project-tree/meson.build
@@ -28,10 +28,8 @@ project_tree_sources = [
'project-tree-plugin.c',
]
-if get_option('with_terminal')
- gnome_builder_plugins_deps += dependency('vte-2.91', version: '>=0.40.2')
- gnome_builder_plugins_args += '-DHAVE_VTE'
-endif
+gnome_builder_plugins_deps += dependency('vte-2.91', version: '>=0.40.2')
+gnome_builder_plugins_args += '-DHAVE_VTE'
gnome_builder_plugins_sources += files(project_tree_sources)
gnome_builder_plugins_sources += project_tree_resources[0]
diff --git a/src/plugins/terminal/meson.build b/src/plugins/terminal/meson.build
index 5b65c67..46f3572 100644
--- a/src/plugins/terminal/meson.build
+++ b/src/plugins/terminal/meson.build
@@ -1,5 +1,3 @@
-if get_option('with_terminal')
-
terminal_resources = gnome.compile_resources(
'terminal-resources',
'terminal.gresource.xml',
@@ -31,5 +29,3 @@ gnome_builder_plugins_deps += [
gnome_builder_plugins_sources += files(terminal_sources)
gnome_builder_plugins_sources += terminal_resources[0]
-
-endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]