luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 15:48:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

More gdbus-codegen fixed to build on non-Unix

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=655148#c6

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen
2011-07-26 10:05:57 -04:00
parent 494db61c19
commit b7f3638e5c
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gio/gdbus-codegen/codegen.py
View File

@@ -1974,10 +1974,14 @@ class CodeGenerator:
' g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);\n' ' g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);\n'
' g_value_set_object (&paramv[n++], invocation);\n' ' g_value_set_object (&paramv[n++], invocation);\n'
' if (info->pass_fdlist)\n' ' if (info->pass_fdlist)\n'
' {\n' ' {\n'
' g_value_init (&paramv[n], G_TYPE_UNIX_FD_LIST);\n' '#ifdef G_OS_UNIX\n'
' g_value_set_object (&paramv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));\n' ' g_value_init (&paramv[n], G_TYPE_UNIX_FD_LIST);\n'
' }\n' ' g_value_set_object (&paramv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));\n'
'#else\n'
' g_assert_not_reached ();\n'
'#endif\n'
' }\n'
%(i.ns_upper, i.name_upper)) %(i.ns_upper, i.name_upper))
self.c.write(' g_variant_iter_init (&iter, parameters);\n' self.c.write(' g_variant_iter_init (&iter, parameters);\n'
' while ((child = g_variant_iter_next_value (&iter)) != NULL)\n' ' while ((child = g_variant_iter_next_value (&iter)) != NULL)\n'

22
gio/tests/Makefile.am
View File

@@ -67,7 +67,6 @@ TEST_PROGS += \
gdbus-exit-on-close \ gdbus-exit-on-close \
gdbus-non-socket \ gdbus-non-socket \
gdbus-bz627724 \ gdbus-bz627724 \
gdbus-test-codegen \
appinfo \ appinfo \
contenttype \ contenttype \
file \ file \
@@ -98,14 +97,23 @@ SAMPLE_PROGS = \
gapplication-example-cmdline2 \ gapplication-example-cmdline2 \
gapplication-example-cmdline3 \ gapplication-example-cmdline3 \
gapplication-example-actions \ gapplication-example-actions \
gdbus-example-objectmanager-server \
gdbus-example-objectmanager-client \
$(NULL) $(NULL)
if OS_UNIX if OS_UNIX
TEST_PROGS += live-g-file desktop-app-info unix-fd unix-streams gapplication TEST_PROGS += \
SAMPLE_PROGS += gdbus-example-unix-fd-client live-g-file \
desktop-app-info \
unix-fd \
unix-streams \
gapplication \
gdbus-test-codegen \
$(NULL)
SAMPLE_PROGS += \
gdbus-example-unix-fd-client \
gdbus-example-objectmanager-server \
gdbus-example-objectmanager-client \
$(NULL)
endif endif
if OS_WIN32 if OS_WIN32
@@ -244,6 +252,7 @@ gdbus_addresses_LDADD = $(progs_ldadd)
gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
gdbus_bz627724_LDADD = $(progs_ldadd) gdbus_bz627724_LDADD = $(progs_ldadd)
if OS_UNIX
gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml
$(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py \ $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py \
--interface-prefix org.project. \ --interface-prefix org.project. \
@@ -267,6 +276,7 @@ BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
gdbus_test_codegen_SOURCES = gdbus-test-codegen.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c gdbus_test_codegen_SOURCES = gdbus-test-codegen.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
gdbus_test_codegen_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h gdbus_test_codegen_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
gdbus_test_codegen_LDADD = $(progs_ldadd) gdbus_test_codegen_LDADD = $(progs_ldadd)
endif # OS_UNIX
gdbus_connection_SOURCES = gdbus-connection.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c gdbus_connection_SOURCES = gdbus-connection.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
gdbus_connection_LDADD = $(progs_ldadd) gdbus_connection_LDADD = $(progs_ldadd)
@@ -446,6 +456,7 @@ proxy_LDADD = $(progs_ldadd) \
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
if OS_UNIX
gdbus_example_objectmanager_server_SOURCES = gdbus-example-objectmanager-server.c gdbus_example_objectmanager_server_SOURCES = gdbus-example-objectmanager-server.c
gdbus_example_objectmanager_server_CFLAGS = -I$(top_builddir)/gio/tests/gdbus-object-manager-example gdbus_example_objectmanager_server_CFLAGS = -I$(top_builddir)/gio/tests/gdbus-object-manager-example
gdbus_example_objectmanager_server_LDADD = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(progs_ldadd) gdbus_example_objectmanager_server_LDADD = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(progs_ldadd)
@@ -453,6 +464,7 @@ gdbus_example_objectmanager_server_LDADD = $(top_builddir)/gio/tests/gdbus-ob
gdbus_example_objectmanager_client_SOURCES = gdbus-example-objectmanager-client.c gdbus_example_objectmanager_client_SOURCES = gdbus-example-objectmanager-client.c
gdbus_example_objectmanager_client_CFLAGS = -I$(top_builddir)/gio/tests/gdbus-object-manager-example gdbus_example_objectmanager_client_CFLAGS = -I$(top_builddir)/gio/tests/gdbus-object-manager-example
gdbus_example_objectmanager_client_LDADD = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(progs_ldadd) gdbus_example_objectmanager_client_LDADD = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(progs_ldadd)
endif OS_UNIX
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------