[libgda] Build fixes for GI, Vala and Vala Extensions Bug 687235 * GObject Introspection check pre-requisites
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Build fixes for GI, Vala and Vala Extensions Bug 687235 * GObject Introspection check pre-requisites
- Date: Thu, 1 Nov 2012 23:18:09 +0000 (UTC)
commit c1dca18e159df68bd5e9854501749c9f81233899
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Nov 1 16:57:39 2012 -0600
Build fixes for GI, Vala and Vala Extensions Bug 687235
* GObject Introspection check pre-requisites
* Vala bindings check pre-requisites
* Vala Extensions check pre-requisites
* Modified vapigen.m4 macros
* Added some help on switches for Vala bindings, GI and Vala Extensions
* Added AM_PROG_VALAC checks for correct Vala compiler version
* Gir and Vala bindings updates
configure.ac | 62 +-
libgda/Gda-5.0.gir |25273 ------------------------------------------------
libgda/libgda-5.0.vapi | 180 +-
m4/vapigen.m4 | 209 +-
4 files changed, 232 insertions(+), 25492 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 559cc89..951a491 100644
--- a/configure.ac
+++ b/configure.ac
@@ -434,7 +434,7 @@ dnl Check for GObject Introspection
dnl *********************************
GOBJECT_INTROSPECTION_CHECK([1.30.0])
AC_ARG_ENABLE([gda-gi],
- AS_HELP_STRING([--enable-gda-gi], [Enable GObject Introspection for libgda [default=auto]]),
+ AS_HELP_STRING([--enable-gda-gi[=@<:@no/auto/yes@:>@]], [Enable GObject Introspection for libgda [default=no]]),
[enable_gda_gi=$enableval],[enable_gda_gi=no])
if test "x$found_introspection" = "xyes"
@@ -457,7 +457,7 @@ fi
AM_CONDITIONAL(ENABLE_GDA_GI, [test "$enable_gda_gi" = "yes"])
AC_ARG_ENABLE([gdaui-gi],
- AS_HELP_STRING([--enable-gdaui-gi], [Enable GObject Introspection for libgda-ui [default=auto]]),
+ AS_HELP_STRING([--enable-gdaui-gi[=@<:@no/auto/yes@:>@]], [Enable GObject Introspection for libgda-ui [default=no]]),
[enable_gdaui_gi=$enableval],[enable_gdaui_gi=no])
if test "x$found_introspection" = "xyes"
@@ -479,39 +479,49 @@ fi
AM_CONDITIONAL(ENABLE_GDAUI_GI, [test "$enable_gdaui_gi" = "yes"])
AC_ARG_ENABLE([gi-system-install],
- AS_HELP_STRING([--enable-gi-system-install], [Install GObject Introspection files along with system installed files [default=yes]]),
+ AS_HELP_STRING([--enable-gi-system-install[=@<:@no/auto/yes@:>@]], [Install GObject Introspection files along with system installed files [default=yes]]),
[enable_gi_system_install=$enableval],[enable_gi_system_install=yes])
AM_CONDITIONAL(ENABLE_GI_SYSTEM_INSTALL, [test x"$enable_gi_system_install" = "xyes"])
-found_introspection=$enable_gda_gi
dnl ******************************
dnl Check for Vala Compiler
dnl ******************************
-enable_vala=no
-enable_vala_ext=no
+AM_PROG_VALAC([0.17.7])
+VAPIGEN_CHECK([0.17.7],[0.18],,no)
+
+if test "x$enable_gda_gi" != "xyes" -a "x$enable_gdaui_gi" = "xyes"
+then
+ AC_MSG_ERROR([GObject Introspection for GDA-UI is requested but GObject Introspection for GDA is disable. Use --enable-gda-gi])
+fi
+
+if test "x$enable_gda_gi" != "xyes" -a "x$enable_vala" = "xyes"
+then
+ AC_MSG_ERROR([Vala bindings is requested but GObject Introspection for GDA is disable. Use --enable-gda-gi])
+fi
+
AC_ARG_ENABLE([vala-extensions],
- AS_HELP_STRING([--enable-vala-extensions], [Enable support for Vala extensions [default=no]]),
+ AS_HELP_STRING([--enable-vala-extensions[=@<:@no/auto/yes@:>@]], [Enable utility GObject based extensions written in Vala [default=no]]),
[enable_vala_ext=$enableval],[enable_vala_ext=no])
-if test "x$enable_gda_gi" = "xyes"
+if test "x$enable_vala" != "xyes" -a "x$enable_vala_ext" = "xyes"
then
- if test "x$enable_vala_ext" = "xyes"
- then
- VAPIGEN_CHECK([0.17.7],[0.18])
- if test "x$enable_vala" != "xyes"
- then
- AC_MSG_ERROR([Vala extensions for Libgda are requested but Vala/vapigen is not available or enabled])
- fi
- dnl Check for libgee
- GEE_REQUIRED="0.8.0"
- PKG_CHECK_MODULES(GEE, gee-0.8 >= $GEE_REQUIRED)
- AC_SUBST(GEE_CFLAGS)
- AC_SUBST(GEE_LIBS)
- else
- AM_CONDITIONAL(ENABLE_VAPIGEN, false)
- fi
-else
- AM_CONDITIONAL(ENABLE_VAPIGEN, false)
+ AC_MSG_ERROR([Vala Extensions (Utility GObject clases written in Vala) is requested but Vala Bindings is disable. Use --enable-vala])
+fi
+
+if test "x$enable_vala_ext" = "xyes" -a "x$vapigen_pkg_found" != "xyes"
+then
+ AC_MSG_ERROR([Utility GObject clases written in Vala (Vala extensions) for Libgda are requested but Vala/vapigen is not available])
+ enable_vala_ext=no
+fi
+
+if test "x$enable_vala_ext" = "xyes"
+then
+ dnl Check for libgee
+ GEE_REQUIRED="0.8.0"
+ PKG_CHECK_MODULES(GEE, gee-0.8 >= $GEE_REQUIRED)
+ AC_SUBST(GEE_CFLAGS)
+ AC_SUBST(GEE_LIBS)
+ enable_vala_ext=yes
fi
AM_CONDITIONAL(ENABLE_VALA_EXTENSIONS, test "x$enable_vala_ext" = "xyes")
@@ -998,7 +1008,7 @@ echo " Building Libxslt extension: `if test x$have_xslt != xno; then echo yes;
echo " Building libgda GObject Introspection: `if test x$enable_gda_gi != xno; then echo yes; else echo no; fi`"
echo " Building libgda-ui GObject Introspection: `if test x$enable_gdaui_gi != xno; then echo yes; else echo no; fi`"
echo " Building Gtk-Doc: `if test x$enable_gtk_doc != xno; then echo yes; else echo no; fi`"
-echo " Building Vala Bindings: `if test x$enable_vala != xno; then echo yes; else echo no; fi`"
+echo " Building Vala Bindings: `if test x$vapigen_pkg_found != xyes; then echo no; else echo yes; fi`"
echo " Building Vala Extensions: `if test x$enable_vala_ext != xno; then echo yes; else echo no; fi`"
echo " Building Vala Documentation: `if test x$enable_vala_doc != xno; then echo yes; else echo no; fi`"
echo " Building Building Libgda's associated tools: `if test x$enable_tools = xyes; then echo yes; else echo no; fi`"
diff --git a/libgda/libgda-5.0.vapi b/libgda/libgda-5.0.vapi
index 047a93a..2fe30fe 100644
--- a/libgda/libgda-5.0.vapi
+++ b/libgda/libgda-5.0.vapi
@@ -1,17 +1,7 @@
-/* libgda-5.0.vapi generated by vapigen-0.16, do not modify. */
+/* libgda-5.0.vapi generated by vapigen-0.18, do not modify. */
[CCode (cprefix = "Gda", gir_namespace = "Gda", gir_version = "5.0", lower_case_cprefix = "gda_")]
namespace Gda {
- [CCode (cheader_filename = "libgda/libgda.h")]
- [Compact]
- public class AttributesManager {
- public void clear (void* ptr);
- public void copy (void* from, Gda.AttributesManager to_mgr, void* to);
- public void free ();
- public GLib.Value @get (void* ptr, string att_name);
- public void @set (void* ptr, string att_name, GLib.Value value);
- public void set_full (void* ptr, string att_name, GLib.Value value, GLib.DestroyNotify destroy);
- }
[CCode (cheader_filename = "libgda/libgda.h", type_id = "gda_batch_get_type ()")]
public class Batch : GLib.Object {
[CCode (has_construct_function = false)]
@@ -182,6 +172,8 @@ namespace Gda {
[NoAccessorMethod]
public int events_history_size { get; set; }
[NoAccessorMethod]
+ public uint execution_slowdown { get; set; }
+ [NoAccessorMethod]
public bool execution_timer { get; set; }
[NoAccessorMethod]
public bool is_wrapper { get; construct; }
@@ -211,7 +203,7 @@ namespace Gda {
public unowned string get_source ();
public unowned string get_sqlstate ();
public void set_code (long code);
- public void set_description (string description);
+ public void set_description (string? description);
public void set_event_type (Gda.ConnectionEventType type);
public void set_gda_code (Gda.ConnectionEventCode code);
public void set_source (string source);
@@ -319,25 +311,6 @@ namespace Gda {
public virtual signal void end_of_data ();
public virtual signal void row_changed (int row);
}
- [CCode (cheader_filename = "libgda/libgda.h", type_id = "gda_data_model_ldap_get_type ()")]
- public class DataModelLdap : GLib.Object, Gda.DataModel {
- [CCode (has_construct_function = false)]
- protected DataModelLdap ();
- public static GLib.List<Gda.Column> compute_columns (Gda.Connection cnc, string? attributes);
- [Deprecated (since = "5.2")]
- public static Gda.DataModel @new (Gda.Connection cnc, string? base_dn, string? filter, string? attributes, Gda.LdapSearchScope scope);
- [CCode (has_construct_function = false)]
- public DataModelLdap.with_config (Gda.Connection cnc, string? base_dn, string? filter, string? attributes, Gda.LdapSearchScope scope);
- public string attributes { construct; }
- [NoAccessorMethod]
- public string @base { owned get; construct; }
- [NoAccessorMethod]
- public string filter { owned get; construct; }
- [NoAccessorMethod]
- public int scope { get; construct; }
- [NoAccessorMethod]
- public bool use_rdn { get; set; }
- }
[CCode (cheader_filename = "libgda/libgda.h", type_id = "gda_data_pivot_get_type ()")]
public class DataPivot : GLib.Object, Gda.DataModel {
[CCode (has_construct_function = false)]
@@ -387,6 +360,8 @@ namespace Gda {
[CCode (has_construct_function = false)]
public DataProxy.with_data_model (Gda.DataModel model);
[NoAccessorMethod]
+ public bool cache_changes { get; set; }
+ [NoAccessorMethod]
public bool defer_sync { get; set; }
[NoAccessorMethod]
public Gda.DataModel model { owned get; set construct; }
@@ -423,6 +398,7 @@ namespace Gda {
[NoWrapper]
public virtual bool fetch_random (Gda.Row prow, int rownum) throws GLib.Error;
public unowned Gda.Connection get_connection ();
+ public bool prepare_for_offline () throws GLib.Error;
public bool rerun () throws GLib.Error;
public bool set_modification_statement (Gda.Statement mod_stmt) throws GLib.Error;
public bool set_modification_statement_sql (string sql) throws GLib.Error;
@@ -1105,17 +1081,6 @@ namespace Gda {
[Compact]
public class TreeMgrLabelPriv {
}
- [CCode (cheader_filename = "libgda/libgda.h", type_id = "gda_tree_mgr_ldap_get_type ()")]
- public class TreeMgrLdap : Gda.TreeManager {
- [CCode (has_construct_function = false, type = "GdaTreeManager*")]
- public TreeMgrLdap (Gda.Connection cnc, string? dn);
- [NoAccessorMethod]
- public string dn { owned get; construct; }
- }
- [CCode (cheader_filename = "libgda/libgda.h")]
- [Compact]
- public class TreeMgrLdapPriv {
- }
[CCode (cheader_filename = "libgda/libgda.h", type_id = "gda_tree_mgr_schemas_get_type ()")]
public class TreeMgrSchemas : Gda.TreeManager {
[CCode (has_construct_function = false, type = "GdaTreeManager*")]
@@ -1470,19 +1435,19 @@ namespace Gda {
public weak Gda.SqlParser parser;
public weak Gda.SqlStatement parsed_statement;
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_BATCH_CONFLICTING_PARAMETER_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_BATCH_CONFLICTING_PARAMETER_", has_type_id = false)]
public enum BatchError {
[CCode (cname = "GDA_BATCH_CONFLICTING_PARAMETER_ERROR")]
BATCH_CONFLICTING_PARAMETER_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONFIG_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONFIG_", has_type_id = false)]
public enum ConfigError {
DSN_NOT_FOUND_ERROR,
PERMISSION_ERROR,
PROVIDER_NOT_FOUND_ERROR,
PROVIDER_CREATION_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_", has_type_id = false)]
public enum ConnectionError {
DSN_NOT_FOUND_ERROR,
PROVIDER_NOT_FOUND_ERROR,
@@ -1497,7 +1462,7 @@ namespace Gda {
CLOSED_ERROR,
META_DATA_CONTEXT_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_EVENT_CODE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_EVENT_CODE_", has_type_id = false)]
public enum ConnectionEventCode {
CONSTRAINT_VIOLATION,
RESTRICT_VIOLATION,
@@ -1519,14 +1484,14 @@ namespace Gda {
SYNTAX_ERROR,
UNKNOWN
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_EVENT_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_EVENT_", has_type_id = false)]
public enum ConnectionEventType {
NOTICE,
WARNING,
ERROR,
COMMAND
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_FEATURE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_FEATURE_", has_type_id = false)]
public enum ConnectionFeature {
AGGREGATES,
BLOBS,
@@ -1547,7 +1512,7 @@ namespace Gda {
MULTI_THREADING,
LAST
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_META_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_META_", has_type_id = false)]
public enum ConnectionMetaType {
NAMESPACES,
TYPES,
@@ -1556,7 +1521,7 @@ namespace Gda {
FIELDS,
INDEXES
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_OPTIONS_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_OPTIONS_", has_type_id = false)]
[Flags]
public enum ConnectionOptions {
NONE,
@@ -1566,19 +1531,19 @@ namespace Gda {
THREAD_ISOLATED,
AUTO_META_DATA
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_COMPARATOR_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_COMPARATOR_", has_type_id = false)]
public enum DataComparatorError {
MISSING_DATA_MODEL_ERROR,
COLUMN_TYPES_MISMATCH_ERROR,
MODEL_ACCESS_ERROR,
USER_CANCELLED_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_META_WRAPPER_MODE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_META_WRAPPER_MODE_", has_type_id = false)]
public enum DataMetaWrapperMode {
LC,
UC
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_ACCESS_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_ACCESS_", has_type_id = false)]
[Flags]
public enum DataModelAccessFlags {
RANDOM,
@@ -1590,23 +1555,23 @@ namespace Gda {
DELETE,
WRITE
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_HINT_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_HINT_", has_type_id = false)]
public enum DataModelHint {
START_BATCH_UPDATE,
END_BATCH_UPDATE,
REFRESH
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_IO_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_IO_", has_type_id = false)]
public enum DataModelIOFormat {
DATA_ARRAY_XML,
TEXT_SEPARATED
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_", has_type_id = false)]
public enum DataModelIterError {
[CCode (cname = "GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR")]
DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_PIVOT_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_PIVOT_", has_type_id = false)]
public enum DataPivotAggregate {
AVG,
COUNT,
@@ -1614,7 +1579,7 @@ namespace Gda {
MIN,
SUM
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_PIVOT_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_PIVOT_", has_type_id = false)]
public enum DataPivotError {
INTERNAL_ERROR,
SOURCE_MODEL_ERROR,
@@ -1622,12 +1587,12 @@ namespace Gda {
USAGE_ERROR,
OVERFLOW_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_PIVOT_FIELD_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_PIVOT_FIELD_", has_type_id = false)]
public enum DataPivotFieldType {
ROW,
COLUMN
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_PROXY_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_PROXY_", has_type_id = false)]
public enum DataProxyError {
COMMIT_ERROR,
COMMIT_CANCELLED,
@@ -1635,12 +1600,12 @@ namespace Gda {
READ_ONLY_ROW,
FILTER_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_SELECT_COND_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_SELECT_COND_", has_type_id = false)]
public enum DataSelectConditionType {
PK,
ALL_COLUMNS
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_SELECT_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_SELECT_", has_type_id = false)]
public enum DataSelectError {
MODIFICATION_STATEMENT_ERROR,
MISSING_MODIFICATION_STATEMENT_ERROR,
@@ -1649,31 +1614,25 @@ namespace Gda {
SQL_ERROR,
SAFETY_LOCKED_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DIFF_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DIFF_", has_type_id = false)]
public enum DiffType {
ADD_ROW,
REMOVE_ROW,
MODIFY_ROW
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_HOLDER_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_HOLDER_", has_type_id = false)]
public enum HolderError {
STRING_CONVERSION_ERROR,
VALUE_TYPE_ERROR,
VALUE_NULL_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_LDAP_SEARCH_")]
- public enum LdapSearchScope {
- BASE,
- ONELEVEL,
- SUBTREE
- }
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_DB_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_DB_", has_type_id = false)]
public enum MetaDbObjectType {
UNKNOWN,
TABLE,
VIEW
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_FOREIGN_KEY_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_FOREIGN_KEY_", has_type_id = false)]
public enum MetaForeignKeyPolicy {
UNKNOWN,
NONE,
@@ -1683,24 +1642,24 @@ namespace Gda {
SET_NULL,
SET_DEFAULT
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_GRAPH_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_GRAPH_", has_type_id = false)]
[Flags]
public enum MetaGraphInfo {
[CCode (cname = "GDA_META_GRAPH_COLUMNS")]
META_GRAPH_COLUMNS
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_SORT_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_SORT_", has_type_id = false)]
public enum MetaSortType {
ALHAPETICAL,
DEPENDENCIES
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STORE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STORE_", has_type_id = false)]
public enum MetaStoreChangeType {
ADD,
REMOVE,
MODIFY
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STORE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STORE_", has_type_id = false)]
public enum MetaStoreError {
INCORRECT_SCHEMA_ERROR,
UNSUPPORTED_PROVIDER_ERROR,
@@ -1715,14 +1674,14 @@ namespace Gda {
SCHEMA_OBJECT_DESCR_ERROR,
TRANSACTION_ALREADY_STARTED_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STRUCT_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STRUCT_", has_type_id = false)]
public enum MetaStructError {
UNKNOWN_OBJECT_ERROR,
DUPLICATE_OBJECT_ERROR,
INCOHERENCE_ERROR,
XML_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STRUCT_FEATURE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STRUCT_FEATURE_", has_type_id = false)]
[Flags]
public enum MetaStructFeature {
NONE,
@@ -1730,7 +1689,7 @@ namespace Gda {
VIEW_DEPENDENCIES,
ALL
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_CREATE_TABLE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_CREATE_TABLE_", has_type_id = false)]
[Flags]
public enum ServerOperationCreateTableFlag {
NOTHING_FLAG,
@@ -1741,19 +1700,19 @@ namespace Gda {
FKEY_FLAG,
PKEY_AUTOINC_FLAG
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_", has_type_id = false)]
public enum ServerOperationError {
OBJECT_NAME_ERROR,
INCORRECT_VALUE_ERROR,
XML_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_STATUS_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_STATUS_", has_type_id = false)]
public enum ServerOperationNodeStatus {
OPTIONAL,
REQUIRED,
UNKNOWN
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_NODE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_NODE_", has_type_id = false)]
public enum ServerOperationNodeType {
PARAMLIST,
DATA_MODEL,
@@ -1763,7 +1722,7 @@ namespace Gda {
DATA_MODEL_COLUMN,
UNKNOWN
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_", has_type_id = false)]
public enum ServerOperationType {
CREATE_DB,
DROP_DB,
@@ -1783,7 +1742,7 @@ namespace Gda {
DROP_USER,
LAST
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_PROVIDER_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_PROVIDER_", has_type_id = false)]
public enum ServerProviderError {
METHOD_NON_IMPLEMENTED_ERROR,
PREPARE_STMT_ERROR,
@@ -1800,7 +1759,7 @@ namespace Gda {
MISUSE_ERROR,
FILE_NOT_FOUND_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SET_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SET_", has_type_id = false)]
public enum SetError {
XML_SPEC_ERROR,
HOLDER_NOT_FOUND_ERROR,
@@ -1808,18 +1767,18 @@ namespace Gda {
READ_ONLY_ERROR,
IMPLEMENTATION_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_BUILDER_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_BUILDER_", has_type_id = false)]
public enum SqlBuilderError {
WRONG_TYPE_ERROR,
MISUSE_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_IDENTIFIERS_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_IDENTIFIERS_", has_type_id = false)]
[Flags]
public enum SqlIdentifierStyle {
LOWER_CASE,
UPPER_CASE
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_OPERATOR_TYPE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_OPERATOR_TYPE_", has_type_id = false)]
public enum SqlOperatorType {
AND,
OR,
@@ -1851,15 +1810,17 @@ namespace Gda {
BITAND,
BITOR,
BITNOT,
- ILIKE
+ ILIKE,
+ NOTLIKE,
+ NOTILIKE
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_PARSER_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_PARSER_", has_type_id = false)]
public enum SqlParserError {
SYNTAX_ERROR,
OVERFLOW_ERROR,
EMPTY_SQL_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_PARSER_FLAVOUR_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_PARSER_FLAVOUR_", has_type_id = false)]
public enum SqlParserFlavour {
STANDARD,
SQLITE,
@@ -1867,12 +1828,12 @@ namespace Gda {
ORACLE,
POSTGRESQL
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_PARSER_MODE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_PARSER_MODE_", has_type_id = false)]
public enum SqlParserMode {
PARSE,
DELIMIT
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_SELECT_JOIN_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_SELECT_JOIN_", has_type_id = false)]
public enum SqlSelectJoinType {
CROSS,
NATURAL,
@@ -1882,7 +1843,7 @@ namespace Gda {
FULL;
public static unowned string to_string (Gda.SqlSelectJoinType type);
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_STATEMENT_COMPOUND_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_STATEMENT_COMPOUND_", has_type_id = false)]
public enum SqlStatementCompoundType {
UNION,
UNION_ALL,
@@ -1891,7 +1852,7 @@ namespace Gda {
EXCEPT,
EXCEPT_ALL
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_STATEMENT_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_STATEMENT_", has_type_id = false)]
public enum SqlStatementType {
SELECT,
INSERT,
@@ -1907,7 +1868,7 @@ namespace Gda {
UNKNOWN,
NONE
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_STATEMENT_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_STATEMENT_", has_type_id = false)]
public enum StatementError {
PARSE_ERROR,
SYNTAX_ERROR,
@@ -1917,16 +1878,17 @@ namespace Gda {
PARAM_TYPE_ERROR,
PARAM_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_STATEMENT_MODEL_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_STATEMENT_MODEL_", has_type_id = false)]
[Flags]
public enum StatementModelUsage {
RANDOM_ACCESS,
CURSOR_FORWARD,
CURSOR_BACKWARD,
CURSOR,
- ALLOW_NOPARAM
+ ALLOW_NOPARAM,
+ OFFLINE
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_STATEMENT_SQL_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_STATEMENT_SQL_", has_type_id = false)]
[Flags]
public enum StatementSqlFlag {
PARAMS_AS_VALUES,
@@ -1938,17 +1900,17 @@ namespace Gda {
PARAMS_AS_QMARK,
PARAMS_AS_UQMARK
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_THREAD_NOTIFICATION_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_THREAD_NOTIFICATION_", has_type_id = false)]
public enum ThreadNotificationType {
JOB,
SIGNAL
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_THREAD_WRAPPER_UNKNOWN_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_THREAD_WRAPPER_UNKNOWN_", has_type_id = false)]
public enum ThreadWrapperError {
[CCode (cname = "GDA_THREAD_WRAPPER_UNKNOWN_ERROR")]
THREAD_WRAPPER_UNKNOWN_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TRANSACTION_ISOLATION_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TRANSACTION_ISOLATION_", has_type_id = false)]
public enum TransactionIsolation {
UNKNOWN,
READ_COMMITTED,
@@ -1956,33 +1918,33 @@ namespace Gda {
REPEATABLE_READ,
SERIALIZABLE
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TRANSACTION_STATUS_EVENT_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TRANSACTION_STATUS_EVENT_", has_type_id = false)]
public enum TransactionStatusEventType {
SAVEPOINT,
SQL,
SUB_TRANSACTION
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TRANSACTION_STATUS_STATE_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TRANSACTION_STATUS_STATE_", has_type_id = false)]
public enum TransactionStatusState {
OK,
FAILED
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TREE_UNKNOWN_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TREE_UNKNOWN_", has_type_id = false)]
public enum TreeError {
[CCode (cname = "GDA_TREE_UNKNOWN_ERROR")]
TREE_UNKNOWN_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TREE_MANAGER_UNKNOWN_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TREE_MANAGER_UNKNOWN_", has_type_id = false)]
public enum TreeManagerError {
[CCode (cname = "GDA_TREE_MANAGER_UNKNOWN_ERROR")]
TREE_MANAGER_UNKNOWN_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TREE_NODE_UNKNOWN_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TREE_NODE_UNKNOWN_", has_type_id = false)]
public enum TreeNodeError {
[CCode (cname = "GDA_TREE_NODE_UNKNOWN_ERROR")]
TREE_NODE_UNKNOWN_ERROR
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_VALUE_ATTR_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_VALUE_ATTR_", has_type_id = false)]
[Flags]
public enum ValueAttribute {
NONE,
@@ -1997,7 +1959,7 @@ namespace Gda {
NO_MODIF,
UNUSED
}
- [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_XA_TRANSACTION_")]
+ [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_XA_TRANSACTION_", has_type_id = false)]
public enum XaTransactionError {
ALREADY_REGISTERED_ERROR,
DTP_NOT_SUPPORTED_ERROR,
diff --git a/m4/vapigen.m4 b/m4/vapigen.m4
index ff3c6b4..bcbccb6 100644
--- a/m4/vapigen.m4
+++ b/m4/vapigen.m4
@@ -1,6 +1,6 @@
dnl vapigen.m4
dnl
-dnl Copyright 2012 Evan Nemerson
+dnl Copyright 2012 Evan Nemerson, Daniel Espinosa
dnl
dnl This library is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU Lesser General Public
@@ -18,37 +18,36 @@ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 US
# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT])
# --------------------------------------
-# Check vapigen existence and version
+# Check vapigen existence and version. GObject Introspection is required, then
+# set FOUND-INTROSPECTION to [yes] or use call GOBJECT_INTROSPECTION_CHECK or
+# GOBJECT_INTROSPECTION_REQUIRE. This is an internal macro, use VAPIGEN_CHECK,
+# VAPIGEN_GI_CHECK or VAPIGEN_GI_REQUIRE.
#
# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
-AC_DEFUN([VAPIGEN_CHECK],
+m4_define([_VAPIGEN_CHECK_INTERNAL],
[
- AC_REQUIRE([GOBJECT_INTROSPECTION_CHECK])
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_REQUIRE([AM_PROG_VALAC])
-
AC_ARG_ENABLE([vala],
- [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],
- [enable_vala=$withval],[
- AS_IF([test "x$4" = "x"], [
+ [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[
+ AS_IF([ test "x$4" = "x"], [
enable_vala=auto
], [
enable_vala=$4
])
])
- AS_CASE([$enable_vala], [no], [enable_vala=no],
- [yes], [
- AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
- AC_MSG_ERROR([Vala bindings require GObject Introspection])
- ])
- ], [auto], [
- AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
- enable_vala=no
- ])
- ], [
- AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@])
- ])
-
+ AS_IF([ test "x$enable_vala" = "xyes" -o "x$enable_vala" = "xauto"],
+ [
+ AS_IF([ test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
+ AC_MSG_ERROR([Vala bindings require GObject Introspection])
+ ])
+ ], [
+ AS_IF([ test "x$enable_vala" != "no"],[
+ vapigen_pkg_found=no
+ ],[
+ AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@])
+ ])
+ ])
AS_IF([ test "x$2" = "x"], [
vapigen_pkg_name=vapigen
], [
@@ -59,71 +58,113 @@ AC_DEFUN([VAPIGEN_CHECK],
], [
vapigen_pkg="$vapigen_pkg_name >= $1"
])
-
- PKG_CHECK_EXISTS([$vapigen_pkg], [
- AS_IF([test "$enable_vala" = "auto"], [
- vapigen_pkg_found=yes
- ])
- ], [
- vapigen_pkg_found=no
- AC_PATH_PROG(VAPIGEN, [$vapigen_pkg_name], [no])
- if test "x$VAPIGEN" = "xno"
- then
- check_prog=no
- else
- check_prog=yes
- fi
- ])
-
- AC_MSG_CHECKING([for vapigen])
-
- AS_CASE([$vapigen_pkg_found],
- [yes], [
- VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen`
- VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen
- AS_IF([test "x$2" = "x"], [
- VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen`
- ], [
- VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen`
- ])
- ],
- [no], [
- AS_CASE([$check_prog],[no],[
- AC_MSG_ERROR([Can't locate $vapigen_pkg])
- ], [yes], [
- AS_IF([test "x$2" = "x"], [
- vala_pkg_name=libvala
- ], [
- vala_pkg_name=libvala-$2
- ])
- AS_IF([test "x$1" = "x"], [
- vala_pkg="$vala_pkg_name"
- ], [
- vala_pkg="$vala_pkg_name >= $1"
- ])
- PKG_CHECK_EXISTS([$vala_pkg], [
- AS_IF([test "$enable_vala" = "auto"], [
- VALA_DATADIR=`pkg-config $vala_pkg --variable=datadir`
- VAPIGEN_VAPIDIR="$VALA_DATADIR/vala/vapi"
- VAPIGEN_MAKEFILE="$VALA_DATADIR/vala/Makefile.vapigen"
- vapigen_pkg_found=yes
- ])
- ], [
- AS_CASE([$enable_vala], [yes], [
- AC_MSG_ERROR([$vala_pkg not found])
- ], [auto], [
- vapigen_pkg_found=no
- ])
- ])
- ])
- ])
+ AS_IF([ test "x$enable_vala" = "xyes" -o "x$enable_vala" = "xauto"], [
+ AC_MSG_CHECKING([for vapigen $vapigen_pkg_name])
+ PKG_CHECK_EXISTS([ $vapigen_pkg ], [
+ vapigen_pkg_found=yes
+ ], [
+ vapigen_pkg_found=no
+ AC_MSG_RESULT([no])
+ AC_MSG_NOTICE([Searching for $vapigen_pkg_name program...])
+ AC_PATH_PROG(VAPIGEN, [$vapigen_pkg_name], [no])
+ if test "x$VAPIGEN" = "xno"
+ then
+ check_prog=no
+ else
+ check_prog=yes
+ fi
+ ])
+
+ AS_CASE([$vapigen_pkg_found],
+ [yes], [
+ VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen`
+ VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen
+ AS_IF([ test "x$2" = "x"], [
+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen`
+ ], [
+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen`
+ ])
+ ],
+ [no], [
+ AS_CASE([$check_prog],[no],[
+ AC_MSG_ERROR([Can't locate $vapigen_pkg program])
+ ], [yes], [
+ AS_IF([ test "x$2" = "x"], [
+ vala_pkg_name=libvala
+ ], [
+ vala_pkg_name=libvala-$2
+ ])
+ AS_IF([ test "x$1" = "x"], [
+ vala_pkg="$vala_pkg_name"
+ ], [
+ vala_pkg="$vala_pkg_name >= $1"
+ ])
+ AC_MSG_CHECKING([for $vala_pkg])
+ PKG_CHECK_EXISTS([$vala_pkg], [
+ VALA_DATADIR=`pkg-config $vala_pkg --variable=datadir`
+ VAPIGEN_VAPIDIR="$VALA_DATADIR/vala/vapi"
+ VAPIGEN_MAKEFILE="$VALA_DATADIR/vala/Makefile.vapigen"
+ vapigen_pkg_found=yes
+ ], [
+ AS_CASE([$enable_vala], [yes], [
+ AC_MSG_ERROR([$vala_pkg not found])
+ ], [auto], [
+ vapigen_pkg_found=no
+ ])
+ ])
+ ])
+ ])
- AC_MSG_RESULT([$vapigen_pkg_found])
+ AC_MSG_RESULT([$vapigen_pkg_found])
- AC_SUBST([VAPIGEN])
- AC_SUBST([VAPIGEN_VAPIDIR])
- AC_SUBST([VAPIGEN_MAKEFILE])
+
+ ])
+ AC_SUBST([VAPIGEN])
+ AC_SUBST([VAPIGEN_VAPIDIR])
+ AC_SUBST([VAPIGEN_MAKEFILE])
- AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$vapigen_pkg_found" = "xyes")
+ AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$vapigen_pkg_found" = "xyes")
])
+dnl Check VAPIGEN
+# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT])
+# --------------------------------------
+# Check vapigen existence and version. Set FOUND-INTROSPECTION to [yes]
+# if you have detected GObject Introspection without GOBJECT_INTROSPECTION_CHECK
+# or GOBJECT_INTROSPECTION_REQUIRE macros.
+#
+# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
+AC_DEFUN([VAPIGEN_CHECK],
+[
+ _VAPIGEN_CHECK_INTERNAL($1,$2,$3,$4)
+]
+)
+
+dnl usage:
+# VAPIGEN_GI_CHECK([VERSION], [API_VERSION], [DEFAULT])
+# --------------------------------------
+# Check vapigen existence and version. You must call GOBJECT_INTROSPECTION_CHECK
+# first in order to call this macro.
+#
+# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
+AC_DEFUN([VAPIGEN_GI_CHECK],
+[
+ AC_REQUIRE([GOBJECT_INTROSPECTION_CHECK])
+ _VAPIGEN_CHECK_INTERNAL([$1],[$2],[$found_introspection],[$3])
+]
+)
+
+dnl usage:
+# VAPIGEN_GI_REQUIRE([VERSION], [API_VERSION], [DEFAULT])
+# --------------------------------------
+# Check vapigen existence and version. You must call GOBJECT_INTROSPECTION_REQUIRE
+# first in order to call this macro.
+#
+# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
+AC_DEFUN([VAPIGEN_GI_REQUIRE],
+[
+ AC_REQUIRE([GOBJECT_INTROSPECTION_REQUIRE])
+ _VAPIGEN_CHECK_INTERNAL([$1],[$2],[$found_introspection],[$3])
+]
+)
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]