Added introspection.

diff --git a/.gitignore b/.gitignore
index b16b44f18be67b4d2fa38feac1c1259f9d1229a5..4156f9f79e09876f8b8f2a33c1f75a317a5f84fb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,5 @@ Rules-quot
 tests/test
 *.csv
 gtk-doc.m4
+*.gir
+*.typelib

diff --git a/Makefile.am b/Makefile.am
index 40fce2d233fe891a21cd3d5502d501fb9c0bb980..2a981fbdcd771cd4d32fc7dfd3d2fca5df5100cb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
 
 SUBDIRS = src tests data docs
 

diff --git a/configure.ac b/configure.ac
index 8d6388b2a5afb1c80391f12f6480e23be5811186..2c8a4e46411e5bb6ae9e9dd8d27d685df2ff8d44 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,8 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 GTK_DOC_CHECK(1.0)
 
+GOBJECT_INTROSPECTION_CHECK([1.30.0])
+
 # Checks for libraries.
 PKG_CHECK_MODULES(LIBCONFI, [libgdaex >= 0.5.0])
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 9fc1bc6ed7c93971e438fc1ebfe05275555de1e4..58b75171ec672ce2f0bc15c26f3d932679512d8d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,3 +11,30 @@ libconfi_la_SOURCES = libconfi.c
 libconfi_la_LDFLAGS = -no-undefined
 
 include_HEADERS = libconfi.h
+
+CLEANFILES =
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all --accept-unprefixed --identifier-prefix=""
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
+
+if HAVE_INTROSPECTION
+introspection_sources = $(libconfi_la_SOURCES) $(include_HEADERS)
+
+Confi-1.0.gir: libconfi.la
+Confi_1_0_gir_INCLUDES = Gda-5.0
+Confi_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Confi_1_0_gir_LIBS = libconfi.la
+Confi_1_0_gir_FILES = $(introspection_sources)
+INTROSPECTION_GIRS += Confi-1.0.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif
\ No newline at end of file

diff --git a/src/libconfi.c b/src/libconfi.c
index ceea10754cad868da7b5ebce745a282b19c9e401..780ecc264fb404d1c741b2d6ab7f8c23e0bb1508 100644 (file)
--- a/src/libconfi.c
+++ b/src/libconfi.c
@@ -22,6 +22,8 @@
 
 #include <string.h>
 
+#include <libgdaex/libgdaex.h>
+
 #include "libconfi.h"
 
 enum
@@ -115,10 +117,10 @@ confi_init (Confi *confi)
  * @cnc_string: the connection string to use to connect to database that
  * contains configuration.
  * @name: configuration's name.
- * @root:
+ * @root: (nullable):
  * @create: whether create a config into database if @name doesn't exists.
  *
- * Returns: the newly created #Confi object, or NULL if it fails.
+ * Returns: (transfer none): the newly created #Confi object, or NULL if it fails.
  */
 Confi
 *confi_new (const gchar *cnc_string,
@@ -206,7 +208,7 @@ Confi
  * contains configuration.
  * @filter:
  *
- * Returns: a #GList of #Confi. If there's no configurations, returns a valid
+ * Returns: (element-type Confi) (transfer container):  a #GList of #Confi. If there's no configurations, returns a valid
  * #GList but with a unique NULL element.
  */
 GList

diff --git a/src/libconfi.h b/src/libconfi.h
index bcd97b503993346013276c6364cf6532278a0dcc..4ebf8db26af637915bf390b806d45d8c16b6cf57 100644 (file)
--- a/src/libconfi.h
+++ b/src/libconfi.h
@@ -19,10 +19,8 @@
 #ifndef __LIBCONFI_H__
 #define __LIBCONFI_H__
 
-#include <glib.h>
 #include <glib-object.h>
 
-#include <libgdaex/libgdaex.h>
 
 G_BEGIN_DECLS
 
@@ -59,7 +57,7 @@ typedef struct
                      *path;
        } ConfiKey;
 
-GType confi_get_type (void) G_GNUC_CONST;
+GType confi_get_type (void);
 
 Confi *confi_new (const gchar *cnc_string,
                   const gchar *name,

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d7edfb4604306c9164f944432524f3219df046ad..c76e13ff129a5b394ff9119909b095204ac76e51 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,3 +5,5 @@ LIBS = $(LIBCONFI_LIBS) \
        -L../src -lconfi
 
 noinst_PROGRAMS = test
+
+EXTRA_DIST = gir.py

diff --git a/tests/gir.py b/tests/gir.py
new file mode 100644 (file)
index 0000000..33a1948
--- /dev/null
+++ b/tests/gir.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python2\r
+\r
+from gi.repository import Confi\r
+\r
+# Create a new object\r
+confi = Confi.Confi.new("PostgreSQL://postgres:postgres@HOST=localhost;DB_NAME=confi", "Default", None, False)\r
+\r
+value = confi.path_get_value ("folder/key1/key1_2");\r
+\r
+print(value)
\ No newline at end of file