[gnome-builder/wip/chergert/razzledazzle: 7/20] build: remove librg in favor of libdazzle
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/wip/chergert/razzledazzle: 7/20] build: remove librg in favor of libdazzle
- Date: Mon, 5 Jun 2017 20:58:12 +0000 (UTC)
commit 14b96dd924720cc1c652fd886dedfb114848eff0
Author: Christian Hergert <chergert redhat com>
Date: Fri Jun 2 15:14:56 2017 -0700
build: remove librg in favor of libdazzle
Dazzle now provides our CPU graphs so we can drop that code from Builder.
contrib/rg/meson.build | 41 ---
contrib/rg/realtime-graphs.h | 36 ---
contrib/rg/rg-column-private.h | 49 ----
contrib/rg/rg-column.c | 305 --------------------
contrib/rg/rg-column.h | 43 ---
contrib/rg/rg-cpu-graph.c | 184 ------------
contrib/rg/rg-cpu-graph.h | 34 ---
contrib/rg/rg-cpu-table.c | 329 ---------------------
contrib/rg/rg-cpu-table.h | 34 ---
contrib/rg/rg-graph.c | 415 ---------------------------
contrib/rg/rg-graph.h | 48 ---
contrib/rg/rg-line-renderer.c | 324 ---------------------
contrib/rg/rg-line-renderer.h | 41 ---
contrib/rg/rg-renderer.c | 58 ----
contrib/rg/rg-renderer.h | 57 ----
contrib/rg/rg-ring.c | 206 --------------
contrib/rg/rg-ring.h | 80 ------
contrib/rg/rg-table.c | 568 -------------------------------------
contrib/rg/rg-table.h | 73 -----
contrib/rg/rg.map | 6 -
meson.build | 1 -
plugins/sysmon/gb-sysmon-panel.c | 6 +-
plugins/sysmon/gb-sysmon-panel.ui | 2 +-
plugins/sysmon/meson.build | 6 +-
tests/meson.build | 10 -
25 files changed, 5 insertions(+), 2951 deletions(-)
---
diff --git a/meson.build b/meson.build
index 641d817..b77f926 100644
--- a/meson.build
+++ b/meson.build
@@ -178,7 +178,6 @@ subdir('contrib/gd')
subdir('contrib/jsonrpc-glib')
subdir('contrib/libeditorconfig')
subdir('contrib/nautilus')
-subdir('contrib/rg')
subdir('contrib/search')
subdir('contrib/tmpl')
subdir('contrib/xml')
diff --git a/plugins/sysmon/gb-sysmon-panel.c b/plugins/sysmon/gb-sysmon-panel.c
index 7bd302c..c21e56c 100644
--- a/plugins/sysmon/gb-sysmon-panel.c
+++ b/plugins/sysmon/gb-sysmon-panel.c
@@ -16,14 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <realtime-graphs.h>
+#include <dazzle.h>
#include "gb-sysmon-panel.h"
struct _GbSysmonPanel
{
DzlDockWidget parent_instance;
- RgCpuGraph *cpu_graph;
+ DzlCpuGraph *cpu_graph;
};
G_DEFINE_TYPE (GbSysmonPanel, gb_sysmon_panel, DZL_TYPE_DOCK_WIDGET)
@@ -45,7 +45,7 @@ gb_sysmon_panel_class_init (GbSysmonPanelClass *klass)
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/builder/plugins/sysmon/gb-sysmon-panel.ui");
gtk_widget_class_bind_template_child (widget_class, GbSysmonPanel, cpu_graph);
- g_type_ensure (RG_TYPE_CPU_GRAPH);
+ g_type_ensure (DZL_TYPE_CPU_GRAPH);
}
static void
diff --git a/plugins/sysmon/gb-sysmon-panel.ui b/plugins/sysmon/gb-sysmon-panel.ui
index 4dcbf37..be3c093 100644
--- a/plugins/sysmon/gb-sysmon-panel.ui
+++ b/plugins/sysmon/gb-sysmon-panel.ui
@@ -5,7 +5,7 @@
<property name="title" translatable="yes">System Monitor</property>
<property name="visible">true</property>
<child>
- <object class="RgCpuGraph" id="cpu_graph">
+ <object class="DzlCpuGraph" id="cpu_graph">
<property name="expand">true</property>
<property name="visible">true</property>
<property name="timespan">30000000</property>
diff --git a/plugins/sysmon/meson.build b/plugins/sysmon/meson.build
index a288254..895763c 100644
--- a/plugins/sysmon/meson.build
+++ b/plugins/sysmon/meson.build
@@ -15,12 +15,8 @@ sysmon_sources = [
'gb-sysmon-addin.h',
]
-sysmon_deps = plugin_deps + [
- librg_dep,
-]
-
shared_module('sysmon', sysmon_sources,
- dependencies: sysmon_deps,
+ dependencies: plugin_deps,
link_args: plugin_link_args,
link_depends: plugin_link_deps,
install: true,
diff --git a/tests/meson.build b/tests/meson.build
index a8a0de7..2d8d06d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -116,16 +116,6 @@ test('test-vim', test_vim,
)
-test_cpu_graph = executable('test-cpu-graph',
- 'test-cpu-graph.c',
- c_args: ide_test_cflags,
- dependencies: [libide_dep, librg_dep],
-)
-#test('test-cpu-graph', test_cpu_graph,
-# env: ide_test_env,
-#)
-
-
test_snippet_parser = executable('test-snippet-parser',
'test-snippet-parser.c',
c_args: ide_test_cflags,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]