gnome-build r576 - in trunk: . src/backends/libgbf_am src/backends/libgbf_mkfile src/gbf
- From: jhs svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-build r576 - in trunk: . src/backends/libgbf_am src/backends/libgbf_mkfile src/gbf
- Date: Thu, 19 Jun 2008 13:09:53 +0000 (UTC)
Author: jhs
Date: Thu Jun 19 13:09:53 2008
New Revision: 576
URL: http://svn.gnome.org/viewvc/gnome-build?rev=576&view=rev
Log:
2008-06-19 Johannes Schmid <jhs gnome org>
* configure.in:
* src/backends/libgbf_am/Makefile.am:
* src/backends/libgbf_am/gbf-am-build.c:
* src/backends/libgbf_am/gbf-am-build.h:
* src/backends/libgbf_am/gbf-am-project.c
(gbf_am_project_class_init), (gbf_am_project_dispose):
* src/backends/libgbf_am/gbf-am-project.h:
* src/backends/libgbf_mkfile/Makefile.am:
* src/backends/libgbf_mkfile/gbf-mkfile-build.c:
* src/backends/libgbf_mkfile/gbf-mkfile-build.h:
* src/backends/libgbf_mkfile/gbf-mkfile-project.c
(gbf_mkfile_project_class_init), (gbf_mkfile_project_dispose):
* src/backends/libgbf_mkfile/gbf-mkfile-project.h:
* src/gbf/Makefile.am:
* src/gbf/gbf-project.c (gbf_project_class_init):
* src/gbf/gbf-project.h:
Removed deprecated and unused build code thus removing the regex depency
(#463561 and #538952)
Removed:
trunk/src/backends/libgbf_am/gbf-am-build.c
trunk/src/backends/libgbf_am/gbf-am-build.h
trunk/src/backends/libgbf_mkfile/gbf-mkfile-build.c
trunk/src/backends/libgbf_mkfile/gbf-mkfile-build.h
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/src/backends/libgbf_am/Makefile.am
trunk/src/backends/libgbf_am/gbf-am-project.c
trunk/src/backends/libgbf_am/gbf-am-project.h
trunk/src/backends/libgbf_mkfile/Makefile.am
trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.c
trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.h
trunk/src/gbf/Makefile.am
trunk/src/gbf/gbf-project.c
trunk/src/gbf/gbf-project.h
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Thu Jun 19 13:09:53 2008
@@ -136,11 +136,6 @@
AM_GLIB_GNU_GETTEXT
AM_GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR)
-# Check for GNU regex functions
-AH_TEMPLATE(NATIVE_GNU_REGEX, [Define if the C library implements the GNU regular expressions API])
-AC_CHECK_FUNCS([re_compile_pattern re_compile_fastmap re_search re_match], [
- AC_DEFINE(NATIVE_GNU_REGEX)
-])
# Set location for backends installation
gbf_save_prefix="$prefix"
Modified: trunk/src/backends/libgbf_am/Makefile.am
==============================================================================
--- trunk/src/backends/libgbf_am/Makefile.am (original)
+++ trunk/src/backends/libgbf_am/Makefile.am Thu Jun 19 13:09:53 2008
@@ -19,8 +19,6 @@
libgbf_am_la_SOURCES = \
gbf-am-project.c \
gbf-am-project.h \
- gbf-am-build.c \
- gbf-am-build.h \
gbf-am-config.c \
gbf-am-config.h \
gbf-am-properties.c \
Modified: trunk/src/backends/libgbf_am/gbf-am-project.c
==============================================================================
--- trunk/src/backends/libgbf_am/gbf-am-project.c (original)
+++ trunk/src/backends/libgbf_am/gbf-am-project.c Thu Jun 19 13:09:53 2008
@@ -44,7 +44,6 @@
#include <gbf/glue-plugin.h>
#include "gbf-i18n.h"
#include "gbf-am-project.h"
-#include "gbf-am-build.h"
#include "gbf-am-config.h"
#include "gbf-am-properties.h"
@@ -188,13 +187,6 @@
Private prototypes
---------------------------------------------------------------------- */
-#ifdef NATIVE_GNU_REGEX
-static gboolean queue_check (GbfAmProject *project);
-static void queue_push_op (GbfAmProject *project,
- GbfAmProjectOp *op);
-#endif /* NATIVE_GNU_REGEX */
-static void queue_destroy (GbfAmProject *project);
-
static gboolean uri_is_equal (const gchar *uri1,
const gchar *uri2);
static gboolean uri_is_parent (const gchar *parent_uri,
@@ -290,115 +282,6 @@
* - Operations are added to the head and retrieved from the tail
*/
-#ifdef NATIVE_GNU_REGEX
-
-static gboolean
-queue_check (GbfAmProject *project)
-{
- GbfAmProjectOp *op;
-
- g_return_val_if_fail (project != NULL, FALSE);
- g_return_val_if_fail (GBF_IS_AM_PROJECT (project), FALSE);
-
- g_assert (project->queue_ops != NULL);
-
- if (g_queue_is_empty (project->queue_ops)) {
- project->queue_handler_tag = 0;
- return FALSE;
- }
-
- op = g_queue_pop_tail (project->queue_ops);
-
- switch (op->type) {
- case BUILD:
- {
- gchar *project_root = uri_to_path (project->project_root_uri);
-
- /* FIXME: gbf_build_run can be simpler */
- gbf_build_run (project, op->build_id,
- project_root,
- project->callbacks);
-
- g_free (op->build_id);
- g_free (project_root);
-
- break;
- }
- }
-
- g_free (op);
-
- /* FIXME: this matches the old behavior, but it's wrong */
- if (g_queue_is_empty (project->queue_ops)) {
- project->queue_handler_tag = 0;
- return FALSE;
- }
-
- return TRUE;
-}
-
-static void
-queue_push_op (GbfAmProject *project, GbfAmProjectOp *op)
-{
- g_return_if_fail (project != NULL);
- g_return_if_fail (GBF_IS_AM_PROJECT (project));
- g_return_if_fail (op != NULL);
-
- g_assert (project->queue_ops != NULL);
-
- g_queue_push_head (project->queue_ops, op);
-
- if (project->queue_handler_tag == 0)
- project->queue_handler_tag = g_idle_add ((GSourceFunc) queue_check, project);
-}
-#endif /* NATIVE_GNU_REGEX */
-
-static void
-queue_destroy (GbfAmProject *project)
-{
- g_return_if_fail (project != NULL);
- g_return_if_fail (GBF_IS_AM_PROJECT (project));
-
- if (project->queue_ops) {
- GbfAmProjectOp *op;
- while ((op = g_queue_pop_tail (project->queue_ops)) != NULL)
- g_free (op);
- g_queue_free (project->queue_ops);
- project->queue_ops = NULL;
- }
-
- if (project->queue_handler_tag) {
- g_source_remove (project->queue_handler_tag);
- project->queue_handler_tag = 0;
- }
-}
-
-/*
- * Callbacks bookkeepping -----------------------------
- */
-
-static int
-find_callback (gconstpointer a, gconstpointer b)
-{
- GbfAmBuildCallback *cb = (GbfAmBuildCallback *)a;
- if (cb->callback == b)
- return 0;
- else
- return -1;
-}
-
-static void
-callbacks_destroy (GbfAmProject *project)
-{
- g_return_if_fail (project != NULL);
- g_return_if_fail (GBF_IS_AM_PROJECT (project));
-
- /* FIXME */
- g_list_free (project->callbacks);
- project->callbacks = NULL;
-}
-
-
/*
* URI and path manipulation functions -----------------------------
*/
@@ -2731,53 +2614,6 @@
}
}
-static void
-impl_build (GbfProject *_project,
- const gchar *id,
- GError **error)
-{
-#ifdef NATIVE_GNU_REGEX
- GbfAmProject *project;
- GbfAmProjectOp *op;
-
- g_return_if_fail (GBF_IS_AM_PROJECT (_project));
-
- project = GBF_AM_PROJECT (_project);
- op = g_new0 (GbfAmProjectOp, 1);
- op->project = project;
- op->type = BUILD;
-
- op->build_id = g_strdup (id);
- queue_push_op (project, op);
-#else /* NATIVE_GNU_REGEX */
- UNIMPLEMENTED;
- g_warning ("This method has been disabled until glib-2.14 is released");
-#endif /* NATIVE_GNU_REGEX */
-}
-
-static void
-impl_clean (GbfProject *_project,
- GError **error)
-{
-#ifdef NATIVE_GNU_REGEX
- GbfAmProject *project;
- GbfAmProjectOp *op;
-
- g_return_if_fail (GBF_IS_AM_PROJECT (_project));
-
- project = GBF_AM_PROJECT (_project);
- op = g_new0 (GbfAmProjectOp, 1);
- op->project = project;
- op->type = BUILD;
- op->build_id = g_strdup (GBF_AM_BUILD_ID_CLEAN);
-
- queue_push_op (project, op);
-#else /* NATIVE_GNU_REGEX */
- UNIMPLEMENTED;
- g_warning ("This method has been disabled until glib-2.14 is released");
-#endif /* NATIVE_GNU_REGEX */
-}
-
static gboolean
file_exists (const gchar *path, const gchar *filename)
{
@@ -2840,112 +2676,6 @@
GBF_PROJECT_CAN_ADD_SOURCE);
}
-static void
-foreach_build_target (gpointer key, gpointer value, gpointer data)
-{
- GList **targets = data;
- GbfAmNode *node;
- GbfBuildTarget *target;
-
- node = GBF_AM_NODE ((GNode *)value);
-
- if ( 0 == strcmp (node->detail, "program") ||
- 0 == strcmp (node->detail, "static_lib") ||
- 0 == strcmp (node->detail, "shared_lib") ) {
- target = g_new0 (GbfBuildTarget, 1);
- target->id = g_strdup_printf ("USER:%s", (gchar *) key);
- target->label = g_strdup (node->name);
- target->description = g_strdup_printf (_("Build specific target: %s"), node->name);
-
- *targets = g_list_append (*targets, target);
- }
-}
-
-
-static GList *
-impl_get_build_targets (GbfProject *_project,
- GError **error)
-{
- GbfAmProject *project;
- GbfBuildTarget *target;
- GList *targets = NULL;
-
- g_return_val_if_fail (GBF_IS_AM_PROJECT (_project), NULL);
-
- project = GBF_AM_PROJECT (_project);
-
- /* FIXME: these targets should be gotten from the Makefile.am files */
- /* "autogen" */
- target = g_new0 (GbfBuildTarget, 1);
- target->id = g_strdup (GBF_AM_BUILD_ID_AUTOGEN);
- target->label = g_strdup (_("Generate"));
- target->description = g_strdup (_("Generate Makefile"));
- targets = g_list_append (targets, target);
-
- /* "configure" */
- target = g_new0 (GbfBuildTarget, 1);
- target->id = g_strdup (GBF_AM_BUILD_ID_CONFIGURE);
- target->label = g_strdup (_("Configure"));
- target->description = g_strdup (_("Configure the project"));
- targets = g_list_append (targets, target);
-
- /* "make all" */
- target = g_new0 (GbfBuildTarget, 1);
- target->id = g_strdup (GBF_AM_BUILD_ID_ALL);
- target->label = g_strdup (_("All"));
- target->description = g_strdup (_("Build the entire project"));
- targets = g_list_append (targets, target);
-
- /* "make install" */
- target = g_new0 (GbfBuildTarget, 1);
- target->id = g_strdup (GBF_AM_BUILD_ID_INSTALL);
- target->label = g_strdup (_("Install"));
- target->description = g_strdup (_("Build the entire project and install it"));
- targets = g_list_append (targets, target);
-
- /* other build targets */
- g_hash_table_foreach (project->targets, foreach_build_target, &targets);
-
- return targets;
-}
-
-static void
-impl_add_build_callback (GbfProject *_project,
- GbfBuildCallback callback,
- gpointer user_data,
- GError **error)
-{
- GbfAmProject *project;
- GbfAmBuildCallback *cb;
-
- g_return_if_fail (GBF_IS_AM_PROJECT (_project));
-
- project = GBF_AM_PROJECT (_project);
- cb = g_new0 (GbfAmBuildCallback, 1);
- cb->callback = callback;
- cb->user_data = user_data;
-
- project->callbacks = g_list_append (project->callbacks, cb);
-}
-
-static void
-impl_remove_build_callback (GbfProject *_project,
- GbfBuildCallback callback,
- GError **error)
-{
- GbfAmProject *project;
- GbfAmBuildCallback *cb;
- GList *l;
-
- g_return_if_fail (GBF_IS_AM_PROJECT (_project));
-
- project = GBF_AM_PROJECT (_project);
- l = g_list_find_custom (project->callbacks, callback, find_callback);
- cb = l->data;
- project->callbacks = g_list_delete_link (project->callbacks, l);
- g_free (cb);
-}
-
static GbfProjectGroup *
impl_get_group (GbfProject *_project,
const gchar *id,
@@ -3948,15 +3678,9 @@
object_class->get_property = gbf_am_project_get_property;
project_class->load = impl_load;
- project_class->build = impl_build;
- project_class->clean = impl_clean;
project_class->probe = impl_probe;
project_class->refresh = impl_refresh;
project_class->get_capabilities = impl_get_capabilities;
-
- project_class->get_build_targets = impl_get_build_targets;
- project_class->add_build_callback = impl_add_build_callback;
- project_class->remove_build_callback = impl_remove_build_callback;
project_class->add_group = impl_add_group;
project_class->remove_group = impl_remove_group;
@@ -4036,11 +3760,6 @@
g_free (project->project_root_uri);
project->project_root_uri = NULL;
- /* operations queue */
- queue_destroy (project);
-
- /* disconnect callbacks */
- callbacks_destroy (project);
g_free (project->make_command);
g_free (project->configure_command);
g_free (project->autogen_command);
Modified: trunk/src/backends/libgbf_am/gbf-am-project.h
==============================================================================
--- trunk/src/backends/libgbf_am/gbf-am-project.h (original)
+++ trunk/src/backends/libgbf_am/gbf-am-project.h Thu Jun 19 13:09:53 2008
@@ -103,12 +103,6 @@
GbfProjectClass parent_class;
};
-/* FIXME: use closures */
-struct _GbfAmBuildCallback {
- GbfBuildCallback callback;
- gpointer user_data;
-};
-
/* convenient shortcut macro the get the GbfAmNode from a GNode */
#define GBF_AM_NODE(g_node) ((g_node) != NULL ? (GbfAmNode *)((g_node)->data) : NULL)
Modified: trunk/src/backends/libgbf_mkfile/Makefile.am
==============================================================================
--- trunk/src/backends/libgbf_mkfile/Makefile.am (original)
+++ trunk/src/backends/libgbf_mkfile/Makefile.am Thu Jun 19 13:09:53 2008
@@ -1,6 +1,6 @@
SUBDIRS = GBF
-AM_CPPFLAGS = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/gbf \
-DSCRIPTS_DIR=\"$(scriptsdir)\" \
@@ -18,8 +18,6 @@
libgbf_mkfile_la_SOURCES = \
gbf-mkfile-project.c \
gbf-mkfile-project.h \
- gbf-mkfile-build.c \
- gbf-mkfile-build.h \
gbf-mkfile-config.c \
gbf-mkfile-config.h \
gbf-mkfile-properties.c \
Modified: trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.c
==============================================================================
--- trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.c (original)
+++ trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.c Thu Jun 19 13:09:53 2008
@@ -46,7 +46,6 @@
#include <gbf/glue-plugin.h>
#include "gbf-i18n.h"
#include "gbf-mkfile-project.h"
-#include "gbf-mkfile-build.h"
#include "gbf-mkfile-config.h"
#include "gbf-mkfile-properties.h"
@@ -188,13 +187,6 @@
Private prototypes
---------------------------------------------------------------------- */
-#ifdef NATIVE_GNU_REGEX
-static gboolean queue_check (GbfMkfileProject *project);
-static void queue_push_op (GbfMkfileProject *project,
- GbfMkfileProjectOp *op);
-#endif /* NATIVE_GNU_REGEX */
-static void queue_destroy (GbfMkfileProject *project);
-
static gboolean uri_is_equal (const gchar *uri1,
const gchar *uri2);
static gboolean uri_is_parent (const gchar *parent_uri,
@@ -282,123 +274,6 @@
GValue *value,
GParamSpec *pspec);
-
-/*
- * Queue operations ------------------------
- *
- * - Operations are added to the head and retrieved from the tail
- */
-
-#ifdef NATIVE_GNU_REGEX
-
-static gboolean
-queue_check (GbfMkfileProject *project)
-{
- GbfMkfileProjectOp *op;
-
- g_return_val_if_fail (project != NULL, FALSE);
- g_return_val_if_fail (GBF_IS_MKFILE_PROJECT (project), FALSE);
-
- g_assert (project->queue_ops != NULL);
-
- if (g_queue_is_empty (project->queue_ops)) {
- project->queue_handler_tag = 0;
- return FALSE;
- }
-
- op = g_queue_pop_tail (project->queue_ops);
-
- switch (op->type) {
- case BUILD:
- {
- gchar *project_root = uri_to_path (project->project_root_uri);
-
- /* FIXME: gbf_build_run can be simpler */
- gbf_build_run (project, op->build_id,
- project_root,
- project->callbacks);
-
- g_free (op->build_id);
- g_free (project_root);
-
- break;
- }
- }
-
- g_free (op);
-
- /* FIXME: this matches the old behavior, but it's wrong */
- if (g_queue_is_empty (project->queue_ops)) {
- project->queue_handler_tag = 0;
- return FALSE;
- }
-
- return TRUE;
-}
-
-static void
-queue_push_op (GbfMkfileProject *project, GbfMkfileProjectOp *op)
-{
- g_return_if_fail (project != NULL);
- g_return_if_fail (GBF_IS_MKFILE_PROJECT (project));
- g_return_if_fail (op != NULL);
-
- g_assert (project->queue_ops != NULL);
-
- g_queue_push_head (project->queue_ops, op);
-
- if (project->queue_handler_tag == 0)
- project->queue_handler_tag = g_idle_add ((GSourceFunc) queue_check, project);
-}
-
-#endif /* NATIVE_GNU_REGEX */
-
-static void
-queue_destroy (GbfMkfileProject *project)
-{
- g_return_if_fail (project != NULL);
- g_return_if_fail (GBF_IS_MKFILE_PROJECT (project));
-
- if (project->queue_ops) {
- GbfMkfileProjectOp *op;
- while ((op = g_queue_pop_tail (project->queue_ops)) != NULL)
- g_free (op);
- g_queue_free (project->queue_ops);
- project->queue_ops = NULL;
- }
-
- if (project->queue_handler_tag) {
- g_source_remove (project->queue_handler_tag);
- project->queue_handler_tag = 0;
- }
-}
-
-/*
- * Callbacks bookkeepping -----------------------------
- */
-
-static int
-find_callback (gconstpointer a, gconstpointer b)
-{
- GbfMkfileBuildCallback *cb = (GbfMkfileBuildCallback *)a;
- if (cb->callback == b)
- return 0;
- else
- return -1;
-}
-
-static void
-callbacks_destroy (GbfMkfileProject *project)
-{
- g_return_if_fail (project != NULL);
- g_return_if_fail (GBF_IS_MKFILE_PROJECT (project));
-
- /* FIXME */
- g_list_free (project->callbacks);
- project->callbacks = NULL;
-}
-
-
/*
* URI and path manipulation functions -----------------------------
*/
@@ -2677,53 +2552,6 @@
}
}
-static void
-impl_build (GbfProject *_project,
- const gchar *id,
- GError **error)
-{
-#ifdef NATIVE_GNU_REGEX
- GbfMkfileProject *project;
- GbfMkfileProjectOp *op;
-
- g_return_if_fail (GBF_IS_MKFILE_PROJECT (_project));
-
- project = GBF_MKFILE_PROJECT (_project);
- op = g_new0 (GbfMkfileProjectOp, 1);
- op->project = project;
- op->type = BUILD;
-
- op->build_id = g_strdup (id);
- queue_push_op (project, op);
-#else /* NATIVE_GNU_REGEX */
- UNIMPLEMENTED;
- g_warning ("This method has been disabled until glib-2.14 is released");
-#endif /* NATIVE_GNU_REGEX */
-}
-
-static void
-impl_clean (GbfProject *_project,
- GError **error)
-{
-#ifdef NATIVE_GNU_REGEX
- GbfMkfileProject *project;
- GbfMkfileProjectOp *op;
-
- g_return_if_fail (GBF_IS_MKFILE_PROJECT (_project));
-
- project = GBF_MKFILE_PROJECT (_project);
- op = g_new0 (GbfMkfileProjectOp, 1);
- op->project = project;
- op->type = BUILD;
- op->build_id = g_strdup (GBF_MKFILE_BUILD_ID_CLEAN);
-
- queue_push_op (project, op);
-#else /* NATIVE_GNU_REGEX */
- UNIMPLEMENTED;
- g_warning ("This method has been disabled until glib-2.14 is released");
-#endif /* NATIVE_GNU_REGEX */
-}
-
static gboolean
file_exists (const gchar *path, const gchar *filename)
{
@@ -2783,99 +2611,6 @@
return GBF_PROJECT_CAN_ADD_NONE;
}
-static void
-foreach_build_target (gpointer key, gpointer value, gpointer data)
-{
- GList **targets = data;
- GbfMkfileNode *node;
- GbfBuildTarget *target;
-
- node = GBF_MKFILE_NODE ((GNode *)value);
-
- if ( 0 == strcmp (node->detail, "program") ||
- 0 == strcmp (node->detail, "static_lib") ||
- 0 == strcmp (node->detail, "shared_lib") ) {
- target = g_new0 (GbfBuildTarget, 1);
- target->id = g_strdup_printf ("USER:%s", (gchar *) key);
- target->label = g_strdup (node->name);
- target->description = g_strdup_printf (_("Build specific target: %s"), node->name);
-
- *targets = g_list_append (*targets, target);
- }
-}
-
-
-static GList *
-impl_get_build_targets (GbfProject *_project,
- GError **error)
-{
- GbfMkfileProject *project;
- GbfBuildTarget *target;
- GList *targets = NULL;
-
- g_return_val_if_fail (GBF_IS_MKFILE_PROJECT (_project), NULL);
-
- project = GBF_MKFILE_PROJECT (_project);
-
- /* FIXME: these targets should be gotten from the Makefile.am files */
-
- /* "make all" */
- target = g_new0 (GbfBuildTarget, 1);
- target->id = g_strdup (GBF_MKFILE_BUILD_ID_ALL);
- target->label = g_strdup (_("All"));
- target->description = g_strdup (_("Build the entire project"));
- targets = g_list_append (targets, target);
-
- /* "make install" */
- target = g_new0 (GbfBuildTarget, 1);
- target->id = g_strdup (GBF_MKFILE_BUILD_ID_INSTALL);
- target->label = g_strdup (_("Install"));
- target->description = g_strdup (_("Build the entire project and install it"));
- targets = g_list_append (targets, target);
-
- /* other build targets */
- g_hash_table_foreach (project->targets, foreach_build_target, &targets);
-
- return targets;
-}
-
-static void
-impl_add_build_callback (GbfProject *_project,
- GbfBuildCallback callback,
- gpointer user_data,
- GError **error)
-{
- GbfMkfileProject *project;
- GbfMkfileBuildCallback *cb;
-
- g_return_if_fail (GBF_IS_MKFILE_PROJECT (_project));
-
- project = GBF_MKFILE_PROJECT (_project);
- cb = g_new0 (GbfMkfileBuildCallback, 1);
- cb->callback = callback;
- cb->user_data = user_data;
-
- project->callbacks = g_list_append (project->callbacks, cb);
-}
-
-static void
-impl_remove_build_callback (GbfProject *_project,
- GbfBuildCallback callback,
- GError **error)
-{
- GbfMkfileProject *project;
- GbfMkfileBuildCallback *cb;
- GList *l;
-
- g_return_if_fail (GBF_IS_MKFILE_PROJECT (_project));
-
- project = GBF_MKFILE_PROJECT (_project);
- l = g_list_find_custom (project->callbacks, callback, find_callback);
- cb = l->data;
- project->callbacks = g_list_delete_link (project->callbacks, l);
- g_free (cb);
-}
-
static GbfProjectGroup *
impl_get_group (GbfProject *_project,
const gchar *id,
@@ -3659,16 +3394,10 @@
object_class->get_property = gbf_mkfile_project_get_property;
project_class->load = impl_load;
- project_class->build = impl_build;
- project_class->clean = impl_clean;
project_class->probe = impl_probe;
project_class->refresh = impl_refresh;
project_class->get_capabilities = impl_get_capabilities;
- project_class->get_build_targets = impl_get_build_targets;
- project_class->add_build_callback = impl_add_build_callback;
- project_class->remove_build_callback = impl_remove_build_callback;
-
project_class->add_group = impl_add_group;
project_class->remove_group = impl_remove_group;
project_class->get_group = impl_get_group;
@@ -3747,11 +3476,6 @@
g_free (project->project_root_uri);
project->project_root_uri = NULL;
- /* operations queue */
- queue_destroy (project);
-
- /* disconnect callbacks */
- callbacks_destroy (project);
g_free (project->make_command);
g_free (project->configure_command);
g_free (project->autogen_command);
Modified: trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.h
==============================================================================
--- trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.h (original)
+++ trunk/src/backends/libgbf_mkfile/gbf-mkfile-project.h Thu Jun 19 13:09:53 2008
@@ -108,12 +108,6 @@
GbfProjectClass parent_class;
};
-/* FIXME: use closures */
-struct _GbfMkfileBuildCallback {
- GbfBuildCallback callback;
- gpointer user_data;
-};
-
/* convenient shortcut macro the get the GbfMkfileNode from a GNode */
#define GBF_MKFILE_NODE(g_node) ((g_node) != NULL ? (GbfMkfileNode *)((g_node)->data) : NULL)
Modified: trunk/src/gbf/Makefile.am
==============================================================================
--- trunk/src/gbf/Makefile.am (original)
+++ trunk/src/gbf/Makefile.am Thu Jun 19 13:09:53 2008
@@ -31,8 +31,6 @@
libgbfmarshal.c \
gbf-tree-data.h \
gbf-tree-data.c \
- gbf-build-info.h \
- gbf-build-info.c \
gbf-project-model.h \
gbf-project-model.c \
gbf-project-view.h \
@@ -48,7 +46,6 @@
gbf-project.h \
gbf-backend.h \
gbf-tree-data.h \
- gbf-build-info.h \
gbf-widgets.h \
gbf-project-model.h \
gbf-project-view.h \
Modified: trunk/src/gbf/gbf-project.c
==============================================================================
--- trunk/src/gbf/gbf-project.c (original)
+++ trunk/src/gbf/gbf-project.c Thu Jun 19 13:09:53 2008
@@ -39,41 +39,6 @@
GBF_PROJECT_GET_CLASS (project)->load (project, path, error);
}
-void
-gbf_project_build (GbfProject *project,
- const gchar *id,
- GError **error)
-{
- g_return_if_fail (project != NULL);
- g_return_if_fail (GBF_IS_PROJECT (project));
- g_return_if_fail (id != NULL);
- g_return_if_fail (error == NULL || *error == NULL);
-
- GBF_PROJECT_GET_CLASS (project)->build (project, id, error);
-}
-
-void
-gbf_project_build_default (GbfProject *project,
- GError **error)
-{
- g_return_if_fail (project != NULL);
- g_return_if_fail (GBF_IS_PROJECT (project));
- g_return_if_fail (error == NULL || *error == NULL);
-
- GBF_PROJECT_GET_CLASS (project)->build (project, GBF_BUILD_ID_DEFAULT, error);
-}
-
-void
-gbf_project_clean (GbfProject *project,
- GError **error)
-{
- g_return_if_fail (project != NULL);
- g_return_if_fail (GBF_IS_PROJECT (project));
- g_return_if_fail (error == NULL || *error == NULL);
-
- GBF_PROJECT_GET_CLASS (project)->clean (project, error);
-}
-
gboolean
gbf_project_probe (GbfProject *project,
const gchar *path,
@@ -109,48 +74,6 @@
return GBF_PROJECT_GET_CLASS (project)->get_capabilities (project, error);
}
-/* Build. */
-GList *
-gbf_project_get_build_targets (GbfProject *project,
- GError **error)
-{
- g_return_val_if_fail (project != NULL, NULL);
- g_return_val_if_fail (GBF_IS_PROJECT (project), NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- return GBF_PROJECT_GET_CLASS (project)->get_build_targets (project, error);
-}
-
-void
-gbf_project_add_build_callback (GbfProject *project,
- GbfBuildCallback callback,
- gpointer user_data,
- GError **error)
-{
- g_return_if_fail (project != NULL);
- g_return_if_fail (GBF_IS_PROJECT (project));
- g_return_if_fail (callback != NULL);
-
- GBF_PROJECT_GET_CLASS (project)->add_build_callback (project,
- callback,
- user_data,
- error);
-}
-
-void
-gbf_project_remove_build_callback (GbfProject *project,
- GbfBuildCallback callback,
- GError **error)
-{
- g_return_if_fail (project != NULL);
- g_return_if_fail (GBF_IS_PROJECT (project));
- g_return_if_fail (callback != NULL);
-
- GBF_PROJECT_GET_CLASS (project)->remove_build_callback (project,
- callback,
- error);
-}
-
/* Groups. */
gchar *
gbf_project_add_group (GbfProject *project,
@@ -482,21 +405,6 @@
{
parent_class = g_type_class_peek_parent (klass);
- g_signal_new ("build_start",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GbfProjectClass, build_start),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
- g_signal_new ("build_stop",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GbfProjectClass, build_stop),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE, 1,
- G_TYPE_BOOLEAN);
g_signal_new ("project-updated",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
Modified: trunk/src/gbf/gbf-project.h
==============================================================================
--- trunk/src/gbf/gbf-project.h (original)
+++ trunk/src/gbf/gbf-project.h Thu Jun 19 13:09:53 2008
@@ -47,11 +47,6 @@
typedef struct _GbfProjectTargetSource GbfProjectTargetSource;
typedef enum _GbfProjectError GbfProjectError;
typedef enum _GbfProjectCapabilities GbfProjectCapabilities;
-typedef struct _GbfBuildTarget GbfBuildTarget;
-typedef enum _GbfBuildType GbfBuildType;
-typedef enum _GbfBuildMessage GbfBuildMessage;
-typedef struct _GbfBuildWarning GbfBuildWarning;
-typedef struct _GbfBuildError GbfBuildError;
struct _GbfProjectGroup {
gchar *id;
@@ -90,20 +85,6 @@
GBF_PROJECT_ERROR_GENERAL_FAILURE,
};
-struct _GbfBuildTarget {
- gchar *id;
- gchar *label;
- gchar *description;
-};
-
-enum _GbfBuildMessage {
- GBF_BUILD_START,
- GBF_BUILD_END,
- GBF_BUILD_OUTPUT,
- GBF_BUILD_ERROR,
- GBF_BUILD_WARNING
-};
-
enum _GbfProjectCapabilities {
GBF_PROJECT_CAN_ADD_NONE = 0,
GBF_PROJECT_CAN_ADD_GROUP = 1 << 0,
@@ -112,25 +93,6 @@
GBF_PROJECT_CAN_PACKAGES = 1 << 3
};
-struct _GbfBuildWarning {
- gchar *filename;
- gint line;
- gchar *warning;
- gchar *output;
-};
-
-struct _GbfBuildError {
- gchar *filename;
- gint line;
- gchar *error;
- gchar *output;
-};
-
-typedef void (* GbfBuildCallback) (GbfProject *project,
- GbfBuildMessage msg,
- gpointer data,
- gpointer callback_data);
-
struct _GbfProject {
GObject parent;
};
@@ -138,10 +100,6 @@
struct _GbfProjectClass {
GObjectClass parent_class;
- /* Signals. */
- void (* build_start) (GbfProject *project);
- void (* build_stop) (GbfProject *project,
- gboolean success);
void (* project_updated) (GbfProject *project);
/* Virtual Table */
@@ -149,11 +107,6 @@
void (* load) (GbfProject *project,
const gchar *path,
GError **error);
- void (* build) (GbfProject *project,
- const gchar *id,
- GError **error);
- void (* clean) (GbfProject *project,
- GError **error);
gboolean (* probe) (GbfProject *project,
const gchar *path,
GError **error);
@@ -162,17 +115,6 @@
GbfProjectCapabilities (* get_capabilities) (GbfProject *project,
GError **error);
- /* Build. */
- GList * (* get_build_targets) (GbfProject *project,
- GError **error);
- void (* add_build_callback) (GbfProject *project,
- GbfBuildCallback callback,
- gpointer user_data,
- GError **error);
- void (* remove_build_callback) (GbfProject *project,
- GbfBuildCallback callback,
- GError **error);
-
/* Groups. */
gchar * (* add_group) (GbfProject *project,
const gchar *parent_id,
@@ -256,13 +198,6 @@
void gbf_project_load (GbfProject *project,
const gchar *path,
GError **error);
-void gbf_project_build (GbfProject *project,
- const gchar *id,
- GError **error);
-void gbf_project_build_default (GbfProject *project,
- GError **error);
-void gbf_project_clean (GbfProject *project,
- GError **error);
gboolean gbf_project_probe (GbfProject *project,
const gchar *path,
GError **error);
@@ -271,17 +206,6 @@
GbfProjectCapabilities gbf_project_get_capabilities (GbfProject *project,
GError **error);
-/* Build. */
-GList *gbf_project_get_build_targets (GbfProject *project,
- GError **error);
-void gbf_project_add_build_callback (GbfProject *project,
- GbfBuildCallback callback,
- gpointer user_data,
- GError **error);
-void gbf_project_remove_build_callback(GbfProject *project,
- GbfBuildCallback callback,
- GError **error);
-
/* Groups. */
gchar *gbf_project_add_group (GbfProject *project,
const gchar *parent_id,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
