From e8f41dabf0a440aa77db1103f13c5e95439fc441 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 27 Oct 2016 13:56:31 +0900 Subject: [PATCH] Imported Upstream version 1.36.0 Change-Id: I801387031b76cec7d0447742099008911887bf31 Signed-off-by: DongHun Kwak --- config.h.win32 | 6 +- configure | 38 ++++++------ configure.ac | 6 +- docs/reference/html/annotation-glossary.html | 37 +++++------- docs/reference/html/gi-GIArgInfo.html | 2 +- docs/reference/html/gi-GIBaseInfo.html | 2 +- docs/reference/html/gi-GICallableInfo.html | 2 +- docs/reference/html/gi-GIConstantInfo.html | 2 +- docs/reference/html/gi-GIEnumInfo.html | 2 +- docs/reference/html/gi-GIFieldInfo.html | 2 +- docs/reference/html/gi-GIFunctionInfo.html | 2 +- docs/reference/html/gi-GIInterfaceInfo.html | 2 +- docs/reference/html/gi-GIObjectInfo.html | 2 +- docs/reference/html/gi-GIPropertyInfo.html | 2 +- docs/reference/html/gi-GIRegisteredTypeInfo.html | 2 +- docs/reference/html/gi-GISignalInfo.html | 2 +- docs/reference/html/gi-GIStructInfo.html | 2 +- docs/reference/html/gi-GITypeInfo.html | 2 +- docs/reference/html/gi-GIUnionInfo.html | 2 +- docs/reference/html/gi-GIVFuncInfo.html | 2 +- docs/reference/html/gi-ffi.html | 4 +- docs/reference/html/gi-gierrordomaininfo.html | 2 +- docs/reference/html/gi-gir-reference.html | 2 +- docs/reference/html/gi-gir.html | 4 +- docs/reference/html/gi-girepository.html | 2 +- docs/reference/html/gi-girffi.html | 2 +- docs/reference/html/gi-gtypelib.html | 2 +- docs/reference/html/gi-libgirepository.html | 4 +- docs/reference/html/gi-overview.html | 2 +- docs/reference/html/gi-repository-structs.html | 4 +- docs/reference/html/gi-struct-hierarchy.html | 2 +- docs/reference/html/gi-typelib.html | 4 +- docs/reference/html/girepository.html | 4 +- docs/reference/html/glib.html | 4 +- docs/reference/html/index.html | 4 +- gir/gio-2.0.c | 75 ++++++++++++++++++++++++ gobject-introspection-1.0.pc | 2 +- gobject-introspection-no-export-1.0.pc | 2 +- 38 files changed, 156 insertions(+), 88 deletions(-) diff --git a/config.h.win32 b/config.h.win32 index 11a06c6..0b2f4ca 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -96,7 +96,7 @@ #define PACKAGE_NAME "gobject-introspection" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "gojbect-introspection 1.35.9" +#define PACKAGE_STRING "gojbect-introspection 1.36.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gobject-introspection" @@ -105,7 +105,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.35.9" +#define PACKAGE_VERSION "1.36.0" /* Define to the platform's shared library suffix */ #define SHLIB_SUFFIX ".dll" @@ -126,7 +126,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.35.9" +#define VERSION "1.36.0" /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ diff --git a/configure b/configure index 4258bff..f297b25 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gobject-introspection 1.35.9. +# Generated by GNU Autoconf 2.69 for gobject-introspection 1.36.0. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='gobject-introspection' PACKAGE_TARNAME='gobject-introspection' -PACKAGE_VERSION='1.35.9' -PACKAGE_STRING='gobject-introspection 1.35.9' +PACKAGE_VERSION='1.36.0' +PACKAGE_STRING='gobject-introspection 1.36.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection' PACKAGE_URL='' @@ -1425,7 +1425,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gobject-introspection 1.35.9 to adapt to many kinds of systems. +\`configure' configures gobject-introspection 1.36.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1496,7 +1496,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gobject-introspection 1.35.9:";; + short | recursive ) echo "Configuration of gobject-introspection 1.36.0:";; esac cat <<\_ACEOF @@ -1650,7 +1650,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gobject-introspection configure 1.35.9 +gobject-introspection configure 1.36.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2202,7 +2202,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gobject-introspection $as_me 1.35.9, which was +It was created by gobject-introspection $as_me 1.36.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3070,7 +3070,7 @@ fi # Define the identity of the package. PACKAGE='gobject-introspection' - VERSION='1.35.9' + VERSION='1.36.0' cat >>confdefs.h <<_ACEOF @@ -12608,12 +12608,12 @@ if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.35.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.35.9") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.36.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.36.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.35.9" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.36.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12625,12 +12625,12 @@ if test -n "$GLIB_LIBS"; then pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.35.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.35.9") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.36.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.36.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.35.9" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.36.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12651,14 +12651,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.35.9" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.36.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.35.9" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.36.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.35.9) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.36.0) were not met: $GLIB_PKG_ERRORS @@ -15365,7 +15365,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gobject-introspection $as_me 1.35.9, which was +This file was extended by gobject-introspection $as_me 1.36.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15431,7 +15431,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gobject-introspection config.status 1.35.9 +gobject-introspection config.status 1.36.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 399d98d..3537af1 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ dnl the gi version number m4_define(gi_major_version, 1) -m4_define(gi_minor_version, 35) -m4_define(gi_micro_version, 9) +m4_define(gi_minor_version, 36) +m4_define(gi_micro_version, 0) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) @@ -124,7 +124,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX" AC_SUBST(GIR_DIR) AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation]) -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.35.9]) +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36.0]) PKG_CHECK_MODULES(GOBJECT, [gobject-2.0]) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) PKG_CHECK_MODULES(GIO, [gio-2.0]) diff --git a/docs/reference/html/annotation-glossary.html b/docs/reference/html/annotation-glossary.html index dfaf003..0070851 100644 --- a/docs/reference/html/annotation-glossary.html +++ b/docs/reference/html/annotation-glossary.html @@ -3,7 +3,7 @@ Annotation Glossary - + @@ -33,30 +33,23 @@

Annotation Glossary

O

-
-out caller-allocates
-

Out parameter, where caller must allocate storage.

-
-out
-

Parameter for returning results. Default is transfer full.

+
out caller-allocates
+

Out parameter, where caller must allocate storage.

+
out
+

Parameter for returning results. Default is transfer full.

A

-
-allow-none
-

NULL is ok, both for passing and for returning.

+
allow-none
+

NULL is ok, both for passing and for returning.

E

-
-element-type
-

Generics and defining elements of containers and arrays.

+
element-type
+

Generics and defining elements of containers and arrays.

T

-
-transfer full
-

Free data after the code is done.

-
-type
-

Override the parsed C type with given type.

-
-transfer none
-

Don't free data after the code is done.

+
transfer full
+

Free data after the code is done.

+
type
+

Override the parsed C type with given type.

+
transfer none
+

Don't free data after the code is done.

diff --git a/docs/reference/html/gi-GIArgInfo.html b/docs/reference/html/gi-GIArgInfo.html index 308a50c..510a473 100644 --- a/docs/reference/html/gi-GIArgInfo.html +++ b/docs/reference/html/gi-GIArgInfo.html @@ -3,7 +3,7 @@ GIArgInfo - + diff --git a/docs/reference/html/gi-GIBaseInfo.html b/docs/reference/html/gi-GIBaseInfo.html index 71f5bb8..4ee539c 100644 --- a/docs/reference/html/gi-GIBaseInfo.html +++ b/docs/reference/html/gi-GIBaseInfo.html @@ -3,7 +3,7 @@ GIBaseInfo - + diff --git a/docs/reference/html/gi-GICallableInfo.html b/docs/reference/html/gi-GICallableInfo.html index 955eca8..08addfc 100644 --- a/docs/reference/html/gi-GICallableInfo.html +++ b/docs/reference/html/gi-GICallableInfo.html @@ -3,7 +3,7 @@ GICallableInfo - + diff --git a/docs/reference/html/gi-GIConstantInfo.html b/docs/reference/html/gi-GIConstantInfo.html index 0eb12b7..8b77f94 100644 --- a/docs/reference/html/gi-GIConstantInfo.html +++ b/docs/reference/html/gi-GIConstantInfo.html @@ -3,7 +3,7 @@ GIConstantInfo - + diff --git a/docs/reference/html/gi-GIEnumInfo.html b/docs/reference/html/gi-GIEnumInfo.html index d01a3f6..523a277 100644 --- a/docs/reference/html/gi-GIEnumInfo.html +++ b/docs/reference/html/gi-GIEnumInfo.html @@ -3,7 +3,7 @@ GIEnumInfo - + diff --git a/docs/reference/html/gi-GIFieldInfo.html b/docs/reference/html/gi-GIFieldInfo.html index 2827f91..ad1397c 100644 --- a/docs/reference/html/gi-GIFieldInfo.html +++ b/docs/reference/html/gi-GIFieldInfo.html @@ -3,7 +3,7 @@ GIFieldInfo - + diff --git a/docs/reference/html/gi-GIFunctionInfo.html b/docs/reference/html/gi-GIFunctionInfo.html index e2ba5a6..effd10b 100644 --- a/docs/reference/html/gi-GIFunctionInfo.html +++ b/docs/reference/html/gi-GIFunctionInfo.html @@ -3,7 +3,7 @@ GIFunctionInfo - + diff --git a/docs/reference/html/gi-GIInterfaceInfo.html b/docs/reference/html/gi-GIInterfaceInfo.html index 564f8eb..ef07999 100644 --- a/docs/reference/html/gi-GIInterfaceInfo.html +++ b/docs/reference/html/gi-GIInterfaceInfo.html @@ -3,7 +3,7 @@ GIInterfaceInfo - + diff --git a/docs/reference/html/gi-GIObjectInfo.html b/docs/reference/html/gi-GIObjectInfo.html index 7a4b87c..0054a93 100644 --- a/docs/reference/html/gi-GIObjectInfo.html +++ b/docs/reference/html/gi-GIObjectInfo.html @@ -3,7 +3,7 @@ GIObjectInfo - + diff --git a/docs/reference/html/gi-GIPropertyInfo.html b/docs/reference/html/gi-GIPropertyInfo.html index 129a42d..2985908 100644 --- a/docs/reference/html/gi-GIPropertyInfo.html +++ b/docs/reference/html/gi-GIPropertyInfo.html @@ -3,7 +3,7 @@ GIPropertyInfo - + diff --git a/docs/reference/html/gi-GIRegisteredTypeInfo.html b/docs/reference/html/gi-GIRegisteredTypeInfo.html index e3de949..8258832 100644 --- a/docs/reference/html/gi-GIRegisteredTypeInfo.html +++ b/docs/reference/html/gi-GIRegisteredTypeInfo.html @@ -3,7 +3,7 @@ GIRegisteredTypeInfo - + diff --git a/docs/reference/html/gi-GISignalInfo.html b/docs/reference/html/gi-GISignalInfo.html index 8f6c41b..ac3f8f1 100644 --- a/docs/reference/html/gi-GISignalInfo.html +++ b/docs/reference/html/gi-GISignalInfo.html @@ -3,7 +3,7 @@ GISignalInfo - + diff --git a/docs/reference/html/gi-GIStructInfo.html b/docs/reference/html/gi-GIStructInfo.html index e32914f..544cf39 100644 --- a/docs/reference/html/gi-GIStructInfo.html +++ b/docs/reference/html/gi-GIStructInfo.html @@ -3,7 +3,7 @@ GIStructInfo - + diff --git a/docs/reference/html/gi-GITypeInfo.html b/docs/reference/html/gi-GITypeInfo.html index 6e08020..a662b15 100644 --- a/docs/reference/html/gi-GITypeInfo.html +++ b/docs/reference/html/gi-GITypeInfo.html @@ -3,7 +3,7 @@ GITypeInfo - + diff --git a/docs/reference/html/gi-GIUnionInfo.html b/docs/reference/html/gi-GIUnionInfo.html index 8446204..ba2980c 100644 --- a/docs/reference/html/gi-GIUnionInfo.html +++ b/docs/reference/html/gi-GIUnionInfo.html @@ -3,7 +3,7 @@ GIUnionInfo - + diff --git a/docs/reference/html/gi-GIVFuncInfo.html b/docs/reference/html/gi-GIVFuncInfo.html index bf55952..2ff377e 100644 --- a/docs/reference/html/gi-GIVFuncInfo.html +++ b/docs/reference/html/gi-GIVFuncInfo.html @@ -3,7 +3,7 @@ GIVFuncInfo - + diff --git a/docs/reference/html/gi-ffi.html b/docs/reference/html/gi-ffi.html index 2e46882..49ee89c 100644 --- a/docs/reference/html/gi-ffi.html +++ b/docs/reference/html/gi-ffi.html @@ -3,7 +3,7 @@ GIR Foreign functions interface - + @@ -22,7 +22,7 @@

GIR Foreign functions interface

-
+
girffi
diff --git a/docs/reference/html/gi-gierrordomaininfo.html b/docs/reference/html/gi-gierrordomaininfo.html index 30a2afe..db01432 100644 --- a/docs/reference/html/gi-gierrordomaininfo.html +++ b/docs/reference/html/gi-gierrordomaininfo.html @@ -3,7 +3,7 @@ gierrordomaininfo - + diff --git a/docs/reference/html/gi-gir-reference.html b/docs/reference/html/gi-gir-reference.html index b23cac7..b68023e 100644 --- a/docs/reference/html/gi-gir-reference.html +++ b/docs/reference/html/gi-gir-reference.html @@ -3,7 +3,7 @@ The GIR XML format - + diff --git a/docs/reference/html/gi-gir.html b/docs/reference/html/gi-gir.html index 7c24908..9f58315 100644 --- a/docs/reference/html/gi-gir.html +++ b/docs/reference/html/gi-gir.html @@ -3,7 +3,7 @@ Part II. GIR markup format - + @@ -24,7 +24,7 @@ Part II. GIR markup format

Table of Contents

-
The GIR XML format
+
The GIR XML format
diff --git a/docs/reference/html/gi-girepository.html b/docs/reference/html/gi-girepository.html index 3595acb..129e9ca 100644 --- a/docs/reference/html/gi-girepository.html +++ b/docs/reference/html/gi-girepository.html @@ -3,7 +3,7 @@ girepository - + diff --git a/docs/reference/html/gi-girffi.html b/docs/reference/html/gi-girffi.html index dcd4d69..39dc342 100644 --- a/docs/reference/html/gi-girffi.html +++ b/docs/reference/html/gi-girffi.html @@ -3,7 +3,7 @@ girffi - + diff --git a/docs/reference/html/gi-gtypelib.html b/docs/reference/html/gi-gtypelib.html index fb258e4..4018c19 100644 --- a/docs/reference/html/gi-gtypelib.html +++ b/docs/reference/html/gi-gtypelib.html @@ -3,7 +3,7 @@ gtypelib - + diff --git a/docs/reference/html/gi-libgirepository.html b/docs/reference/html/gi-libgirepository.html index 025a87a..58bc2c4 100644 --- a/docs/reference/html/gi-libgirepository.html +++ b/docs/reference/html/gi-libgirepository.html @@ -3,7 +3,7 @@ GIRepository - + @@ -22,7 +22,7 @@

GIRepository

-
+
girepository
diff --git a/docs/reference/html/gi-overview.html b/docs/reference/html/gi-overview.html index 6cb55a8..bd7e06a 100644 --- a/docs/reference/html/gi-overview.html +++ b/docs/reference/html/gi-overview.html @@ -3,7 +3,7 @@ Introspection Overview - + diff --git a/docs/reference/html/gi-repository-structs.html b/docs/reference/html/gi-repository-structs.html index 0e73fd1..0c5413a 100644 --- a/docs/reference/html/gi-repository-structs.html +++ b/docs/reference/html/gi-repository-structs.html @@ -3,7 +3,7 @@ GIRepository structs - + @@ -22,7 +22,7 @@

GIRepository structs

-
+
Struct hierarchy — Struct hierarchy description for GIBaseInfo and all its sub structs
diff --git a/docs/reference/html/gi-struct-hierarchy.html b/docs/reference/html/gi-struct-hierarchy.html index 5fbc527..e5429f3 100644 --- a/docs/reference/html/gi-struct-hierarchy.html +++ b/docs/reference/html/gi-struct-hierarchy.html @@ -3,7 +3,7 @@ Struct hierarchy - + diff --git a/docs/reference/html/gi-typelib.html b/docs/reference/html/gi-typelib.html index 24dc3d5..7e71ed0 100644 --- a/docs/reference/html/gi-typelib.html +++ b/docs/reference/html/gi-typelib.html @@ -3,7 +3,7 @@ Typelib binary format - + @@ -22,7 +22,7 @@

Typelib binary format

-
+
gtypelib — Layout and accessors for typelib
diff --git a/docs/reference/html/girepository.html b/docs/reference/html/girepository.html index f1c9889..35e4b59 100644 --- a/docs/reference/html/girepository.html +++ b/docs/reference/html/girepository.html @@ -3,7 +3,7 @@ Part I.  - + @@ -24,7 +24,7 @@ Part I. 

Table of Contents

-
+
GIRepository
girepository diff --git a/docs/reference/html/glib.html b/docs/reference/html/glib.html index 1f849eb..326be9c 100644 --- a/docs/reference/html/glib.html +++ b/docs/reference/html/glib.html @@ -3,7 +3,7 @@ GObject-Introspection Overview - + @@ -22,7 +22,7 @@

GObject-Introspection Overview

-
+
Introspection Overview — General overview of introspection

diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html index c817271..97ac216 100644 --- a/docs/reference/html/index.html +++ b/docs/reference/html/index.html @@ -3,7 +3,7 @@ GObject Introspection Reference Manual - + @@ -15,7 +15,7 @@

-
+
GObject-Introspection Overview
Introspection Overview — General overview of introspection diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 2e516f5..d78bfdc 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -7421,6 +7421,81 @@ * * A helper class for testing code which uses D-Bus without touching the user's * session bus. + * + * + * Creating unit tests using GTestDBus + * + * Testing of D-Bus services can be tricky because normally we only ever run + * D-Bus services over an existing instance of the D-Bus daemon thus we + * usually don't activate D-Bus services that are not yet installed into the + * target system. The #GTestDBus object makes this easier for us by taking care + * of the lower level tasks such as running a private D-Bus daemon and looking + * up uninstalled services in customizable locations, typically in your source code tree. + * + * + * The first thing you will need is a separate service description file for the + * D-Bus daemon. Typically a 'services' subdirectory of your 'tests' directory + * is a good place to put this file. + * + * + * The service file should list your service along with an absolute path to the + * uninstalled service executable in your source tree. Using autotools we would + * achieve this by adding a file such as 'my-server.service.in' in the services + * directory and have it processed by configure. + * + * [D-BUS Service] + * Name=org.gtk.GDBus.Examples.ObjectManager + * Exec=@abs_top_builddir@/gio/tests/gdbus-example-objectmanager-server + * + * You will also need to indicate this service directory in your test + * fixtures, so you will need to pass the path while compiling your + * test cases. Typically this is done with autotools with an added + * preprocessor flag specified to compile your tests such as: + * + * -DTEST_SERVICES=\""$(abs_top_builddir)/tests/services"\" + * + * + * + * Once you have a service definition file which is local to your source tree, + * you can proceed to setup a GTest fixture using the GTestDBus scaffolding. + * + * Test Fixture for D-Bus services + * + * + * FIXME: MISSING XINCLUDE CONTENT + * + * + * + * + * + * Note that these examples only deal with isolating the D-Bus aspect of your + * service. To successfully run isolated unit tests on your service you may need + * some additional modifications to your test case fixture. For example; if your + * service uses GSettings and installs a schema then it is important that your test service + * not load the schema in the ordinary installed location (chances are that your service + * and schema files are not yet installed, or worse; there is an older version of the + * schema file sitting in the install location). + * + * + * Most of the time we can work around these obstacles using the environment. Since the + * environment is inherited by the D-Bus daemon created by GTestDBus and then in turn + * inherited by any services the D-Bus daemon activates, using the setup routine for your + * fixture is a practical place to help sandbox your runtime environment. For the rather + * typical GSettings case we can work around this by setting GSETTINGS_SCHEMA_DIR to the + * in tree directory holding your schemas in the above fixture_setup() routine. + * + * + * The GSettings schemas need to be locally pre-compiled for this to work. This can be achieved + * by compiling the schemas locally as a step before running test cases, an autotools setup might + * do the following in the directory holding schemas: + * + * all-am: + * $(GLIB_COMPILE_SCHEMAS) . + * + * CLEANFILES += gschemas.compiled + * + * + * */ diff --git a/gobject-introspection-1.0.pc b/gobject-introspection-1.0.pc index 72c538c..8d27f36 100644 --- a/gobject-introspection-1.0.pc +++ b/gobject-introspection-1.0.pc @@ -21,4 +21,4 @@ Libs.private: Name: gobject-introspection Description: GObject Introspection -Version: 1.35.9 +Version: 1.36.0 diff --git a/gobject-introspection-no-export-1.0.pc b/gobject-introspection-no-export-1.0.pc index 125fdde..e5b8548 100644 --- a/gobject-introspection-no-export-1.0.pc +++ b/gobject-introspection-no-export-1.0.pc @@ -20,4 +20,4 @@ Libs.private: Name: gobject-introspection Description: GObject Introspection -Version: 1.35.9 +Version: 1.36.0 -- 2.7.4