mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-21 23:40:09 +01:00
df901b528b
* glib/dbus-glib.c (dbus_set_g_error): Delete. (dbus_g_error_set): New public function from its ashes; used by both service-side method implementation and GLib bindings internals. (dbus_g_error_has_name, dbus_g_error_get_name): New function. (_dbus_glib_test): Add some tests. * test/glib/test-dbus-glib.c (main): Test dbus_g_error_has_name. * test/glib/test-service-glib.c (my_object_throw_error): Use dbus_g_error_set. * glib/dbus-gobject.c (gerror_to_dbus_error_message): Handle errors thrown by dbus_g_error_set. * glib/dbus-gmain.c (dbus_g_bus_get): Change to dbus_g_error_set. * glib/dbus-gparser.c (validate_signature): Ditto. * glib/dbus-gproxy.c (dbus_g_proxy_new_for_name_owner) (dbus_g_proxy_end_call_internal): Ditto. * glib/Makefile.am: Generate dbus-glib-error-switch.h, which converts DBUS_ERROR_x to DBUS_GERROR_x. (libdbus_glib_1_la_SOURCES, BUILT_SOURCES, CLEANFILES): Add it. * doc/TODO: Remove error TODO. * doc/dbus-tutorial.xml: Update with documentation about error handling. * dbus/make-dbus-glib-error-enum.sh: Tighten up regexp to make sure we only change DBUS_ERROR to DBUS_GERROR, not all ERROR to GERROR. Also add DBUS_GERROR_REMOTE_EXCEPTION.
101 lines
2.8 KiB
Makefile
101 lines
2.8 KiB
Makefile
SUBDIRS = . examples
|
|
|
|
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
|
|
|
|
lib_LTLIBRARIES=libdbus-glib-1.la
|
|
|
|
dbus-glib-error-switch.h: $(top_srcdir)/dbus/dbus-protocol.h make-dbus-glib-error-switch.sh
|
|
$(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
|
|
|
|
BUILT_SOURCES = dbus-glib-error-switch.h
|
|
|
|
CLEANFILES = $(BUILT_SOURCES)
|
|
|
|
libdbus_glib_1_la_SOURCES = \
|
|
dbus-glib-error-switch.h \
|
|
dbus-glib.c \
|
|
dbus-gmain.c \
|
|
dbus-gmarshal.c \
|
|
dbus-gmarshal.h \
|
|
dbus-gobject.c \
|
|
dbus-gobject.h \
|
|
dbus-gproxy.c \
|
|
dbus-gtest.c \
|
|
dbus-gtest.h \
|
|
dbus-gthread.c \
|
|
dbus-gutils.c \
|
|
dbus-gutils.h \
|
|
dbus-gvalue.c \
|
|
dbus-gtype-specialized.c \
|
|
dbus-gvalue.h \
|
|
dbus-gvalue-utils.c \
|
|
dbus-gvalue-utils.h
|
|
|
|
libdbus_glib_HEADERS = \
|
|
dbus-gtype-specialized.h
|
|
|
|
libdbus_glibdir = $(includedir)/dbus-1.0/dbus
|
|
|
|
libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la
|
|
## don't export symbols that start with "_" (we use this
|
|
## convention for internal symbols)
|
|
libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
|
|
|
# convenience lib used here and by dbus-viewer
|
|
noinst_LTLIBRARIES=libdbus-gtool.la
|
|
|
|
libdbus_gtool_la_SOURCES = \
|
|
dbus-gidl.c \
|
|
dbus-gidl.h \
|
|
dbus-gloader-expat.c \
|
|
dbus-gparser.c \
|
|
dbus-gparser.h \
|
|
dbus-gutils.c \
|
|
dbus-gutils.h
|
|
|
|
libdbus_gtool_la_LIBADD = libdbus-glib-1.la
|
|
|
|
bin_PROGRAMS=dbus-binding-tool
|
|
|
|
dbus_binding_tool_SOURCES = \
|
|
dbus-binding-tool-glib.h \
|
|
dbus-binding-tool-glib.c \
|
|
dbus-glib-tool.h \
|
|
dbus-glib-tool.c
|
|
|
|
dbus_binding_tool_LDADD= -lexpat libdbus-gtool.la
|
|
|
|
## we just rebuilt these manually and check them into cvs; easier than
|
|
## convincing automake/make to do this properly
|
|
regenerate-built-sources:
|
|
@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
|
|
echo '#include "dbus-gmarshal.h"' > dbus-gmarshal.c && \
|
|
@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
|
|
|
|
EXTRA_DIST=dbus-gmarshal.list
|
|
|
|
if DBUS_BUILD_TESTS
|
|
|
|
## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
|
|
## build even when not doing "make check"
|
|
noinst_PROGRAMS= $(TESTS)
|
|
|
|
## note that TESTS has special meaning (stuff to use in make check)
|
|
## so if adding tests not to be run in make check, don't add them to
|
|
## TESTS
|
|
TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus
|
|
TESTS=dbus-glib-test
|
|
|
|
## FIXME we aren't running dbus-glib-tool --self-test
|
|
|
|
dbus_glib_test_SOURCES= \
|
|
dbus-gtest-main.c
|
|
|
|
dbus_glib_test_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
|
|
|
|
else
|
|
### not building tests
|
|
TESTS=
|
|
|
|
endif
|
|
|