[libgda/gtk3: 25/26] Merge branch 'master' into gtk3
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda/gtk3: 25/26] Merge branch 'master' into gtk3
- Date: Sun, 27 Jun 2010 17:01:19 +0000 (UTC)
commit ea1564461de0e36d612c7f274ef573e3684d41d7
Merge: e30cbff f07ec30
Author: Vivien Malerba <malerba gnome-db org>
Date: Sun Jun 27 18:49:04 2010 +0200
Merge branch 'master' into gtk3
NEWS | 22 +
configure.ac | 28 +
control-center/gdaui-dsn-assistant.c | 2 +-
doc/C/libgda-sections.txt | 9 +-
doc/C/server-operation.xml | 56 ++
doc/C/tmpl/gda-convenient.sgml | 2 +-
doc/C/tmpl/gda-server-operation.sgml | 3 +
doc/C/tmpl/gda-sql-builder.sgml | 23 +-
installers/WindowsWix/make-zip-exe.sh | 4 +-
libgda-ui/data-entries/Makefile.am | 9 +
.../data-entries/gdaui-data-cell-renderer-bin.c | 22 +-
.../gdaui-data-cell-renderer-boolean.c | 63 +-
.../data-entries/gdaui-data-cell-renderer-combo.c | 16 +-
.../gdaui-data-cell-renderer-textual.c | 20 +-
.../data-entries/gdaui-data-cell-renderer-util.c | 42 +
.../data-entries/gdaui-data-cell-renderer-util.h | 27 +
libgda-ui/data-entries/gdaui-entry-shell.c | 36 +-
libgda-ui/data-entries/plugins/Makefile.am | 2 +-
.../plugins/gdaui-data-cell-renderer-cgrid.c | 134 ++--
.../plugins/gdaui-data-cell-renderer-password.c | 156 +++--
.../plugins/gdaui-data-cell-renderer-pict.c | 170 +++--
libgda-ui/data-entries/widget-embedder.c | 439 +++++++++++
libgda-ui/data-entries/widget-embedder.h | 51 ++
libgda-ui/gdaui-data-store.c | 14 +-
libgda-ui/gdaui-server-operation.c | 28 +
libgda/gda-data-model.c | 44 ++-
libgda/gda-easy.c | 4 +-
libgda/gda-easy.h | 4 +-
libgda/gda-holder.c | 15 +-
libgda/gda-server-operation.c | 8 +-
libgda/gda-server-operation.h | 4 +
libgda/gda-server-provider.c | 9 +
libgda/gda-sql-builder.c | 177 +++--
libgda/gda-sql-builder.h | 72 +-
libgda/libgda.symbols | 5 +-
libgda/sql-parser/gda-sql-parser.c | 158 ++--
libgda/sqlite/Makefile.am | 38 +-
libgda/sqlite/README | 18 +
libgda/sqlite/gda-sqlite-blob-op.c | 26 +-
libgda/sqlite/gda-sqlite-handler-bin.c | 4 +
libgda/sqlite/gda-sqlite-handler-boolean.c | 4 +
libgda/sqlite/gda-sqlite-meta.c | 51 +-
libgda/sqlite/gda-sqlite-provider.c | 224 +++---
libgda/sqlite/gda-sqlite-pstmt.c | 9 +-
libgda/sqlite/gda-sqlite-recordset.c | 77 +-
libgda/sqlite/gda-sqlite.h | 23 +-
libgda/sqlite/gda-symbols-util.c | 281 +++++++
libgda/sqlite/gda-symbols-util.h | 119 +++
libgda/sqlite/virtual/gda-vconnection-data-model.c | 10 +-
libgda/sqlite/virtual/gda-vprovider-data-model.c | 60 +-
po/POTFILES.in | 16 +
po/es.po | 784 ++++++++++----------
providers/Makefile.am | 5 +
providers/bdbsql/Makefile.am | 43 ++
providers/bdbsql/bdbsql_specs_add_column.xml.in | 1 +
providers/bdbsql/bdbsql_specs_create_db.xml.in | 1 +
providers/bdbsql/bdbsql_specs_create_index.xml.in | 1 +
providers/bdbsql/bdbsql_specs_create_table.xml.in | 1 +
providers/bdbsql/bdbsql_specs_create_view.xml.in | 1 +
providers/bdbsql/bdbsql_specs_drop_db.xml.in | 1 +
providers/bdbsql/bdbsql_specs_drop_index.xml.in | 1 +
providers/bdbsql/bdbsql_specs_drop_table.xml.in | 1 +
providers/bdbsql/bdbsql_specs_drop_view.xml.in | 1 +
providers/bdbsql/bdbsql_specs_dsn.xml.in | 1 +
providers/bdbsql/bdbsql_specs_rename_table.xml.in | 1 +
providers/bdbsql/libgda-bdbsql-4.0.pc.in | 9 +
providers/bdbsql/libmain.c | 121 +++
providers/postgres/Makefile.am | 6 +-
providers/postgres/gda-postgres-ddl.c | 252 +++++++-
providers/postgres/gda-postgres-ddl.h | 5 +
providers/postgres/gda-postgres-provider.c | 56 ++-
.../postgres/postgres_specs_create_role.xml.in | 47 ++
.../postgres/postgres_specs_create_user.xml.in | 26 +
providers/postgres/postgres_specs_drop_role.xml.in | 7 +
providers/postgres/postgres_specs_drop_user.xml.in | 7 +
providers/reuseable/mysql/gda-mysql-reuseable.c | 8 +-
.../reuseable/postgres/gda-postgres-reuseable.c | 2 +-
providers/sqlite/Makefile.am | 7 +-
providers/web/gda-web-recordset.c | 4 +-
samples/SqlBuilder/example.c | 122 ++--
samples/SqlBuilder/example_cnc.c | 70 +-
testing/gdaui-test-errors.c | 15 +-
tests/test-sql-builder.c | 86 ++--
tests/value-holders/check_holder.c | 60 +-
tests/value-holders/common.c | 4 +-
tools/browser/browser-connection.c | 14 +-
tools/browser/browser-favorites.c | 68 +-
tools/browser/data-manager/data-source.c | 6 +-
88 files changed, 3363 insertions(+), 1320 deletions(-)
---
diff --cc configure.ac
index f8eb9ad,f7577dd..a8d68a9
--- a/configure.ac
+++ b/configure.ac
@@@ -1770,26 -1795,28 +1795,28 @@@ providers/reuseable/Makefil
providers/reuseable/postgres/Makefile
providers/reuseable/mysql/Makefile
providers/bdb/Makefile
-providers/bdb/libgda-bdb-4.0.pc
+providers/bdb/libgda-bdb-5.0.pc
+ providers/bdbsql/Makefile
+ providers/bdbsql/libgda-bdbsql-4.0.pc
providers/mdb/Makefile
-providers/mdb/libgda-mdb-4.0.pc
+providers/mdb/libgda-mdb-5.0.pc
providers/mysql/Makefile
-providers/mysql/libgda-mysql-4.0.pc
+providers/mysql/libgda-mysql-5.0.pc
providers/oracle/Makefile
-providers/oracle/libgda-oracle-4.0.pc
+providers/oracle/libgda-oracle-5.0.pc
providers/postgres/Makefile
-providers/postgres/libgda-postgres-4.0.pc
+providers/postgres/libgda-postgres-5.0.pc
providers/sqlite/Makefile
-providers/sqlite/libgda-sqlite-4.0.pc
+providers/sqlite/libgda-sqlite-5.0.pc
providers/jdbc/Makefile
-providers/jdbc/libgda-jdbc-4.0.pc
+providers/jdbc/libgda-jdbc-5.0.pc
providers/web/Makefile
-providers/web/libgda-web-4.0.pc
+providers/web/libgda-web-5.0.pc
providers/skel-implementation/Makefile
providers/skel-implementation/capi/Makefile
-providers/skel-implementation/capi/libgda-capi-4.0.pc
+providers/skel-implementation/capi/libgda-capi-5.0.pc
providers/skel-implementation/models/Makefile
-providers/skel-implementation/models/libgda-models-4.0.pc
+providers/skel-implementation/models/libgda-models-5.0.pc
libgda-report/Makefile
libgda-report/engine/Makefile
libgda-report/DocBook/Makefile
diff --cc installers/WindowsWix/make-zip-exe.sh
index 46677b7,e57d381..7b292f2
--- a/installers/WindowsWix/make-zip-exe.sh
+++ b/installers/WindowsWix/make-zip-exe.sh
@@@ -196,31 -196,31 +196,31 @@@ add_files_to_zip $archive_ext $cross_pa
# includes
#
files=(gda-attributes-manager.h gda-batch.h gda-binreloc.h gda-blob-op.h gda-column.h gda-config.h gda-connection-event.h gda-connection.h gda-connection-private.h gda-data-access-wrapper.h gda-data-comparator.h gda-data-handler.h gda-data-model-array.h gda-data-model-bdb.h gda-data-model-dir.h gda-data-model-extra.h gda-data-model.h gda-data-model-import.h gda-data-model-iter-extra.h gda-data-model-iter.h gda-data-model-private.h gda-data-proxy.h gda-data-select.h gda-debug-macros.h gda-decl.h gda-easy.h gda-enums.h gda-enum-types.h gda-holder.h gda-lockable.h gda-log.h gda-marshal.h gda-meta-store.h gda-meta-struct.h gda-mutex.h gda-quark-list.h gda-row.h gda-server-operation.h gda-server-provider-extra.h gda-server-provider.h gda-server-provider-private.h gda-set.h gda-statement-extra.h gda-statement.h gda-transaction-status.h gda-transaction-status-private.h gda-util.h gda-value.h gda-xa-transaction.h libgda.h gda-repetitive-statement.h gda-sql-builder.h gda-tree.h gda-
tree-manager.h gda-tree-mgr-columns.h gda-tree-mgr-label.h gda-tree-mgr-schemas.h gda-tree-mgr-select.h gda-tree-mgr-tables.h gda-tree-node.h)
-add_files_to_zip $archive_dev $prefix include/libgda-4.0/libgda $files
+add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda $files
files=(gda-sqlite-provider.h)
-add_files_to_zip $archive_dev $prefix include/libgda-4.0/libgda/sqlite $files
+add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda/sqlite $files
files=(gda-thread-wrapper.h)
-add_files_to_zip $archive_dev $prefix include/libgda-4.0/libgda/thread-wrapper $files
+add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda/thread-wrapper $files
files=(gda-handler-bin.h gda-handler-boolean.h gda-handler-numerical.h gda-handler-string.h gda-handler-time.h gda-handler-type.h)
-add_files_to_zip $archive_dev $prefix include/libgda-4.0/libgda/handlers $files
+add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda/handlers $files
files=(gda-report-docbook-document.h gda-report-document.h gda-report-engine.h gda-report-rml-document.h libgda-report.h)
-add_files_to_zip $archive_dev $prefix include/libgda-4.0/libgda-report $files
+add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda-report $files
files=(gda-data-select-priv.h gda-pstmt.h gda-meta-column-types.h)
-add_files_to_zip $archive_dev $prefix include/libgda-4.0/libgda/providers-support $files
+add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda/providers-support $files
files=(gda-sql-parser-enum-types.h gda-sql-parser.h gda-sql-statement.h gda-statement-struct-compound.h gda-statement-struct-decl.h gda-statement-struct-delete.h gda-statement-struct.h gda-statement-struct-insert.h gda-statement-struct-parts.h gda-statement-struct-pspec.h gda-statement-struct-select.h gda-statement-struct-trans.h gda-statement-struct-unknown.h gda-statement-struct-update.h gda-statement-struct-util.h)
-add_files_to_zip $archive_dev $prefix include/libgda-4.0/libgda/sql-parser $files
+add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda/sql-parser $files
files=(gda-vconnection-data-model.h gda-vconnection-hub.h gda-virtual-connection.h gda-virtual-provider.h gda-vprovider-data-model.h gda-vprovider-hub.h libgda-virtual.h)
-add_files_to_zip $archive_dev $prefix include/libgda-4.0/libgda/virtual $files
+add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda/virtual $files
- files=(gdaui-basic-form.h gdaui-cloud.h gdaui-combo.h gdaui-data-entry.h gdaui-data-filter.h gdaui-data-proxy.h gdaui-data-proxy-info.h gdaui-data-selector.h gdaui-data-store.h gdaui-data-widget-filter.h gdaui-data-widget.h gdaui-data-widget-info.h gdaui-decl.h gdaui-easy.h gdaui-enums.h gdaui-enum-types.h gdaui-form.h gdaui-grid.h gdaui-login.h gdaui-plugin.h gdaui-provider-selector.h gdaui-raw-form.h gdaui-raw-grid.h gdaui-server-operation.h gdaui-set.h gdaui-tree-store.h libgda-ui.h)
+ files=(gdaui-basic-form.h gdaui-cloud.h gdaui-combo.h gdaui-data-entry.h gdaui-data-filter.h gdaui-data-proxy.h gdaui-data-proxy-info.h gdaui-data-selector.h gdaui-data-store.h gdaui-data-widget-filter.h gdaui-data-widget.h gdaui-data-widget-info.h gdaui-decl.h gdaui-easy.h gdaui-enums.h gdaui-enum-types.h gdaui-form.h gdaui-grid.h gdaui-login.h gdaui-plugin.h gdaui-provider-selector.h gdaui-raw-form.h gdaui-raw-grid.h gdaui-server-operation.h gdaui-set.h gdaui-tree-store.h libgda-ui.h gdaui-data-cell-renderer-util.h)
-add_files_to_zip $archive_dev $prefix include/libgda-4.0/libgda-ui $files
+add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda-ui $files
#
# PC files
diff --cc libgda-ui/data-entries/plugins/Makefile.am
index 951db0a,57f3177..a6aa682
--- a/libgda-ui/data-entries/plugins/Makefile.am
+++ b/libgda-ui/data-entries/plugins/Makefile.am
@@@ -49,10 -49,10 +49,10 @@@ libgda_ui_plugins_la_SOURCES =
gdaui-entry-pict.c \
$(gcrypt_sources)
- libgda_ui_plugins_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+ libgda_ui_plugins_la_LDFLAGS = -export-dynamic -module -avoid-version
libgda_ui_plugins_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
$(LIBGCRYPT_LIBS) \
$(LIBGDA_LIBS) \
$(GTK_LIBS) \
diff --cc libgda/sqlite/Makefile.am
index e6fe18f,703ccea..d73b051
--- a/libgda/sqlite/Makefile.am
+++ b/libgda/sqlite/Makefile.am
@@@ -56,11 -59,14 +59,14 @@@ libgda_sqlite_la_SOURCES =
gda-sqlite-util.c \
gda-sqlite-util.h \
gda-sqlite.h \
- keywords_hash.h
+ keywords_hash.h \
+ gda-symbols-util.h \
+ gda-symbols-util.c
+ libgda_sqlite_la_CFLAGS = -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\"
libgda_sqlite_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
libgda_sqlite_la_LIBADD = \
- virtual/libgda-virtual-4.0.la \
+ virtual/libgda-virtual-5.0.la \
$(sqlitelibs) \
$(LIBGDA_LIBS)
diff --cc providers/sqlite/Makefile.am
index 6fe2604,233a590..6d6553b
--- a/providers/sqlite/Makefile.am
+++ b/providers/sqlite/Makefile.am
@@@ -14,13 -14,10 +14,10 @@@ AM_CPPFLAGS =
libgda_sqlite_la_SOURCES = \
libmain.c
- libgda_sqlite_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
- libgda_sqlite_la_LIBADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(sqlitelibs) \
- $(LIBGDA_LIBS)
+ libgda_sqlite_la_LDFLAGS = -export-dynamic -module -avoid-version $(LIBTOOL_PROV_EXPORT_OPTIONS)
+ libgda_sqlite_la_LIBADD =
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = \
sqlite_specs_dsn.xml.in \
sqlite_specs_create_db.xml.in \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
