luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 14:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

doc: Add back gdbus-object-manager-example

Browse Source 
This requires Meson 0.52.0 for the return value of gnome.gtkdoc().
This commit is contained in:
Xavier Claessens 2019-07-09 14:57:54 -04:00
parent 6d05ac2fa9
commit 6e8a7c2cd4
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/reference/gio/gdbus-object-manager-example/meson.build Normal file
View File

@ -0,0 +1,10 @@
gdbus_object_manager_example_doc = gnome.gtkdoc('gdbus-object-manager-example',
main_xml : 'gdbus-object-manager-example-docs.xml',
namespace : 'example',
dependencies : [libgdbus_example_objectmanager_dep],
src_dir : 'gio/tests/gdbus-object-manager-example',
scan_args : gtkdoc_common_scan_args + [
'--rebuild-types',
],
)

6
docs/reference/gio/meson.build
View File

@ -1,4 +1,5 @@
if get_option('gtk_doc') if get_option('gtk_doc')
subdir('gdbus-object-manager-example')
subdir('xml') subdir('xml')
ignore_headers = [ ignore_headers = [
@ -132,8 +133,6 @@ if get_option('gtk_doc')
'xdp-dbus.c', 'xdp-dbus.c',
] ]
# FIXME: ExampleAnimal docs aren't built
docpath = join_paths(glib_datadir, 'gtk-doc', 'html') docpath = join_paths(glib_datadir, 'gtk-doc', 'html')
version_conf = configuration_data() version_conf = configuration_data()
version_conf.set('VERSION', meson.project_version()) version_conf.set('VERSION', meson.project_version())
@ -188,6 +187,9 @@ if get_option('gtk_doc')
'gresource.xml', 'gresource.xml',
'gdbus.xml', 'gdbus.xml',
'gdbus-codegen.xml', 'gdbus-codegen.xml',
gdbus_example_objectmanager_xml,
gdbus_example_objectmanager_sources,
gdbus_object_manager_example_doc,
], ],
expand_content_files : [ expand_content_files : [
'overview.xml', 'overview.xml',

4
docs/reference/gio/migrating-gdbus.xml
View File

@ -297,8 +297,8 @@ gdbus-codegen --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
</section> </section>
<xi:include href="../gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml"/> <xi:include href="../../../../gio/tests/gdbus-object-manager-example/objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml"/>
<xi:include href="../gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml"/> <xi:include href="../../../../gio/tests/gdbus-object-manager-example/objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Cat.xml"/>
<xi:include href="../gdbus-object-manager-example/xml/ExampleAnimal.xml"/> <xi:include href="../gdbus-object-manager-example/xml/ExampleAnimal.xml"/>
<xi:include href="../gdbus-object-manager-example/xml/ExampleCat.xml"/> <xi:include href="../gdbus-object-manager-example/xml/ExampleCat.xml"/>
<xi:include href="../gdbus-object-manager-example/xml/ExampleObject.xml"/> <xi:include href="../gdbus-object-manager-example/xml/ExampleObject.xml"/>

6
gio/tests/gdbus-object-manager-example/meson.build
View File

@ -1,6 +1,7 @@
# FIXME: set UNINSTALLED_GLIB_{SRC|BUILD}DIR=top_{src|build}dir ? # FIXME: set UNINSTALLED_GLIB_{SRC|BUILD}DIR=top_{src|build}dir ?
gdbus_example_objectmanager_xml = files('gdbus-example-objectmanager.xml')
gdbus_example_objectmanager_generated = custom_target('objectmanager-gen', gdbus_example_objectmanager_generated = custom_target('objectmanager-gen',
input : ['gdbus-example-objectmanager.xml'], input : gdbus_example_objectmanager_xml,
output : ['objectmanager-gen.h', output : ['objectmanager-gen.h',
'objectmanager-gen.c', 'objectmanager-gen.c',
'objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml', 'objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml',
@ -23,4 +24,5 @@ libgdbus_example_objectmanager = library('gdbus-example-objectmanager',
libgdbus_example_objectmanager_dep = declare_dependency( libgdbus_example_objectmanager_dep = declare_dependency(
sources : gdbus_example_objectmanager_generated[0], sources : gdbus_example_objectmanager_generated[0],
link_with : libgdbus_example_objectmanager) link_with : libgdbus_example_objectmanager,
dependencies : [libgio_dep])

5
gio/tests/meson.build
View File

@ -431,6 +431,11 @@ test_extra_programs += {
}, },
} }
gdbus_example_objectmanager_sources = files(
'gdbus-example-objectmanager-client.c',
'gdbus-example-objectmanager-server.c',
)
if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
test_extra_programs += { test_extra_programs += {
# These three are manual-run tests because they need a session bus but don't bring one up themselves # These three are manual-run tests because they need a session bus but don't bring one up themselves