[libgda/gtk3] Modified files for 5.0
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda/gtk3] Modified files for 5.0
- Date: Mon, 14 Jun 2010 20:53:23 +0000 (UTC)
commit 6aa41454b452c1e9efa80c4909d59b140637cc33
Author: Vivien Malerba <malerba gnome-db org>
Date: Mon Jun 14 21:26:28 2010 +0200
Modified files for 5.0
configure.ac | 52 +++++-----
control-center/.gitignore | 4 +-
control-center/Makefile.am | 18 ++--
control-center/data/Makefile.am | 10 +-
...esktop.in => gda-control-center-5.0.desktop.in} | 2 +-
data/Makefile.am | 2 +-
doc/C/.gitignore | 34 ++++----
doc/C/Makefile.am | 10 +-
doc/C/installation.xml | 10 +-
.../{libgda-4.0-docs.sgml => libgda-5.0-docs.sgml} | 44 ++++----
doc/C/packaging.xml | 80 ++++++++--------
doc/C/packaging_ui.xml | 36 ++++----
doc/C/prov-writing.xml | 2 +-
doc/C/tmpl/gda-config.sgml | 2 +-
doc/C/tmpl/gda-data-model-bdb.sgml | 12 +--
installers/WindowsWix/make-zip-exe.sh | 102 ++++++++++----------
.../icons/hicolor/index.theme | 0
libgda-4.0.pc.in => libgda-5.0.pc.in | 0
libgda-report-4.0.pc.in => libgda-report-5.0.pc.in | 0
libgda-report/DocBook/Makefile.am | 8 +-
libgda-report/Makefile.am | 16 ++--
libgda-report/RML/Makefile.am | 8 +-
libgda-report/engine/Makefile.am | 8 +-
libgda-ui-4.0.pc.in => libgda-ui-5.0.pc.in | 0
libgda-ui/.gitignore | 4 +-
libgda-ui/Makefile.am | 26 +++---
libgda-ui/data-entries/Makefile.am | 2 +-
libgda-ui/data-entries/plugins/Makefile.am | 4 +-
libgda-ui/demos/.gitignore | 2 +-
libgda-ui/demos/Makefile.am | 14 ++--
libgda-xslt-4.0.pc.in => libgda-xslt-5.0.pc.in | 0
libgda-xslt/Makefile.am | 10 +-
libgda/.gitignore | 4 +-
libgda/Makefile.am | 34 ++++----
libgda/binreloc/Makefile.am | 4 +-
libgda/gda-config.c | 2 +-
libgda/gda-connection.c | 6 +-
libgda/gda-init.c | 4 +-
libgda/gda-server-operation.c | 2 +-
libgda/gda-server-provider-extra.c | 2 +-
libgda/handlers/Makefile.am | 4 +-
libgda/sql-parser/Makefile.am | 6 +-
libgda/sqlite/Makefile.am | 2 +-
libgda/sqlite/virtual/Makefile.am | 6 +-
...-virtual-4.0.pc.in => libgda-virtual-5.0.pc.in} | 0
libgda/thread-wrapper/Makefile.am | 4 +-
providers/bdb/Makefile.am | 10 +-
.../{libgda-bdb-4.0.pc.in => libgda-bdb-5.0.pc.in} | 0
providers/firebird/Makefile.am | 8 +-
...irebird-4.0.pc.in => libgda-firebird-5.0.pc.in} | 0
providers/freetds/Makefile.am | 8 +-
...-freetds-4.0.pc.in => libgda-freetds-5.0.pc.in} | 0
providers/ibmdb2/Makefile.am | 8 +-
...da-ibmdb2-4.0.pc.in => libgda-ibmdb2-5.0.pc.in} | 0
providers/jdbc/Makefile.am | 20 ++--
...libgda-jdbc-4.0.pc.in => libgda-jdbc-5.0.pc.in} | 0
providers/jdbc/libmain.c | 2 +-
providers/ldap/Makefile.am | 8 +-
...libgda-ldap-4.0.pc.in => libgda-ldap-5.0.pc.in} | 0
providers/mdb/Makefile.am | 10 +-
.../{libgda-mdb-4.0.pc.in => libgda-mdb-5.0.pc.in} | 0
providers/msql/Makefile.am | 8 +-
...libgda-msql-4.0.pc.in => libgda-msql-5.0.pc.in} | 0
providers/mysql/Makefile.am | 8 +-
...bgda-mysql-4.0.pc.in => libgda-mysql-5.0.pc.in} | 0
providers/odbc/Makefile.am | 8 +-
...libgda-odbc-4.0.pc.in => libgda-odbc-5.0.pc.in} | 0
providers/oracle/Makefile.am | 8 +-
...da-oracle-4.0.pc.in => libgda-oracle-5.0.pc.in} | 0
providers/postgres/Makefile.am | 8 +-
...ostgres-4.0.pc.in => libgda-postgres-5.0.pc.in} | 0
providers/reuseable/mysql/Makefile.am | 2 +-
providers/reuseable/postgres/Makefile.am | 2 +-
providers/skel-implementation/capi/Makefile.am | 10 +-
...libgda-capi-4.0.pc.in => libgda-capi-5.0.pc.in} | 0
providers/skel-implementation/models/Makefile.am | 10 +-
...da-models-4.0.pc.in => libgda-models-5.0.pc.in} | 0
providers/sqlite/Makefile.am | 8 +-
...da-sqlite-4.0.pc.in => libgda-sqlite-5.0.pc.in} | 0
providers/sybase/Makefile.am | 8 +-
...da-sybase-4.0.pc.in => libgda-sybase-5.0.pc.in} | 0
providers/web/Makefile.am | 10 +-
.../{libgda-web-4.0.pc.in => libgda-web-5.0.pc.in} | 0
providers/xbase/Makefile.am | 8 +-
...bgda-xbase-4.0.pc.in => libgda-xbase-5.0.pc.in} | 0
testing/.gitignore | 2 +-
testing/Makefile.am | 26 +++---
tests/Makefile.am | 24 +++---
tests/data-models/Makefile.am | 18 ++--
tests/meta-store/Makefile.am | 8 +-
tests/multi-threading/Makefile.am | 10 +-
tests/parser/Makefile.am | 10 +-
tests/providers/Makefile.am | 54 +++++-----
tests/value-holders/Makefile.am | 6 +-
tools/.gitignore | 8 +-
tools/Makefile.am | 46 +++++-----
tools/browser/.gitignore | 4 +-
tools/browser/Makefile.am | 24 +++---
tools/browser/canvas/Makefile.am | 2 +-
tools/browser/common/Makefile.am | 4 +-
tools/browser/data/Makefile.am | 10 +-
tools/browser/doc/Makefile.am | 4 +-
...r-4.0.desktop.in => gda-browser-5.0.desktop.in} | 4 +-
.../{gda-browser-4.0.png => gda-browser-5.0.png} | 0
tools/gda-list-server-op.c | 2 +-
tools/web-server.c | 2 +-
106 files changed, 517 insertions(+), 525 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8550eeb..f8eb9ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define(major, 4)
-m4_define(minor, 1)
-m4_define(micro, 7)
+m4_define(minor, 99)
+m4_define(micro, 0)
m4_define([gda_stable],
m4_if(m4_eval(minor % 2), [0], [yes], [no]))
m4_include(introspection.m4)
@@ -18,7 +18,7 @@ AC_SUBST(GDA_VERSION, major.minor.micro)
# ABI version:
# Careful. Changing these will break ABI, because it is used for the library name and header install path:
# This allows us to do a 3.2 version that is ABI-compatible with 3.0, but with API additions.
-AC_SUBST(GDA_ABI_MAJOR_VERSION, 4)
+AC_SUBST(GDA_ABI_MAJOR_VERSION, 5)
AC_SUBST(GDA_ABI_MINOR_VERSION, 0)
#AC_SUBST(GDA_MICRO_VERSION, micro)
LIBGDA_ABI_VERSION=$GDA_ABI_MAJOR_VERSION.$GDA_ABI_MINOR_VERSION
@@ -1750,10 +1750,10 @@ AC_SUBST(LIBGDA_LIBS)
AC_OUTPUT([
Makefile
libgda.spec
-libgda-4.0.pc
-libgda-ui-4.0.pc
-libgda-report-4.0.pc
-libgda-xslt-4.0.pc
+libgda-5.0.pc
+libgda-ui-5.0.pc
+libgda-report-5.0.pc
+libgda-xslt-5.0.pc
po/Makefile.in
libgda/Makefile
libgda/libgda.h
@@ -1770,26 +1770,26 @@ providers/reuseable/Makefile
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/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
@@ -1808,7 +1808,7 @@ libgda-ui/demos/geninclude.pl
control-center/Makefile
control-center/data/Makefile
tools/Makefile
-tools/gda-sql-4.0.1:tools/gda-sql.1.in
+tools/gda-sql-5.0.1:tools/gda-sql.1.in
tools/browser/Makefile
tools/browser/data/Makefile
tools/browser/common/Makefile
@@ -1842,17 +1842,17 @@ chmod -R u+w ${srcdir}/doc/C
cp doc/C/version.xml ${srcdir}/doc/C/version.xml.tmp
mv ${srcdir}/doc/C/version.xml.tmp ${srcdir}/doc/C/version.xml
-cp ${srcdir}/doc/C/libgda-sections.txt doc/C/libgda-4.0-sections.txt
-echo "" >> doc/C/libgda-4.0-sections.txt
-cat ${srcdir}/doc/C/libgda-ui-sections.txt >> doc/C/libgda-4.0-sections.txt
-cp doc/C/libgda-4.0-sections.txt ${srcdir}/doc/C/libgda-4.0-sections.txt.tmp
-mv ${srcdir}/doc/C/libgda-4.0-sections.txt.tmp ${srcdir}/doc/C/libgda-4.0-sections.txt
+cp ${srcdir}/doc/C/libgda-sections.txt doc/C/libgda-5.0-sections.txt
+echo "" >> doc/C/libgda-5.0-sections.txt
+cat ${srcdir}/doc/C/libgda-ui-sections.txt >> doc/C/libgda-5.0-sections.txt
+cp doc/C/libgda-5.0-sections.txt ${srcdir}/doc/C/libgda-5.0-sections.txt.tmp
+mv ${srcdir}/doc/C/libgda-5.0-sections.txt.tmp ${srcdir}/doc/C/libgda-5.0-sections.txt
-cp doc/C/libgda.types doc/C/libgda-4.0.types
+cp doc/C/libgda.types doc/C/libgda-5.0.types
if test x$have_ui != xno
then
- echo "" >> doc/C/libgda-4.0.types
- cat ${srcdir}/doc/C/libgda-ui.types >> doc/C/libgda-4.0.types
+ echo "" >> doc/C/libgda-5.0.types
+ cat ${srcdir}/doc/C/libgda-ui.types >> doc/C/libgda-5.0.types
fi
diff --git a/control-center/.gitignore b/control-center/.gitignore
index cfbff4d..e56ffcb 100644
--- a/control-center/.gitignore
+++ b/control-center/.gitignore
@@ -1,2 +1,2 @@
-gda-control-center-4.0
-gda-control-center-4.*.desktop
+gda-control-center-5.0
+gda-control-center-5.*.desktop
diff --git a/control-center/Makefile.am b/control-center/Makefile.am
index 721b7e3..a9b80de 100644
--- a/control-center/Makefile.am
+++ b/control-center/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS=gda-control-center-4.0
+bin_PROGRAMS=gda-control-center-5.0
SUBDIRS = data
@@ -16,7 +16,7 @@ AM_CPPFLAGS = \
-DGDA_ABI_VERSION=\""$(GDA_ABI_VERSION)"\"
# rename gdaui-dsn-editor as dsn-properties-editor
-gda_control_center_4_0_SOURCES=\
+gda_control_center_5_0_SOURCES=\
gdaui-login-dialog.c \
gdaui-login-dialog.h \
cc-gray-bar.c \
@@ -37,7 +37,7 @@ gda_control_center_4_0_SOURCES=\
if PLATFORM_WIN32
EXTRALDFLAGS=-mwindows
-gda_control_center_4_0_SOURCES += control-center-res.rc
+gda_control_center_5_0_SOURCES += control-center-res.rc
else
EXTRALDFLAGS=
endif
@@ -48,21 +48,21 @@ endif
control-center-res.o: control-center-res.rc
$(WINDRES) $^ -o $@
-gda_control_center_4_0_LDFLAGS = $(EXTRALDFLAGS)
-gda_control_center_4_0_LDADD=\
+gda_control_center_5_0_LDFLAGS = $(EXTRALDFLAGS)
+gda_control_center_5_0_LDADD=\
$(top_builddir)/libgda-ui/internal/libgda-ui-internal.la \
- $(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 \
$(LIBGDA_LIBS) $(GTK_LIBS) $(UNIQUE_LIBS)
@INTLTOOL_DESKTOP_RULE@
desktopdir=$(datadir)/applications
-Desktop_in_files = gda-control-center-4.0.desktop.in
+Desktop_in_files = gda-control-center-5.0.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
# icons
-iconsdir=$(datadir)/libgda-4.0/pixmaps
+iconsdir=$(datadir)/libgda-5.0/pixmaps
icons_DATA= \
gda-control-center.png \
gda-control-center-newcnc.png
diff --git a/control-center/data/Makefile.am b/control-center/data/Makefile.am
index 31246ed..03fa362 100644
--- a/control-center/data/Makefile.am
+++ b/control-center/data/Makefile.am
@@ -33,12 +33,12 @@ update-icon-cache:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
for theme in $(public_icons_themes); do \
- $(gtk_update_icon_cache) $(datadir)/libgda-4.0/icons/$$theme; \
+ $(gtk_update_icon_cache) $(datadir)/libgda-5.0/icons/$$theme; \
done; \
else \
echo "*** Icon cache not updated. After (un)install, run this:"; \
for theme in $(public_icons_themes); do \
- echo "*** $(gtk_update_icon_cache) $(datadir)/libgda-4.0/icons/$$theme"; \
+ echo "*** $(gtk_update_icon_cache) $(datadir)/libgda-5.0/icons/$$theme"; \
done; \
fi
@@ -56,8 +56,8 @@ install-icons:
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
- mkdir -p $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
- $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ mkdir -p $(DESTDIR)$(datadir)/libgda-5.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/libgda-5.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done
uninstall-icons:
@@ -73,7 +73,7 @@ uninstall-icons:
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
- rm -f $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ rm -f $(DESTDIR)$(datadir)/libgda-5.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done
install-data-local: install-icons update-icon-cache
diff --git a/control-center/gda-control-center-4.0.desktop.in b/control-center/gda-control-center-5.0.desktop.in
similarity index 88%
rename from control-center/gda-control-center-4.0.desktop.in
rename to control-center/gda-control-center-5.0.desktop.in
index ab68756..6fd5b58 100644
--- a/control-center/gda-control-center-4.0.desktop.in
+++ b/control-center/gda-control-center-5.0.desktop.in
@@ -2,7 +2,7 @@
_Name=Database access control center
_Comment=Configure your database access environment
Icon=gda-control-center
-Exec=gda-control-center-4.0
+Exec=gda-control-center-5.0
Terminal=false
Type=Application
Categories=Settings;DesktopSettings;
diff --git a/data/Makefile.am b/data/Makefile.am
index 54a25b8..5e63481 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
# Default global configuration file
-configdir = $(sysconfdir)/libgda-4.0
+configdir = $(sysconfdir)/libgda-5.0
config_DATA = config sales_test.db
EXTRA_DIST = \
diff --git a/doc/C/.gitignore b/doc/C/.gitignore
index ef4c737..5a1eb6a 100644
--- a/doc/C/.gitignore
+++ b/doc/C/.gitignore
@@ -2,30 +2,30 @@ html
xml
html-build.stamp
html.stamp
-libgda-4.0-decl-list.txt
-libgda-4.0-decl.txt
-libgda-4.0-undocumented.txt
-libgda-4.0-unused.txt
-libgda-4.0.args
-libgda-4.0.hierarchy
-libgda-4.0.signals
+libgda-5.0-decl-list.txt
+libgda-5.0-decl.txt
+libgda-5.0-undocumented.txt
+libgda-5.0-unused.txt
+libgda-5.0.args
+libgda-5.0.hierarchy
+libgda-5.0.signals
scan-build.stamp
sgml-build.stamp
sgml.stamp
tmpl-build.stamp
tmpl.stamp
.libs
-libgda-4.0.prerequisites
-libgda-4.0-decl.txt.bak
-libgda-4.0.interfaces
-libgda-4.0-decl-list.txt.bak
+libgda-5.0.prerequisites
+libgda-5.0-decl.txt.bak
+libgda-5.0.interfaces
+libgda-5.0-decl-list.txt.bak
libgda.types
-libgda-4.0.types
-libgda-4.0-overrides.txt
-libgda-4.0-doc.pdf
+libgda-5.0.types
+libgda-5.0-overrides.txt
+libgda-5.0-doc.pdf
pdf-build.stamp
-libgda-4.0-undeclared.txt
-libgda-4.0-unused.sgml
+libgda-5.0-undeclared.txt
+libgda-5.0-unused.sgml
version.xml
*.bak
-libgda-4.0-sections.txt
+libgda-5.0-sections.txt
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index cc7ab31..d918692 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = 1.6
# The name of the module.
-DOC_MODULE=libgda-4.0
+DOC_MODULE=libgda-5.0
# The top-level SGML file.
DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -37,14 +37,14 @@ GTKDOC_CFLAGS = -I$(top_srcdir) \
$(LIBGDA_CFLAGS) \
-DGETTEXT_PACKAGE=\""$(GETTEXT_PACKAGE)"\"
-GTKDOC_LIBS = $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/libgda-report/libgda-report-4.0.la \
+GTKDOC_LIBS = $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda-report/libgda-report-5.0.la \
$(LIBGDA_LIBS)
if HAVE_UI
GTKDOC_CFLAGS += $(GTK_CFLAGS)
GTKDOC_LIBS += $(GTK_LIBS) \
- $(top_builddir)/libgda-ui/libgda-ui-4.0.la
+ $(top_builddir)/libgda-ui/libgda-ui-5.0.la
endif
# Extra options to supply to gtkdoc-mkdb
@@ -88,7 +88,7 @@ EXTRA_DIST += examples/full_example.c installation.xml limitations.xml migration
# Files not to distribute
# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-DISTCLEANFILES = $(DOC_MODULE)-doc.pdf libgda-4.0.types libgda-4.0-sections.txt
+DISTCLEANFILES = $(DOC_MODULE)-doc.pdf libgda-5.0.types libgda-5.0-sections.txt
DOC_STAMPS += pdf-build.stamp
CLEANFILES += $(DOC_STAMPS)
diff --git a/doc/C/installation.xml b/doc/C/installation.xml
index dc7bb5d..68275bf 100644
--- a/doc/C/installation.xml
+++ b/doc/C/installation.xml
@@ -128,8 +128,8 @@
to use the <command>pkg-config</command> command.
</para>
<programlisting>
-<systemitem class="prompt">$</systemitem>gcc -c full_example.c `pkg-config --cflags libgda-4.0`
-<systemitem class="prompt">$</systemitem>gcc -o full_example `pkg-config --libs libgda-4.0` full_example.o
+<systemitem class="prompt">$</systemitem>gcc -c full_example.c `pkg-config --cflags libgda-5.0`
+<systemitem class="prompt">$</systemitem>gcc -o full_example `pkg-config --libs libgda-5.0` full_example.o
</programlisting>
<para>
Doing this will add to the C compiler command line all needed header files
@@ -190,8 +190,8 @@
To access a database, it must have a database provider (if &LIBGDA; does not
support the type of database to access, make a bug report in
<ulink url="http://bugzilla.gnome.org/";>bugzilla</ulink>), and that database provider
- must be compiled an installed: the <command>gda-list-config-4.0</command> or
- <command>gda-sql-4.0 -L</command> commands will
+ must be compiled an installed: the <command>gda-list-config-5.0</command> or
+ <command>gda-sql-5.0 -L</command> commands will
show a list of the installed and configured database providers.
</para>
<para>
@@ -213,7 +213,7 @@
(which
is created the first time &LIBGDA; is used within an application. System wide DSN are defined in the
<filename><prefix>/etc/libgda/config</filename>. Rather than editing that
- file manually, it is possible to use the <command>gnome-database-properties-4.0</command>
+ file manually, it is possible to use the <command>gnome-database-properties-5.0</command>
from the <ulink url="http://www.gnome-db.org";>Libgnomedb</ulink> library.
Note: if the <filename>$HOME/.libgda/config</filename> already exists from a previous use
of &LIBGDA;, then that file is used instead of
diff --git a/doc/C/libgda-4.0-docs.sgml b/doc/C/libgda-5.0-docs.sgml
similarity index 98%
rename from doc/C/libgda-4.0-docs.sgml
rename to doc/C/libgda-5.0-docs.sgml
index c463542..c617088 100644
--- a/doc/C/libgda-4.0-docs.sgml
+++ b/doc/C/libgda-5.0-docs.sgml
@@ -30,10 +30,10 @@
<!ENTITY GDADATAMODEL "<link linkend='GdaDataModel'>GdaDataModel</link>">
<!ENTITY GDADATAMODELARRAY "<link linkend='GdaDataModelArray'>GdaDataModelArray</link>">
<!ENTITY GDADATAMODELHASH "<link linkend='GdaDataModelHash'>GdaDataModelHash</link>">
-<!ENTITY gda-list-server-op "<command>gda-list-server-op-4.0</command>">
-<!ENTITY gda-list-config "<command>gda-list-config-4.0</command>">
+<!ENTITY gda-list-server-op "<command>gda-list-server-op-5.0</command>">
+<!ENTITY gda-list-config "<command>gda-list-config-5.0</command>">
<!ENTITY gda-sql "<command>gda-sql</command>">
-<!ENTITY gda-test-connection "<command>gda-test-connection-4.0</command>">
+<!ENTITY gda-test-connection "<command>gda-test-connection-5.0</command>">
<!ENTITY fullexample SYSTEM "examples/full_example.c">
<!ENTITY install SYSTEM "installation.xml">
<!ENTITY examples SYSTEM "gettingstarted.xml">
@@ -322,7 +322,7 @@
<chapter id="features">
<title>Features</title>
<para>
- This section presents the main features of the 4.0 version of Libgda.
+ This section presents the main features of the 5.0 version of Libgda.
</para>
<para>
Libgda is a low-level database abstraction layer built on top of each database C API. In terms of abstraction,
@@ -1325,19 +1325,19 @@ g_object_unref (store);
<para>
For example to list the installed providers, do:
<programlisting>
-[prompt]> gda-sql-4.0 -L
+[prompt]> gda-sql-5.0 -L
Provider | Description | DSN parameters | File
------------+-----------------------------------+--------------------+-----------------------------------------------
-SQLite | Provider for SQLite databases | DB_NAME, | /usr/lib/libgda-4.0/providers/libgda-sqlite.so
+SQLite | Provider for SQLite databases | DB_NAME, | /usr/lib/libgda-5.0/providers/libgda-sqlite.so
DB_DIR,
LOAD_GDA_FUNCTIONS
-Berkeley-DB | Provider for Berkeley databases | FILE, | /usr/lib/libgda-4.0/providers/libgda-bdb.so
+Berkeley-DB | Provider for Berkeley databases | FILE, | /usr/lib/libgda-5.0/providers/libgda-bdb.so
DATABASE
[...]
</programlisting>
To list the configured data sources (DSN):
<programlisting>
-[prompt]> gda-sql-4.0 -l
+[prompt]> gda-sql-5.0 -l
DSN | Provider | Description | Connection string | Username
---------+------------+--------------+------------------------+---------
Sales | PostgreSQL | Sales | DB_NAME=sales |
@@ -1349,7 +1349,7 @@ Sales | PostgreSQL | Sales | DB_NAME=sales |
the GDA_SQL_CNC environment variable to contain that string, and run the command without any argument,
for example:
<programlisting>
-[prompt]> gda-sql-4.0 PostgreSQL://DB_NAME=sales
+[prompt]> gda-sql-5.0 PostgreSQL://DB_NAME=sales
Welcome to the GDA SQL console, version 3.99.3
Type: .copyright to show usage and distribution terms
@@ -1372,7 +1372,7 @@ c0>
DSN, and one for the "PostgreSQL://DB_NAME=sales" connection string, and shows the usage of the ".c" command
to list the opened connections:
<programlisting>
-[prompt]> gda-sql-4.0 pgsales PostgreSQL://DB_NAME=sales
+[prompt]> gda-sql-5.0 pgsales PostgreSQL://DB_NAME=sales
Welcome to the GDA SQL console, version 3.99.3
Type: .copyright to show usage and distribution terms
@@ -1398,7 +1398,7 @@ c1>
<para>
Here is another sample session showing how to use variables in statements:
<programlisting><![CDATA[
-[prompt]> gda-sql-4.0 -p SQLite -c "DB_DIR=.;DB_NAME=sales_test"
+[prompt]> gda-sql-5.0 -p SQLite -c "DB_DIR=.;DB_NAME=sales_test"
Welcome to the GDA SQL console, version 3.1.2
Type: \copyright to show usage and distribution terms
@@ -1436,11 +1436,11 @@ c0> ]]>
<para>
An example output will be:
<programlisting>
-[prompt]> gda-list-config-4.0
+[prompt]> gda-list-config-5.0
=== Installed providers ===
Provider: SQLite
Description: Provider for SQLite databases
-Location: /usr/lib/libgda-4.0/providers/libgda-sqlite.so
+Location: /usr/lib/libgda-5.0/providers/libgda-sqlite.so
Data source's parameters (Name / Type / Description):
DB_NAME / gchararray / Database name
DB_DIR / gchararray / Directory
@@ -1448,7 +1448,7 @@ Data source's parameters (Name / Type / Description):
Provider: Berkeley-DB
Description: Provider for Berkeley databases
-Location: /usr/lib/libgda-4.0/providers/libgda-bdb.so
+Location: /usr/lib/libgda-5.0/providers/libgda-bdb.so
Data source's parameters (Name / Type / Description):
FILE / gchararray / Database file
DATABASE / gchararray / Database name
@@ -1488,8 +1488,8 @@ Data source: Sales
<para>
For example listing all the possible operations (for all the providers) is:
<programlisting>
-[prompt]> gda-list-server-op-4.0 -l
-Using XML descriptions in /usr/share/libgda-4.0
+[prompt]> gda-list-server-op-5.0 -l
+Using XML descriptions in /usr/share/libgda-5.0
Existing operation types:
CREATE_DB
DROP_DB
@@ -1504,8 +1504,8 @@ DROP_INDEX
Listing all the operations supported by the SQLite provider (notice that the SQLite provider does not support the
DROP_COLUMN operation as SQLite does not support it):
<programlisting>
-[prompt]> gda-list-server-op-4.0 -l -p SQLite
-Using XML descriptions in /usr/share/libgda-4.0
+[prompt]> gda-list-server-op-5.0 -l -p SQLite
+Using XML descriptions in /usr/share/libgda-5.0
For provider SQLite
Existing operation types for provider 'SQLite':
CREATE_DB
@@ -1519,8 +1519,8 @@ DROP_INDEX
</programlisting>
Listing all the possible parameters for the MySQL provider and for the DROP_COLUMN operation:
<programlisting><![CDATA[
-[prompt]> gda-list-server-op-4.0 -o DROP_COLUMN -p MySQL
-Using XML descriptions in /usr/share/libgda-4.0
+[prompt]> gda-list-server-op-5.0 -o DROP_COLUMN -p MySQL
+Using XML descriptions in /usr/share/libgda-5.0
For provider MySQL
Description for type: DROP_COLUMN
<?xml version="1.0"?>
@@ -1532,8 +1532,8 @@ Description for type: DROP_COLUMN
</programlisting>
Listing all the possible parameters for the all the installed providers and for the DROP_COLUMN operation:
<programlisting><![CDATA[
-[prompt]> gda-list-server-op-4.0 -o DROP_COLUMN
-Using XML descriptions in /usr/share/libgda-4.0
+[prompt]> gda-list-server-op-5.0 -o DROP_COLUMN
+Using XML descriptions in /usr/share/libgda-5.0
Description for type: DROP_COLUMN
<?xml version="1.0"?>
<server_op>
diff --git a/doc/C/packaging.xml b/doc/C/packaging.xml
index 26e2d05..b6e128e 100644
--- a/doc/C/packaging.xml
+++ b/doc/C/packaging.xml
@@ -62,21 +62,21 @@
| |-- trml2pdf.py
| `-- utils.py
|-- etc
-| `-- libgda-4.0
+| `-- libgda-5.0
| |-- config
| `-- sales_test.db
|-- lib
-| |-- libgda-4.0.so -> libgda-4.0.so.4.1.0
-| |-- libgda-4.0.so.4 -> libgda-4.0.so.4.1.0
-| |-- libgda-4.0.so.4.1.0
-| |-- libgda-report-4.0.so -> libgda-report-4.0.so.4.1.0
-| |-- libgda-report-4.0.so.4 -> libgda-report-4.0.so.4.1.0
-| |-- libgda-report-4.0.so.4.1.0
-| |-- libgda-xslt-4.0.so -> libgda-xslt-4.0.so.4.1.0
-| |-- libgda-xslt-4.0.so.4 -> libgda-xslt-4.0.so.4.1.0
-| |-- libgda-xslt-4.0.so.4.1.0
+| |-- libgda-5.0.so -> libgda-5.0.so.4.1.0
+| |-- libgda-5.0.so.4 -> libgda-5.0.so.4.1.0
+| |-- libgda-5.0.so.4.1.0
+| |-- libgda-report-5.0.so -> libgda-report-5.0.so.4.1.0
+| |-- libgda-report-5.0.so.4 -> libgda-report-5.0.so.4.1.0
+| |-- libgda-report-5.0.so.4.1.0
+| |-- libgda-xslt-5.0.so -> libgda-xslt-5.0.so.4.1.0
+| |-- libgda-xslt-5.0.so.4 -> libgda-xslt-5.0.so.4.1.0
+| |-- libgda-xslt-5.0.so.4.1.0
`-- share
- `-- libgda-4.0
+ `-- libgda-5.0
|-- dtd
| |-- libgda-array.dtd
| |-- libgda-paramlist.dtd
@@ -103,10 +103,10 @@
<programlisting>
|-- share
| `-- gir-1.0
-| `-- Gda-4.0.gir
+| `-- Gda-5.0.gir
`-- lib
`-- girepository-1.0
- `-- Gda-4.0.typelib
+ `-- Gda-5.0.typelib
</programlisting>
</para>
</sect1>
@@ -124,12 +124,12 @@
<programlisting>
.
`-- bin
- |-- gda-list-config -> gda-list-config-4.0
- |-- gda-list-config-4.0
- |-- gda-list-jdbc-providers-4.0
- |-- gda-list-server-op -> gda-list-server-op-4.0
- |-- gda-list-server-op-4.0
- `-- gda-test-connection-4.0
+ |-- gda-list-config -> gda-list-config-5.0
+ |-- gda-list-config-5.0
+ |-- gda-list-jdbc-providers-5.0
+ |-- gda-list-server-op -> gda-list-server-op-5.0
+ |-- gda-list-server-op-5.0
+ `-- gda-test-connection-5.0
</programlisting>
</para>
<para>
@@ -142,7 +142,7 @@
<programlisting>
.
|-- bin
-| `-- gda-sql-4.0
+| `-- gda-sql-5.0
`-- share
| `-- web
| |-- cnc.js
@@ -156,8 +156,8 @@
| `-- mouseirb_2.js
`-- man
`-- man1
- |-- gda-sql-4.0.1
- `-- gda-sql.1 -> gda-sql-4.0.1
+ |-- gda-sql-5.0.1
+ `-- gda-sql.1 -> gda-sql-5.0.1
</programlisting>
</para>
<para>
@@ -183,13 +183,13 @@
<programlisting>
.
|-- lib
-| |-- libgda-4.0
+| |-- libgda-5.0
| | `-- providers
| | `-- libgda-postgres.so
| `-- pkgconfig
-| `-- libgda-postgres-4.0.pc
+| `-- libgda-postgres-5.0.pc
`-- share
- `-- libgda-4.0
+ `-- libgda-5.0
|-- postgres_specs_add_column.xml
|-- postgres_specs_create_db.xml
|-- postgres_specs_create_index.xml
@@ -226,14 +226,14 @@
<programlisting>
.
|-- lib
-| |-- libgda-4.0
+| |-- libgda-5.0
| | `-- providers
-| | |-- gdaprovider-4.0.jar
+| | |-- gdaprovider-5.0.jar
| | `-- libgda-jdbc.so
| `-- pkgconfig
-| `-- libgda-jdbc-4.0.pc
+| `-- libgda-jdbc-5.0.pc
`-- share
- `-- libgda-4.0
+ `-- libgda-5.0
|-- jdbc_specs_create_table.xml
`-- jdbc_specs_dsn.xml
</programlisting>
@@ -251,20 +251,20 @@
the static libraries.
<programlisting>
|-- include
-| `-- libgda-4.0
+| `-- libgda-5.0
| [... except the libgdaui/ directory ...]
`-- lib
- |-- libgda-4.0
- |-- libgda-4.0.a
- |-- libgda-4.0.la
- |-- libgda-report-4.0.a
- |-- libgda-report-4.0.la
- |-- libgda-xslt-4.0.a
- |-- libgda-xslt-4.0.la
+ |-- libgda-5.0
+ |-- libgda-5.0.a
+ |-- libgda-5.0.la
+ |-- libgda-report-5.0.a
+ |-- libgda-report-5.0.la
+ |-- libgda-xslt-5.0.a
+ |-- libgda-xslt-5.0.la
`-- pkgconfig
- |-- libgda-4.0.pc
- |-- libgda-report-4.0.pc
- `-- libgda-xslt-4.0.pc
+ |-- libgda-5.0.pc
+ |-- libgda-report-5.0.pc
+ `-- libgda-xslt-5.0.pc
</programlisting>
</para>
</sect1>
diff --git a/doc/C/packaging_ui.xml b/doc/C/packaging_ui.xml
index 48e7c39..9f994f1 100644
--- a/doc/C/packaging_ui.xml
+++ b/doc/C/packaging_ui.xml
@@ -53,7 +53,7 @@
<programlisting>
.
|-- lib
-| |-- libgda-4.0
+| |-- libgda-5.0
| | |-- language-specs
| | | `-- gda-sql.lang
| | |-- plugins
@@ -63,11 +63,11 @@
| | | |-- gdaui-entry-pict-spec_string.xml
| | | |-- gdaui-entry-text-spec.xml
| | | `-- libgdaui-plugins.so
-| |-- libgdaui-4.0.so -> libgdaui-4.0.so.4.1.0
-| |-- libgdaui-4.0.so.4 -> libgdaui-4.0.so.4.1.0
-| `-- libgdaui-4.0.so.4.1.0
+| |-- libgdaui-5.0.so -> libgdaui-5.0.so.4.1.0
+| |-- libgdaui-5.0.so.4 -> libgdaui-5.0.so.4.1.0
+| `-- libgdaui-5.0.so.4.1.0
`-- share
- `-- libgda-4.0
+ `-- libgda-5.0
|-- server_operation.glade
`-- ui
|-- gdaui-entry-string-number.xml
@@ -86,10 +86,10 @@
<programlisting>
|-- share
| `-- gir-1.0
-| `-- Gdaui-4.0.gir
+| `-- Gdaui-5.0.gir
`-- lib
`-- girepository-1.0
- `-- Gdaui-4.0.typelib
+ `-- Gdaui-5.0.typelib
</programlisting>
</para>
</sect1>
@@ -103,11 +103,11 @@
<programlisting>
.
|-- bin
-| `-- gda-control-center-4.0
+| `-- gda-control-center-5.0
`-- share
|-- applications
- | `-- gda-control-center-4.0.desktop
- |-- libgda-4.0
+ | `-- gda-control-center-5.0.desktop
+ |-- libgda-5.0
| `-- pixmaps
| `-- gdaui-generic.png
`-- pixmaps
@@ -125,10 +125,10 @@
<programlisting>
.
|-- bin
-| `-- gda-browser-4.0
+| `-- gda-browser-5.0
`-- share
|-- applications
- | `-- gda-browser-4.0.desktop
+ | `-- gda-browser-5.0.desktop
|-- gnome
| `-- help
| `-- gda-browser
@@ -157,18 +157,18 @@
<programlisting>
.
|-- bin
-| `-- gdaui-demo-4.0
+| `-- gdaui-demo-5.0
|-- include
-| `-- libgda-4.0
+| `-- libgda-5.0
| `-- libgdaui
| [...]
`-- lib
-| |-- libgdaui-4.0.a
-| |-- libgdaui-4.0.la
+| |-- libgdaui-5.0.a
+| |-- libgdaui-5.0.la
| `-- pkgconfig
-| `-- libgdaui-4.0.pc
+| `-- libgdaui-5.0.pc
`-- share
- `-- libgda-4.0
+ `-- libgda-5.0
`-- demo
[...]
</programlisting>
diff --git a/doc/C/prov-writing.xml b/doc/C/prov-writing.xml
index 568f246..6391828 100644
--- a/doc/C/prov-writing.xml
+++ b/doc/C/prov-writing.xml
@@ -936,7 +936,7 @@ gboolean (*key_columns) (GdaServerProvider *, GdaConnection *, GdaMetaStore *,
<listitem><para><filename>libmain.c</filename>: file to make it possible for &LIBGDA; to identify the provider.</para></listitem>
<listitem><para><filename>capi_specs_dsn.xml.in</filename>: file where the connection parameters are described,
before being translated</para></listitem>
- <listitem><para><filename>libgda-capi-4.0.pc.in</filename>: file to be used by <command>pkg-config</command> to identify
+ <listitem><para><filename>libgda-capi-5.0.pc.in</filename>: file to be used by <command>pkg-config</command> to identify
the provider, before being computed by the <command>configure</command> script.</para></listitem>
<listitem><para>other .xml.in files: DDL queries' parameters, before translation</para></listitem>
</itemizedlist>
diff --git a/doc/C/tmpl/gda-config.sgml b/doc/C/tmpl/gda-config.sgml
index fc1d8d5..5d69cc3 100644
--- a/doc/C/tmpl/gda-config.sgml
+++ b/doc/C/tmpl/gda-config.sgml
@@ -27,7 +27,7 @@ g_object_new (GDA_TYPE_CONFIG, "user-file", "my_file", NULL);
</para>
<para>
Data sources are defined in a per-user configuration file which is by default <filename>${HOME}/.libgda/config</filename> and
- in a system wide configuration file which is by default <filename>${prefix}/etc/libgda-4.0/config</filename>. Those
+ in a system wide configuration file which is by default <filename>${prefix}/etc/libgda-5.0/config</filename>. Those
filenames can be modified by setting the <link linkend="GdaConfig--user-file">user-file</link> and
<link linkend="GdaConfig--system-file">system-file</link> properties for the single <link linkend="GdaConfig">GdaConfig</link>
instance. Note that setting either of these properties to <literal>NULL</literal> will disable using the corresponding
diff --git a/doc/C/tmpl/gda-data-model-bdb.sgml b/doc/C/tmpl/gda-data-model-bdb.sgml
index 11710e2..e035941 100644
--- a/doc/C/tmpl/gda-data-model-bdb.sgml
+++ b/doc/C/tmpl/gda-data-model-bdb.sgml
@@ -32,16 +32,8 @@ virtual methods).
</para>
-
-<!-- ##### ARG GdaDataModelBdb:db-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdaDataModelBdb:filename ##### -->
-<para>
-
-</para>
+ object:
+ priv:
<!-- ##### STRUCT GdaDataModelBdbClass ##### -->
<para>
diff --git a/installers/WindowsWix/make-zip-exe.sh b/installers/WindowsWix/make-zip-exe.sh
index 40372c0..46677b7 100755
--- a/installers/WindowsWix/make-zip-exe.sh
+++ b/installers/WindowsWix/make-zip-exe.sh
@@ -109,58 +109,58 @@ add_files_to_zip $archive $cross_path bin $files
# Libgda's files
#
files=(bdb_specs_dsn.xml information_schema.xml mdb_specs_dsn.xml mysql_specs_add_column.xml mysql_specs_create_db.xml mysql_specs_create_index.xml mysql_specs_create_table.xml mysql_specs_create_view.xml mysql_specs_drop_column.xml mysql_specs_drop_db.xml mysql_specs_drop_index.xml mysql_specs_drop_table.xml mysql_specs_drop_view.xml mysql_specs_dsn.xml mysql_specs_rename_table.xml postgres_specs_add_column.xml postgres_specs_create_db.xml postgres_specs_create_index.xml postgres_specs_create_table.xml postgres_specs_create_view.xml postgres_specs_drop_column.xml postgres_specs_drop_db.xml postgres_specs_drop_index.xml postgres_specs_drop_table.xml postgres_specs_drop_view.xml postgres_specs_dsn.xml postgres_specs_rename_table.xml sqlite_specs_add_column.xml sqlite_specs_create_db.xml sqlite_specs_create_index.xml sqlite_specs_create_table.xml sqlite_specs_create_view.xml sqlite_specs_drop_db.xml sqlite_specs_drop_index.xml sqlite_specs_drop_table.xml sqlite_specs_drop_view
.xml sqlite_specs_dsn.xml sqlite_specs_rename_table.xml import_encodings.xml)
-add_files_to_zip $archive $prefix share/libgda-4.0 $files
+add_files_to_zip $archive $prefix share/libgda-5.0 $files
files=(gdaui-generic.png)
-add_files_to_zip $archive $prefix share/libgda-4.0/pixmaps $files
+add_files_to_zip $archive $prefix share/libgda-5.0/pixmaps $files
#copy some Gnome files to be installed on Windows
-cp /usr/share/icons/gnome/16x16/actions/bookmark-new.png $prefix/share/libgda-4.0/icons/hicolor/16x16/actions
-cp /usr/share/icons/gnome/22x22/actions/bookmark-new.png $prefix/share/libgda-4.0/icons/hicolor/22x22/actions
-cp /usr/share/icons/gnome/24x24/actions/bookmark-new.png $prefix/share/libgda-4.0/icons/hicolor/24x24/actions
-cp /usr/share/icons/gnome/32x32/actions/bookmark-new.png $prefix/share/libgda-4.0/icons/hicolor/32x32/actions
-cp /usr/share/icons/gnome/16x16/actions/window-new.png $prefix/share/libgda-4.0/icons/hicolor/16x16/actions
-cp /usr/share/icons/gnome/22x22/actions/window-new.png $prefix/share/libgda-4.0/icons/hicolor/22x22/actions
-cp /usr/share/icons/gnome/24x24/actions/window-new.png $prefix/share/libgda-4.0/icons/hicolor/24x24/actions
-cp /usr/share/icons/gnome/32x32/actions/window-new.png $prefix/share/libgda-4.0/icons/hicolor/32x32/actions
-mkdir -p $prefix/share/libgda-4.0/icons/hicolor/16x16/apps
-mkdir -p $prefix/share/libgda-4.0/icons/hicolor/22x22/apps
-mkdir -p $prefix/share/libgda-4.0/icons/hicolor/24x24/apps
-mkdir -p $prefix/share/libgda-4.0/icons/hicolor/32x32/apps
-cp /usr/share/icons/gnome/16x16/apps/accessories-text-editor.png $prefix/share/libgda-4.0/icons/hicolor/16x16/apps
-cp /usr/share/icons/gnome/22x22/apps/accessories-text-editor.png $prefix/share/libgda-4.0/icons/hicolor/22x22/apps
-cp /usr/share/icons/gnome/24x24/apps/accessories-text-editor.png $prefix/share/libgda-4.0/icons/hicolor/24x24/apps
-cp /usr/share/icons/gnome/32x32/apps/accessories-text-editor.png $prefix/share/libgda-4.0/icons/hicolor/32x32/apps
-
-add_all_files_to_zip $archive $prefix share/libgda-4.0/pixmaps
-add_all_files_to_zip $archive $prefix share/libgda-4.0/icons/hicolor/16x16/actions
-add_all_files_to_zip $archive $prefix share/libgda-4.0/icons/hicolor/22x22/actions
-add_all_files_to_zip $archive $prefix share/libgda-4.0/icons/hicolor/24x24/actions
-add_all_files_to_zip $archive $prefix share/libgda-4.0/icons/hicolor/32x32/actions
-add_all_files_to_zip $archive $prefix share/libgda-4.0/icons/hicolor/scalable/actions
-add_all_files_to_zip $archive $prefix share/libgda-4.0/icons/hicolor/16x16/apps
-add_all_files_to_zip $archive $prefix share/libgda-4.0/icons/hicolor/22x22/apps
-add_all_files_to_zip $archive $prefix share/libgda-4.0/icons/hicolor/24x24/apps
-add_all_files_to_zip $archive $prefix share/libgda-4.0/icons/hicolor/32x32/apps
+cp /usr/share/icons/gnome/16x16/actions/bookmark-new.png $prefix/share/libgda-5.0/icons/hicolor/16x16/actions
+cp /usr/share/icons/gnome/22x22/actions/bookmark-new.png $prefix/share/libgda-5.0/icons/hicolor/22x22/actions
+cp /usr/share/icons/gnome/24x24/actions/bookmark-new.png $prefix/share/libgda-5.0/icons/hicolor/24x24/actions
+cp /usr/share/icons/gnome/32x32/actions/bookmark-new.png $prefix/share/libgda-5.0/icons/hicolor/32x32/actions
+cp /usr/share/icons/gnome/16x16/actions/window-new.png $prefix/share/libgda-5.0/icons/hicolor/16x16/actions
+cp /usr/share/icons/gnome/22x22/actions/window-new.png $prefix/share/libgda-5.0/icons/hicolor/22x22/actions
+cp /usr/share/icons/gnome/24x24/actions/window-new.png $prefix/share/libgda-5.0/icons/hicolor/24x24/actions
+cp /usr/share/icons/gnome/32x32/actions/window-new.png $prefix/share/libgda-5.0/icons/hicolor/32x32/actions
+mkdir -p $prefix/share/libgda-5.0/icons/hicolor/16x16/apps
+mkdir -p $prefix/share/libgda-5.0/icons/hicolor/22x22/apps
+mkdir -p $prefix/share/libgda-5.0/icons/hicolor/24x24/apps
+mkdir -p $prefix/share/libgda-5.0/icons/hicolor/32x32/apps
+cp /usr/share/icons/gnome/16x16/apps/accessories-text-editor.png $prefix/share/libgda-5.0/icons/hicolor/16x16/apps
+cp /usr/share/icons/gnome/22x22/apps/accessories-text-editor.png $prefix/share/libgda-5.0/icons/hicolor/22x22/apps
+cp /usr/share/icons/gnome/24x24/apps/accessories-text-editor.png $prefix/share/libgda-5.0/icons/hicolor/24x24/apps
+cp /usr/share/icons/gnome/32x32/apps/accessories-text-editor.png $prefix/share/libgda-5.0/icons/hicolor/32x32/apps
+
+add_all_files_to_zip $archive $prefix share/libgda-5.0/pixmaps
+add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/16x16/actions
+add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/22x22/actions
+add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/24x24/actions
+add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/32x32/actions
+add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/scalable/actions
+add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/16x16/apps
+add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/22x22/apps
+add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/24x24/apps
+add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/32x32/apps
files=(index.theme)
-add_files_to_zip $archive . share/libgda-4.0/icons/hicolor $files
+add_files_to_zip $archive . share/libgda-5.0/icons/hicolor $files
-files=(gda-browser-4.0.png gda-control-center-4.0.png)
+files=(gda-browser-5.0.png gda-control-center-5.0.png)
add_files_to_zip $archive $prefix share/pixmaps $files
files=(gdaui-entry-number.xml gdaui-entry-string.xml)
-add_files_to_zip $archive $prefix share/libgda-4.0/ui $files
+add_files_to_zip $archive $prefix share/libgda-5.0/ui $files
files=(cnc.js md5.js jquery.js mouseapp_2.js mouseirb_2.js irb.js gda.css gda-print.css irb.css)
-add_files_to_zip $archive $prefix share/libgda-4.0/web $files
+add_files_to_zip $archive $prefix share/libgda-5.0/web $files
files=(libgda-paramlist.dtd libgda-array.dtd libgda-server-operation.dtd gdaui-layout.dtd)
-add_files_to_zip $archive $prefix share/libgda-4.0/dtd $files
+add_files_to_zip $archive $prefix share/libgda-5.0/dtd $files
files=(config sales_test.db)
-add_files_to_zip $archive $prefix etc/libgda-4.0 $files
+add_files_to_zip $archive $prefix etc/libgda-5.0 $files
files=(gdk-pixbuf.loaders gtk.immodules)
add_files_to_zip $archive_ext $cross_path etc/gtk-2.0 $files
@@ -171,20 +171,20 @@ add_files_to_zip $archive_ext . etc/gtk-2.0 $files
files=(pango.modules)
add_files_to_zip $archive_ext $cross_path etc/pango $files
-files=(gda-sql-4.0.exe gda-test-connection-4.0.exe libgda-4.0-4.dll libgda-report-4.0-4.dll libgda-ui-4.0-4.dll gda-browser-4.0.exe gda-control-center-4.0.exe)
+files=(gda-sql-5.0.exe gda-test-connection-5.0.exe libgda-5.0-4.dll libgda-report-5.0-4.dll libgda-ui-5.0-4.dll gda-browser-5.0.exe gda-control-center-5.0.exe)
add_files_to_zip $archive $prefix bin $files
files=(gspawn-win32-helper.exe)
add_files_to_zip $archive $cross_path bin $files
-files=(gdaui-demo-4.0.exe)
+files=(gdaui-demo-5.0.exe)
add_files_to_zip $archive_dev $prefix bin $files
files=(libgda-sqlite.dll libgda-postgres.dll libgda-mysql.dll libgda-bdb.dll)
-add_files_to_zip $archive $prefix lib/libgda-4.0/providers $files
+add_files_to_zip $archive $prefix lib/libgda-5.0/providers $files
files=(gdaui-entry-filesel-spec.xml gdaui-entry-password.xml gdaui-entry-pict-spec.xml gdaui-entry-pict-spec_string.xml libgda-ui-plugins.dll)
-add_files_to_zip $archive $prefix lib/libgda-4.0/plugins $files
+add_files_to_zip $archive $prefix lib/libgda-5.0/plugins $files
files=(libpixmap.dll libwimp.dll)
add_files_to_zip $archive_ext $cross_path lib/gtk-2.0/2.10.0/engines $files
@@ -196,31 +196,31 @@ add_files_to_zip $archive_ext $cross_path lib/gtk-2.0/2.10.0/loaders $files
# 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-t
ree-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)
-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
@@ -230,19 +230,19 @@ add_all_files_to_zip $archive_dev $prefix lib/pkgconfig
#
# static libs
#
-files=(libgda-4.0.a libgda-4.0.dll.a libgda-4.0.lib libgda-4.0.def libgda-report-4.0.a libgda-report-4.0.dll.a libgda-report-4.0.lib libgda-report-4.0.def libgda-ui-4.0.a libgda-ui-4.0.dll.a libgda-ui-4.0.lib libgda-ui-4.0.def)
+files=(libgda-5.0.a libgda-5.0.dll.a libgda-5.0.lib libgda-5.0.def libgda-report-5.0.a libgda-report-5.0.dll.a libgda-report-5.0.lib libgda-report-5.0.def libgda-ui-5.0.a libgda-ui-5.0.dll.a libgda-ui-5.0.lib libgda-ui-5.0.def)
add_files_to_zip $archive_dev $prefix lib $files
#
# demo
#
files=(data_model_dir.c ddl_queries.c demo_db.db example_automatic_layout.xml form.c form_data_layout.c form_pict.c form_rw.c grid.c grid_data_layout.c grid_pict.c grid_rw.c linked_grid_form.c linked_model_param.c login.c)
-add_files_to_zip $archive_dev $prefix share/libgda-4.0/demo $files
+add_files_to_zip $archive_dev $prefix share/libgda-5.0/demo $files
#
# doc
#
-add_all_files_to_zip $archive_dev $prefix share/gtk-doc/html/libgda-4.0
+add_all_files_to_zip $archive_dev $prefix share/gtk-doc/html/libgda-5.0
#
# translations
diff --git a/installers/WindowsWix/share/libgda-4.0/icons/hicolor/index.theme b/installers/WindowsWix/share/libgda-5.0/icons/hicolor/index.theme
similarity index 100%
rename from installers/WindowsWix/share/libgda-4.0/icons/hicolor/index.theme
rename to installers/WindowsWix/share/libgda-5.0/icons/hicolor/index.theme
diff --git a/libgda-4.0.pc.in b/libgda-5.0.pc.in
similarity index 100%
rename from libgda-4.0.pc.in
rename to libgda-5.0.pc.in
diff --git a/libgda-report-4.0.pc.in b/libgda-report-5.0.pc.in
similarity index 100%
rename from libgda-report-4.0.pc.in
rename to libgda-report-5.0.pc.in
diff --git a/libgda-report/DocBook/Makefile.am b/libgda-report/DocBook/Makefile.am
index 490800e..6530971 100644
--- a/libgda-report/DocBook/Makefile.am
+++ b/libgda-report/DocBook/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda-report-docbook-4.0.la
+noinst_LTLIBRARIES = libgda-report-docbook-5.0.la
AM_CPPFLAGS = \
-I$(top_builddir)/libgda-report \
@@ -11,12 +11,12 @@ AM_CPPFLAGS = \
gda_report_headers = \
gda-report-docbook-document.h
-libgda_report_docbook_4_0_la_SOURCES = \
+libgda_report_docbook_5_0_la_SOURCES = \
$(gda_report_headers) \
gda-report-docbook-document.c
-libgda_report_docbook_4_0_la_LIBADD = $(LIBGDA_LIBS) \
- $(top_builddir)/libgda/libgda-4.0.la
+libgda_report_docbook_5_0_la_LIBADD = $(LIBGDA_LIBS) \
+ $(top_builddir)/libgda/libgda-5.0.la
gdareportincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-report
gdareportinclude_HEADERS=$(gda_report_headers)
diff --git a/libgda-report/Makefile.am b/libgda-report/Makefile.am
index eef3d05..d7b4a1d 100644
--- a/libgda-report/Makefile.am
+++ b/libgda-report/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgda-report-4.0.la
+lib_LTLIBRARIES = libgda-report-5.0.la
SUBDIRS = engine DocBook RML
@@ -13,21 +13,21 @@ AM_CPPFLAGS = \
report_headers = \
gda-report-document.h
-libgda_report_4_0_la_SOURCES = \
+libgda_report_5_0_la_SOURCES = \
$(report_headers) \
gda-report-document-private.h \
gda-report-document.c
-libgda_report_4_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
+libgda_report_5_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
$(NO_UNDEFINED) $(LIBTOOL_EXPORT_OPTIONS)
-libgda_report_4_0_la_LIBADD = engine/libgda-report-engine-4.0.la \
- DocBook/libgda-report-docbook-4.0.la \
- RML/libgda-report-rml-4.0.la \
+libgda_report_5_0_la_LIBADD = engine/libgda-report-engine-5.0.la \
+ DocBook/libgda-report-docbook-5.0.la \
+ RML/libgda-report-rml-5.0.la \
$(LIBGDA_LIBS)
if PLATFORM_WIN32
-libgda_report_4_0_la_LDFLAGS += -export-symbols $(builddir)/libgda-report.def
-libgda_report_4_0_la_DEPENDENCIES = libgda-report.def
+libgda_report_5_0_la_LDFLAGS += -export-symbols $(builddir)/libgda-report.def
+libgda_report_5_0_la_DEPENDENCIES = libgda-report.def
libgda-report.def: libgda-report.symbols
(echo -e EXPORTS; $(CPP) -P - <$(srcdir)/libgda-report.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > libgda-report.def.tmp && mv libgda-report.def.tmp libgda-report.def
diff --git a/libgda-report/RML/Makefile.am b/libgda-report/RML/Makefile.am
index c3e7cd4..8bcddb8 100644
--- a/libgda-report/RML/Makefile.am
+++ b/libgda-report/RML/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda-report-rml-4.0.la
+noinst_LTLIBRARIES = libgda-report-rml-5.0.la
SUBDIRS = trml2html trml2pdf
@@ -13,12 +13,12 @@ AM_CPPFLAGS = \
gda_report_headers = \
gda-report-rml-document.h
-libgda_report_rml_4_0_la_SOURCES = \
+libgda_report_rml_5_0_la_SOURCES = \
$(gda_report_headers) \
gda-report-rml-document.c
-libgda_report_rml_4_0_la_LIBADD = $(LIBGDA_LIBS) \
- $(top_builddir)/libgda/libgda-4.0.la
+libgda_report_rml_5_0_la_LIBADD = $(LIBGDA_LIBS) \
+ $(top_builddir)/libgda/libgda-5.0.la
gdareportincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-report
gdareportinclude_HEADERS=$(gda_report_headers)
diff --git a/libgda-report/engine/Makefile.am b/libgda-report/engine/Makefile.am
index 3621598..35de40a 100644
--- a/libgda-report/engine/Makefile.am
+++ b/libgda-report/engine/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda-report-engine-4.0.la
+noinst_LTLIBRARIES = libgda-report-engine-5.0.la
AM_CPPFLAGS = \
-I$(top_builddir)/libgda-report \
@@ -12,12 +12,12 @@ AM_CPPFLAGS = \
gda_report_headers = \
gda-report-engine.h
-libgda_report_engine_4_0_la_SOURCES = \
+libgda_report_engine_5_0_la_SOURCES = \
$(gda_report_headers) \
gda-report-engine.c
-libgda_report_engine_4_0_la_LIBADD = $(LIBGDA_LIBS) \
- $(top_builddir)/libgda/libgda-4.0.la
+libgda_report_engine_5_0_la_LIBADD = $(LIBGDA_LIBS) \
+ $(top_builddir)/libgda/libgda-5.0.la
gdareportincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-report
gdareportinclude_HEADERS=$(gda_report_headers)
diff --git a/libgda-ui-4.0.pc.in b/libgda-ui-5.0.pc.in
similarity index 100%
rename from libgda-ui-4.0.pc.in
rename to libgda-ui-5.0.pc.in
diff --git a/libgda-ui/.gitignore b/libgda-ui/.gitignore
index a9fa5a2..ded2312 100644
--- a/libgda-ui/.gitignore
+++ b/libgda-ui/.gitignore
@@ -5,5 +5,5 @@ s-enum-types-h
gdaui-enum-types.c
gdaui-enum-types.h
libgdaui.def
-Gdaui-4.0.gir
-Gdaui-4.0.typelib
+Gdaui-5.0.gir
+Gdaui-5.0.typelib
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index d602fbb..9ce1cb3 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -1,6 +1,6 @@
QUIET_GEN = $(Q:@= echo ' GEN '$@;)
-lib_LTLIBRARIES = libgda-ui-4.0.la
+lib_LTLIBRARIES = libgda-ui-5.0.la
SUBDIRS = marshallers data-entries internal data . data-entries/plugins demos
@@ -62,7 +62,7 @@ ui_sources = \
gdaui-tree-store.c \
gdaui-init.c
-libgda_ui_4_0_la_SOURCES = \
+libgda_ui_5_0_la_SOURCES = \
$(libgda_ui_built_cfiles) \
$(ui_sources)
@@ -102,22 +102,22 @@ s-enum-types-c: @REBUILD@ $(ui_headers) Makefile
libgda_ui_built_headers = gdaui-enum-types.h
libgda_ui_built_cfiles = gdaui-enum-types.c
-$(OBJECTS) $(libgda_ui_4_0_la_OBJECTS): $(libgda_ui_built_headers) $(libgda_ui_built_cfiles)
+$(OBJECTS) $(libgda_ui_5_0_la_OBJECTS): $(libgda_ui_built_headers) $(libgda_ui_built_cfiles)
-libgda_ui_4_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
+libgda_ui_5_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
$(NO_UNDEFINED) $(LIBTOOL_UI_EXPORT_OPTIONS)
-libgda_ui_4_0_la_LIBADD = \
+libgda_ui_5_0_la_LIBADD = \
marshallers/libgda-ui-marshallers.la \
internal/libgda-ui-internal.la \
data-entries/libgda-ui-data-entries.la \
- ../libgda/libgda-4.0.la \
+ ../libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(GTK_LIBS) \
$(GIO_LIBS)
if PLATFORM_WIN32
-libgda_ui_4_0_la_LDFLAGS += -export-symbols $(builddir)/libgda-ui.def
-libgda_ui_4_0_la_DEPENDENCIES = libgda-ui.def
+libgda_ui_5_0_la_LDFLAGS += -export-symbols $(builddir)/libgda-ui.def
+libgda_ui_5_0_la_DEPENDENCIES = libgda-ui.def
libgda-ui.def: libgda-ui.symbols
(echo -e EXPORTS; $(CPP) -P - <$(srcdir)/libgda-ui.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > libgda-ui.def.tmp && mv libgda-ui.def.tmp libgda-ui.def
@@ -208,12 +208,12 @@ introspection_sources = \
$(ui_data_entries_sources)
Gdaui-4_0.gir: $(lib_LTLIBRARIES)
-Gdaui_4_0_gir_INCLUDES = Gtk-2.0 Gda-4.0
-Gdaui_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
-Gdaui_4_0_gir_LIBS = $(lib_LTLIBRARIES)
-Gdaui_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+Gdaui_5_0_gir_INCLUDES = Gtk-2.0 Gda-5.0
+Gdaui_5_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Gdaui_5_0_gir_LIBS = $(lib_LTLIBRARIES)
+Gdaui_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libgda
-INTROSPECTION_GIRS += Gdaui-4.0.gir
+INTROSPECTION_GIRS += Gdaui-5.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/libgda-ui/data-entries/Makefile.am b/libgda-ui/data-entries/Makefile.am
index be69277..435b332 100644
--- a/libgda-ui/data-entries/Makefile.am
+++ b/libgda-ui/data-entries/Makefile.am
@@ -60,7 +60,7 @@ libgda_ui_data_entries_la_SOURCES = \
gdaui-formatted-entry.c \
gdaui-numeric-entry.c
-xmldir = $(datadir)/libgda-4.0/ui
+xmldir = $(datadir)/libgda-5.0/ui
xml_in_files = \
gdaui-entry-string.xml.in \
gdaui-entry-number.xml.in
diff --git a/libgda-ui/data-entries/plugins/Makefile.am b/libgda-ui/data-entries/plugins/Makefile.am
index 26c4544..951db0a 100644
--- a/libgda-ui/data-entries/plugins/Makefile.am
+++ b/libgda-ui/data-entries/plugins/Makefile.am
@@ -51,8 +51,8 @@ libgda_ui_plugins_la_SOURCES = \
libgda_ui_plugins_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
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 --git a/libgda-ui/demos/.gitignore b/libgda-ui/demos/.gitignore
index 9a9e900..44cc7a7 100644
--- a/libgda-ui/demos/.gitignore
+++ b/libgda-ui/demos/.gitignore
@@ -1,3 +1,3 @@
geninclude.pl
demos.h
-gdaui-demo-4.*
+gdaui-demo-5.*
diff --git a/libgda-ui/demos/Makefile.am b/libgda-ui/demos/Makefile.am
index 80b9d2c..d3c8b37 100644
--- a/libgda-ui/demos/Makefile.am
+++ b/libgda-ui/demos/Makefile.am
@@ -44,24 +44,24 @@ AM_CPPFLAGS = \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\"
-bin_PROGRAMS = gdaui-demo-4.0
+bin_PROGRAMS = gdaui-demo-5.0
BUILT_SOURCES = demos.h
demos.h: $(demos) geninclude.pl
(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
-gdaui_demo_4_0_SOURCES = \
+gdaui_demo_5_0_SOURCES = \
$(demos) \
demo-common.h \
main.c \
demos.h
-gdaui_demo_4_0_DEPENDENCIES = $(DEPS)
-gdaui_demo_4_0_LDFLAGS = $(EXTRALDFLAGS)
-gdaui_demo_4_0_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-4.0.la \
+gdaui_demo_5_0_DEPENDENCIES = $(DEPS)
+gdaui_demo_5_0_LDFLAGS = $(EXTRALDFLAGS)
+gdaui_demo_5_0_LDADD = \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
$(LIBGDA_LIBS) $(GTK_LIBS)
democode_DATA = $(demos) $(demofiles)
diff --git a/libgda-xslt-4.0.pc.in b/libgda-xslt-5.0.pc.in
similarity index 100%
rename from libgda-xslt-4.0.pc.in
rename to libgda-xslt-5.0.pc.in
diff --git a/libgda-xslt/Makefile.am b/libgda-xslt/Makefile.am
index 5f1ece5..f0673bf 100644
--- a/libgda-xslt/Makefile.am
+++ b/libgda-xslt/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgda-xslt-4.0.la
+lib_LTLIBRARIES = libgda-xslt-5.0.la
AM_CPPFLAGS = \
-I$(top_builddir)/libgda-report \
@@ -12,16 +12,16 @@ AM_CPPFLAGS = \
gda_xslt_headers = \
libgda-xslt.h
-libgda_xslt_4_0_la_SOURCES = \
+libgda_xslt_5_0_la_SOURCES = \
$(gda_xslt_headers) \
sql_backend.h \
sqlexslt.c \
sql_exslt_internal.c \
sql_backend.c
-libgda_xslt_4_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
-libgda_xslt_4_0_la_LIBADD = $(LIBGDA_LIBS) $(LIBXSLT_LIBS)\
- $(top_builddir)/libgda/libgda-4.0.la
+libgda_xslt_5_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
+libgda_xslt_5_0_la_LIBADD = $(LIBGDA_LIBS) $(LIBXSLT_LIBS)\
+ $(top_builddir)/libgda/libgda-5.0.la
gdaxsltincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-xslt
gdaxsltinclude_HEADERS=$(gda_xslt_headers)
diff --git a/libgda/.gitignore b/libgda/.gitignore
index 2dba251..47187cf 100644
--- a/libgda/.gitignore
+++ b/libgda/.gitignore
@@ -6,5 +6,5 @@ s-enum-types-h
gda-enum-types.c
gda-enum-types.h
libgda.def
-Gda-4.0.gir
-Gda-4.0.typelib
+Gda-5.0.gir
+Gda-5.0.typelib
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index a3bb973..8f60b46 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -1,6 +1,6 @@
QUIET_GEN = $(Q:@= echo ' GEN '$@;)
-lib_LTLIBRARIES = libgda-4.0.la
+lib_LTLIBRARIES = libgda-5.0.la
SUBDIRS = sqlite handlers binreloc sql-parser providers-support thread-wrapper
@@ -207,29 +207,29 @@ libgda_built_headers = gda-marshal.h gda-enum-types.h
libgda_built_cfiles = gda-enum-types.c
# Don't build the library until we have built the headers that it needs:
-$(OBJECTS) $(libgda_4_0_la_OBJECTS): gda-marshal.c $(libgda_built_headers) $(libgda_built_cfiles) keywords_hash.c
+$(OBJECTS) $(libgda_5_0_la_OBJECTS): gda-marshal.c $(libgda_built_headers) $(libgda_built_cfiles) keywords_hash.c
-libgda_4_0_la_SOURCES = \
+libgda_5_0_la_SOURCES = \
$(libgda_built_cfiles) \
$(libgda_sources)
-libgda_4_0_la_LDFLAGS = \
+libgda_5_0_la_LDFLAGS = \
-version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
-export-dynamic $(NO_UNDEFINED) $(LIBTOOL_EXPORT_OPTIONS)
-libgda_4_0_la_LIBADD = \
- sql-parser/libgda_sql_parser-4.0.la \
+libgda_5_0_la_LIBADD = \
+ sql-parser/libgda_sql_parser-5.0.la \
providers-support/libgda-psupport.la \
- handlers/libgda_handlers-4.0.la \
- binreloc/libgda_binreloc-4.0.la \
+ handlers/libgda_handlers-5.0.la \
+ binreloc/libgda_binreloc-5.0.la \
sqlite/libgda-sqlite.la \
- thread-wrapper/libgda_threadwrapper-4.0.la \
+ thread-wrapper/libgda_threadwrapper-5.0.la \
$(LIBGDA_LIBS) $(FAM_LIBS) \
$(GIO_LIBS) $(GNOMEVFS_LIBS)
if PLATFORM_WIN32
-libgda_4_0_la_LDFLAGS += -export-symbols $(builddir)/libgda.def
-libgda_4_0_la_DEPENDENCIES = libgda.def
+libgda_5_0_la_LDFLAGS += -export-symbols $(builddir)/libgda.def
+libgda_5_0_la_DEPENDENCIES = libgda.def
libgda.def: libgda.symbols
(echo -e EXPORTS; $(CPP) -P $(DEF_FLAGS) - <$(srcdir)/libgda.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > libgda.def.tmp && mv libgda.def.tmp libgda.def
@@ -265,7 +265,7 @@ CLEANFILES = $(libgda_built_headers) $(libgda_built_cfiles) \
dist-hook:
cd $(distdir); rm -f $(libgda_built_headers) $(libgda_built_cfiles)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_DATA = information_schema.xml
DTD_FILES = libgda-array.dtd libgda-paramlist.dtd libgda-server-operation.dtd
@@ -345,11 +345,11 @@ introspection_sources = $(gda_sources) \
$(sqlparser) \
$(handlers)
Gda-4_0.gir: $(lib_LTLIBRARIES)
-Gda_4_0_gir_INCLUDES = GObject-2.0 libxml2-2.0
-Gda_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
-Gda_4_0_gir_LIBS = $(lib_LTLIBRARIES)
-Gda_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
-INTROSPECTION_GIRS += Gda-4.0.gir
+Gda_5_0_gir_INCLUDES = GObject-2.0 libxml2-2.0
+Gda_5_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Gda_5_0_gir_LIBS = $(lib_LTLIBRARIES)
+Gda_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+INTROSPECTION_GIRS += Gda-5.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/libgda/binreloc/Makefile.am b/libgda/binreloc/Makefile.am
index 07e1e3f..947dd50 100644
--- a/libgda/binreloc/Makefile.am
+++ b/libgda/binreloc/Makefile.am
@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
-DLIBGDASBIN=\""$(sbindir)"\" \
-DLIBGDASYSCONF=\""$(sysconfdir)"\"
-noinst_LTLIBRARIES = libgda_binreloc-4.0.la
+noinst_LTLIBRARIES = libgda_binreloc-5.0.la
binreloc_headers = \
gda-binreloc.h
@@ -21,7 +21,7 @@ binreloc_headers = \
binrelocincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda
binrelocinclude_HEADERS=$(binreloc_headers)
-libgda_binreloc_4_0_la_SOURCES = \
+libgda_binreloc_5_0_la_SOURCES = \
gda-binreloc.c \
$(binreloc_headers)
diff --git a/libgda/gda-config.c b/libgda/gda-config.c
index a19cb1a..40c0aa5 100644
--- a/libgda/gda-config.c
+++ b/libgda/gda-config.c
@@ -235,7 +235,7 @@ gda_config_class_init (GdaConfigClass *klass)
"File to use for per-user DSN list",
NULL,
(G_PARAM_READABLE | G_PARAM_WRITABLE)));
- /* To translators: DSN stands for Data Source Name, it's a named connection string defined in $PREFIX/etc/libgda-4.0/config */
+ /* To translators: DSN stands for Data Source Name, it's a named connection string defined in $PREFIX/etc/libgda-5.0/config */
g_object_class_install_property (object_class, PROP_USER_FILE,
g_param_spec_string ("system-filename", NULL,
"File to use for system-wide DSN list",
diff --git a/libgda/gda-connection.c b/libgda/gda-connection.c
index 25570e7..9421d87 100644
--- a/libgda/gda-connection.c
+++ b/libgda/gda-connection.c
@@ -870,7 +870,7 @@ _gda_connection_get_internal_thread_provider (void)
*
* The actual named parameters required depend on the provider being used, and that list is available
* as the <parameter>auth_params</parameter> member of the #GdaProviderInfo structure for each installed
- * provider (use gda_config_get_provider_info() to get it). Also one can use the "gda-sql-4.0 -L" command to
+ * provider (use gda_config_get_provider_info() to get it). Also one can use the "gda-sql-5.0 -L" command to
* list the possible named parameters.
*
* Returns: a new #GdaConnection if connection opening was sucessfull or %NULL if there was an error.
@@ -996,7 +996,7 @@ gda_connection_open_from_dsn (const gchar *dsn, const gchar *auth_string,
* series of <key>=<value> pairs, where each key and value are encoded as per RFC 1738,
* see gda_rfc1738_encode() for more information.
*
- * The possible keys depend on the provider, the "gda-sql-4.0 -L" command
+ * The possible keys depend on the provider, the "gda-sql-5.0 -L" command
* can be used to list the actual keys for each installed database provider.
*
* For example the connection string to open an SQLite connection to a database
@@ -1017,7 +1017,7 @@ gda_connection_open_from_dsn (const gchar *dsn, const gchar *auth_string,
* The actual named parameters required depend on the provider being used, and that list is available
* as the <parameter>auth_params</parameter> member of the #GdaProviderInfo structure for each installed
* provider (use gda_config_get_provider_info() to get it). Similarly to the format of the connection
- * string, use the "gda-sql-4.0 -L" command to list the possible named parameters.
+ * string, use the "gda-sql-5.0 -L" command to list the possible named parameters.
*
* Additionally, it is possible to have the connection string
* respect the "<provider_name>://<real cnc string>" format, in which case the provider name
diff --git a/libgda/gda-init.c b/libgda/gda-init.c
index 4f72c68..c3262c8 100644
--- a/libgda/gda-init.c
+++ b/libgda/gda-init.c
@@ -213,8 +213,8 @@ gda_init (void)
*
* Find the path to the application identified by @app_name. For example if the application
* is "gda-sql", then calling this function will return
- * "/your/prefix/bin/gda-sql-4.0" if Libgda is installed in
- * the "/your/prefix" prefix (which would usually be "/usr"), and for the ABI version 4.0.
+ * "/your/prefix/bin/gda-sql-5.0" if Libgda is installed in
+ * the "/your/prefix" prefix (which would usually be "/usr"), and for the ABI version 5.0.
*
* Returns: the path as a new string, or %NULL if the application cannot be found
*/
diff --git a/libgda/gda-server-operation.c b/libgda/gda-server-operation.c
index 7c03ebf..5641ef3 100644
--- a/libgda/gda-server-operation.c
+++ b/libgda/gda-server-operation.c
@@ -2008,7 +2008,7 @@ gda_server_operation_get_value_at (GdaServerOperation *op, const gchar *path_for
* if the @path is not defined or @path does not hold any value, or if the value held is not a string
* (in that last case a warning is shown).
*
- * Since: 4.0.3
+ * Since: 5.0.3
*/
gchar *
gda_server_operation_get_sql_identifier_at (GdaServerOperation *op, GdaConnection *cnc, GdaServerProvider *prov,
diff --git a/libgda/gda-server-provider-extra.c b/libgda/gda-server-provider-extra.c
index a72bdc2..003e624 100644
--- a/libgda/gda-server-provider-extra.c
+++ b/libgda/gda-server-provider-extra.c
@@ -668,7 +668,7 @@ gda_server_provider_load_file_contents (const gchar *inst_dir, const gchar *data
goto theend;
g_free (file);
- file = g_build_filename (inst_dir, "..", "..", "..", "share", "libgda-4.0", filename, NULL);
+ file = g_build_filename (inst_dir, "..", "..", "..", "share", "libgda-5.0", filename, NULL);
if (g_file_get_contents (file, &contents, NULL, NULL))
goto theend;
contents = NULL;
diff --git a/libgda/handlers/Makefile.am b/libgda/handlers/Makefile.am
index 35a1ecc..216c064 100644
--- a/libgda/handlers/Makefile.am
+++ b/libgda/handlers/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda_handlers-4.0.la
+noinst_LTLIBRARIES = libgda_handlers-5.0.la
AM_CPPFLAGS = \
-I$(top_srcdir) -I$(srcdir)/.. \
@@ -16,7 +16,7 @@ libgda_handlers_headers = \
libgda_handlersincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/handlers
libgda_handlersinclude_HEADERS=$(libgda_handlers_headers)
-libgda_handlers_4_0_la_SOURCES = \
+libgda_handlers_5_0_la_SOURCES = \
$(libgda_handlers_headers) \
gda-handler-bin.c \
gda-handler-boolean.c \
diff --git a/libgda/sql-parser/Makefile.am b/libgda/sql-parser/Makefile.am
index f1f0040..8ae365f 100644
--- a/libgda/sql-parser/Makefile.am
+++ b/libgda/sql-parser/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda_sql_parser-4.0.la
+noinst_LTLIBRARIES = libgda_sql_parser-5.0.la
noinst_PROGRAMS =
AM_CPPFLAGS = \
@@ -75,11 +75,11 @@ s-enum-types-c: @REBUILD@ $(libgda_sql_parser_headers) Makefile
libgda_sql_parser_built_headers = gda-sql-parser-enum-types.h
libgda_sql_parser_built_cfiles = gda-sql-parser-enum-types.c
-$(OBJECTS) $(libgda_sql_parser_4_0_la_OBJECTS): token_types.h
+$(OBJECTS) $(libgda_sql_parser_5_0_la_OBJECTS): token_types.h
libgda_sql_parserincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/sql-parser
libgda_sql_parserinclude_HEADERS=$(libgda_sql_parser_headers) $(libgda_sql_parser_built_headers)
-libgda_sql_parser_4_0_la_SOURCES = \
+libgda_sql_parser_5_0_la_SOURCES = \
$(libgda_sql_parser_headers) \
$(libgda_sql_parser_built_headers) \
$(libgda_sql_parser_built_cfiles) \
diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am
index 7288ccc..e6fe18f 100644
--- a/libgda/sqlite/Makefile.am
+++ b/libgda/sqlite/Makefile.am
@@ -60,7 +60,7 @@ libgda_sqlite_la_SOURCES = \
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 --git a/libgda/sqlite/virtual/Makefile.am b/libgda/sqlite/virtual/Makefile.am
index d0d363e..ca7163b 100644
--- a/libgda/sqlite/virtual/Makefile.am
+++ b/libgda/sqlite/virtual/Makefile.am
@@ -7,7 +7,7 @@ sqliteinc= -I$(top_srcdir)/libgda/sqlite/sqlite-src \
-I$(top_builddir)/libgda/sqlite/sqlite-src
endif
-noinst_LTLIBRARIES = libgda-virtual-4.0.la
+noinst_LTLIBRARIES = libgda-virtual-5.0.la
AM_CPPFLAGS = \
-I$(top_srcdir) \
@@ -28,7 +28,7 @@ virtual_headers = \
gda-virtual-provider.h \
libgda-virtual.h
-libgda_virtual_4_0_la_SOURCES = \
+libgda_virtual_5_0_la_SOURCES = \
$(virtual_headers) \
gda-vconnection-data-model.c \
gda-vconnection-data-model-private.h \
@@ -41,7 +41,7 @@ libgda_virtual_4_0_la_SOURCES = \
gdaincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/virtual
gdainclude_HEADERS=$(virtual_headers)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files =
@INTLTOOL_XML_RULE@
diff --git a/libgda/sqlite/virtual/libgda-virtual-4.0.pc.in b/libgda/sqlite/virtual/libgda-virtual-5.0.pc.in
similarity index 100%
rename from libgda/sqlite/virtual/libgda-virtual-4.0.pc.in
rename to libgda/sqlite/virtual/libgda-virtual-5.0.pc.in
diff --git a/libgda/thread-wrapper/Makefile.am b/libgda/thread-wrapper/Makefile.am
index 6a4fb0b..fa4cf30 100644
--- a/libgda/thread-wrapper/Makefile.am
+++ b/libgda/thread-wrapper/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda_threadwrapper-4.0.la
+noinst_LTLIBRARIES = libgda_threadwrapper-5.0.la
AM_CPPFLAGS = \
-I$(top_srcdir) -I$(srcdir)/.. \
@@ -12,7 +12,7 @@ libgda_threadwrapper_headers = \
libgda_threadwrapperincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/thread-wrapper
libgda_threadwrapperinclude_HEADERS=$(libgda_threadwrapper_headers)
-libgda_threadwrapper_4_0_la_SOURCES = \
+libgda_threadwrapper_5_0_la_SOURCES = \
$(libgda_threadwrapper_headers) \
gda-thread-blob-op.h \
gda-thread-blob-op.c \
diff --git a/providers/bdb/Makefile.am b/providers/bdb/Makefile.am
index ac36607..764539e 100644
--- a/providers/bdb/Makefile.am
+++ b/providers/bdb/Makefile.am
@@ -17,7 +17,7 @@ libgda_bdb_la_SOURCES = \
libgda_bdb_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_bdb_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
noinst_PROGRAMS = gda-bdb-test
@@ -26,9 +26,9 @@ gda_bdb_test_SOURCES = gda-bdb-test.c
gda_bdb_test_LDADD = \
$(LIBGDA_LIBS) \
$(BDB_LIBS) \
- $(top_builddir)/libgda/libgda-4.0.la
+ $(top_builddir)/libgda/libgda-5.0.la
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = bdb_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -36,8 +36,8 @@ xml_in_files = bdb_specs_dsn.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-bdb-4.0.pc
+pkgconfig_DATA = libgda-bdb-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-bdb-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-bdb-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/bdb/libgda-bdb-4.0.pc.in b/providers/bdb/libgda-bdb-5.0.pc.in
similarity index 100%
rename from providers/bdb/libgda-bdb-4.0.pc.in
rename to providers/bdb/libgda-bdb-5.0.pc.in
diff --git a/providers/firebird/Makefile.am b/providers/firebird/Makefile.am
index 42bed2d..eb03d5a 100644
--- a/providers/firebird/Makefile.am
+++ b/providers/firebird/Makefile.am
@@ -47,10 +47,10 @@ libgda_firebird_la_SOURCES = \
libgda_firebird_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_firebird_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) #$(FIREBIRD_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = \
firebird_specs_dsn.xml.in \
firebird_specs_create_table.xml.in
@@ -60,9 +60,9 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-firebird-4.0.pc
+pkgconfig_DATA = libgda-firebird-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-firebird-4.0.pc.in parser.y gen_def.c
+EXTRA_DIST = $(xml_in_files) libgda-firebird-5.0.pc.in parser.y gen_def.c
DISTCLEANFILES = $(xml_DATA)
CLEANFILES = parser.h parser.c parser.out firebird_token_types.h gen_def$(EXEEXT_FOR_BUILD)
diff --git a/providers/firebird/libgda-firebird-4.0.pc.in b/providers/firebird/libgda-firebird-5.0.pc.in
similarity index 100%
rename from providers/firebird/libgda-firebird-4.0.pc.in
rename to providers/firebird/libgda-firebird-5.0.pc.in
diff --git a/providers/freetds/Makefile.am b/providers/freetds/Makefile.am
index 2f5e449..1c1fdb6 100644
--- a/providers/freetds/Makefile.am
+++ b/providers/freetds/Makefile.am
@@ -25,11 +25,11 @@ libgda_freetds_la_SOURCES = \
libgda_freetds_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
libgda_freetds_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(FREETDS_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = freetds_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -37,8 +37,8 @@ xml_in_files = freetds_specs_dsn.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-freetds-4.0.pc
+pkgconfig_DATA = libgda-freetds-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-freetds-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-freetds-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/freetds/libgda-freetds-4.0.pc.in b/providers/freetds/libgda-freetds-5.0.pc.in
similarity index 100%
rename from providers/freetds/libgda-freetds-4.0.pc.in
rename to providers/freetds/libgda-freetds-5.0.pc.in
diff --git a/providers/ibmdb2/Makefile.am b/providers/ibmdb2/Makefile.am
index e2ca237..ca4ab26 100644
--- a/providers/ibmdb2/Makefile.am
+++ b/providers/ibmdb2/Makefile.am
@@ -21,12 +21,12 @@ libgda_ibmdb2_la_SOURCES = \
libgda_ibmdb2_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
libgda_ibmdb2_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(IBMDB2_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = ibmdb2_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -34,9 +34,9 @@ xml_in_files = ibmdb2_specs_dsn.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-ibmdb2-4.0.pc
+pkgconfig_DATA = libgda-ibmdb2-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-ibmdb2-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-ibmdb2-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/ibmdb2/libgda-ibmdb2-4.0.pc.in b/providers/ibmdb2/libgda-ibmdb2-5.0.pc.in
similarity index 100%
rename from providers/ibmdb2/libgda-ibmdb2-4.0.pc.in
rename to providers/ibmdb2/libgda-ibmdb2-5.0.pc.in
diff --git a/providers/jdbc/Makefile.am b/providers/jdbc/Makefile.am
index 6665fc2..5aea096 100644
--- a/providers/jdbc/Makefile.am
+++ b/providers/jdbc/Makefile.am
@@ -1,7 +1,7 @@
providerdir=$(libdir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/providers
provider_LTLIBRARIES = libgda-jdbc.la
noinst_PROGRAMS = gda-jdbc-test
-bin_PROGRAMS = gda-list-jdbc-providers-4.0
+bin_PROGRAMS = gda-list-jdbc-providers-5.0
#Rem: JDBC_CFLAGS and JDBC_LIBS are the compile and link flags necessary to use the
# C API. It is specific to the API and should be computed in the configure.in script.
@@ -57,7 +57,7 @@ libgda_jdbc_la_SOURCES = \
libgda_jdbc_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_jdbc_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
# rem: don't link with JAVA_LIBS because we don't want the dependency on it
# (JVM runtime will be loaded when running)
@@ -72,7 +72,7 @@ endif
$(jni_headers): $(jdbcprov_classes)
$(JAVAH) -classpath . -force `echo $@ | sed -e 's/\.h$$//'`
-jdbcprov_jar = gdaprovider-4.0.jar
+jdbcprov_jar = gdaprovider-5.0.jar
jdbcprov_sources = \
provider.java \
meta.java \
@@ -94,7 +94,7 @@ clean-local:
rm -f $(jni_headers)
rm -f *.class
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = \
jdbc_specs_dsn.xml.in \
jdbc_specs_create_table.xml.in
@@ -104,12 +104,12 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-jdbc-4.0.pc
+pkgconfig_DATA = libgda-jdbc-5.0.pc
doc_files = \
doc/structure.dia
-EXTRA_DIST = $(xml_in_files) libgda-jdbc-4.0.pc.in \
+EXTRA_DIST = $(xml_in_files) libgda-jdbc-5.0.pc.in \
$(jdbcprov_sources) \
$(doc_files) \
MANIFEST.MF
@@ -120,11 +120,11 @@ DISTCLEANFILES = $(xml_DATA)
gda_jdbc_test_SOURCES = gda-jdbc-test.c
gda_jdbc_test_LDADD = \
$(LIBGDA_LIBS) \
- $(top_builddir)/libgda/libgda-4.0.la
+ $(top_builddir)/libgda/libgda-5.0.la
-gda_list_jdbc_providers_4_0_SOURCES = gda-list-jdbc-providers.c
-gda_list_jdbc_providers_4_0_LDADD = \
+gda_list_jdbc_providers_5_0_SOURCES = gda-list-jdbc-providers.c
+gda_list_jdbc_providers_5_0_LDADD = \
$(LIBGDA_LIBS) \
- $(top_builddir)/libgda/libgda-4.0.la
+ $(top_builddir)/libgda/libgda-5.0.la
diff --git a/providers/jdbc/libgda-jdbc-4.0.pc.in b/providers/jdbc/libgda-jdbc-5.0.pc.in
similarity index 100%
rename from providers/jdbc/libgda-jdbc-4.0.pc.in
rename to providers/jdbc/libgda-jdbc-5.0.pc.in
diff --git a/providers/jdbc/libmain.c b/providers/jdbc/libmain.c
index 70e56b4..ecdb125 100644
--- a/providers/jdbc/libmain.c
+++ b/providers/jdbc/libmain.c
@@ -470,7 +470,7 @@ load_jvm ()
if (jvm_found) {
gchar *path;
GError *error = NULL;
- path = g_build_filename (module_path, "gdaprovider-4.0.jar", NULL);
+ path = g_build_filename (module_path, "gdaprovider-5.0.jar", NULL);
jni_wrapper_create_vm (&_jdbc_provider_java_vm, __CreateJavaVM, module_path, path, &error);
if (!_jdbc_provider_java_vm) {
if (g_getenv ("GDA_SHOW_PROVIDER_LOADING_ERROR"))
diff --git a/providers/ldap/Makefile.am b/providers/ldap/Makefile.am
index b8c65cd..12a773f 100644
--- a/providers/ldap/Makefile.am
+++ b/providers/ldap/Makefile.am
@@ -19,11 +19,11 @@ libgda_ldap_la_SOURCES = \
utils.c
libgda_ldap_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
libgda_ldap_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(LDAP_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = ldap_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -31,8 +31,8 @@ xml_in_files = ldap_specs_dsn.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-ldap-4.0.pc
+pkgconfig_DATA = libgda-ldap-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-ldap-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-ldap-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/ldap/libgda-ldap-4.0.pc.in b/providers/ldap/libgda-ldap-5.0.pc.in
similarity index 100%
rename from providers/ldap/libgda-ldap-4.0.pc.in
rename to providers/ldap/libgda-ldap-5.0.pc.in
diff --git a/providers/mdb/Makefile.am b/providers/mdb/Makefile.am
index c27f427..bedeb43 100644
--- a/providers/mdb/Makefile.am
+++ b/providers/mdb/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
$(LIBGDA_CFLAGS) \
$(MDB_CFLAGS) \
- -DLIBGDA_DATA_DIR=\""$(datadir)/libgda-4.0"\"
+ -DLIBGDA_DATA_DIR=\""$(datadir)/libgda-5.0"\"
libgda_mdb_la_SOURCES = \
gda-mdb-provider.c \
@@ -18,11 +18,11 @@ libgda_mdb_la_SOURCES = \
libgda_mdb_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_mdb_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(MDB_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = mdb_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -30,9 +30,9 @@ xml_in_files = mdb_specs_dsn.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-mdb-4.0.pc
+pkgconfig_DATA = libgda-mdb-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-mdb-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-mdb-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/mdb/libgda-mdb-4.0.pc.in b/providers/mdb/libgda-mdb-5.0.pc.in
similarity index 100%
rename from providers/mdb/libgda-mdb-4.0.pc.in
rename to providers/mdb/libgda-mdb-5.0.pc.in
diff --git a/providers/msql/Makefile.am b/providers/msql/Makefile.am
index d5cd783..4590618 100644
--- a/providers/msql/Makefile.am
+++ b/providers/msql/Makefile.am
@@ -18,11 +18,11 @@ libgda_msql_la_SOURCES = \
gda-msql-utils.c
libgda_msql_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
libgda_msql_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(MSQL_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = msql_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -30,9 +30,9 @@ xml_in_files = msql_specs_dsn.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-msql-4.0.pc
+pkgconfig_DATA = libgda-msql-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-msql-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-msql-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/msql/libgda-msql-4.0.pc.in b/providers/msql/libgda-msql-5.0.pc.in
similarity index 100%
rename from providers/msql/libgda-msql-4.0.pc.in
rename to providers/msql/libgda-msql-5.0.pc.in
diff --git a/providers/mysql/Makefile.am b/providers/mysql/Makefile.am
index 06a2569..d7ac65e 100644
--- a/providers/mysql/Makefile.am
+++ b/providers/mysql/Makefile.am
@@ -31,11 +31,11 @@ libgda_mysql_la_SOURCES = \
libgda_mysql_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_mysql_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/providers/reuseable/mysql/libgda-mysql.la \
$(LIBGDA_LIBS) $(MYSQL_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = \
mysql_specs_create_db.xml.in \
mysql_specs_drop_db.xml.in \
@@ -57,7 +57,7 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-mysql-4.0.pc
+pkgconfig_DATA = libgda-mysql-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-mysql-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-mysql-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/mysql/libgda-mysql-4.0.pc.in b/providers/mysql/libgda-mysql-5.0.pc.in
similarity index 100%
rename from providers/mysql/libgda-mysql-4.0.pc.in
rename to providers/mysql/libgda-mysql-5.0.pc.in
diff --git a/providers/odbc/Makefile.am b/providers/odbc/Makefile.am
index b203d3e..63ad8d5 100644
--- a/providers/odbc/Makefile.am
+++ b/providers/odbc/Makefile.am
@@ -18,11 +18,11 @@ libgda_odbc_la_SOURCES = \
libmain.c
libgda_odbc_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
libgda_odbc_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(ODBC_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = odbc_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -30,8 +30,8 @@ xml_in_files = odbc_specs_dsn.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-odbc-4.0.pc
+pkgconfig_DATA = libgda-odbc-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-odbc-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-odbc-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/odbc/libgda-odbc-4.0.pc.in b/providers/odbc/libgda-odbc-5.0.pc.in
similarity index 100%
rename from providers/odbc/libgda-odbc-4.0.pc.in
rename to providers/odbc/libgda-odbc-5.0.pc.in
diff --git a/providers/oracle/Makefile.am b/providers/oracle/Makefile.am
index 17d257b..1c2c925 100644
--- a/providers/oracle/Makefile.am
+++ b/providers/oracle/Makefile.am
@@ -57,10 +57,10 @@ libgda_oracle_la_SOURCES = \
libgda_oracle_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_oracle_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) $(ORACLE_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = \
oracle_specs_dsn.xml.in \
oracle_specs_create_table.xml.in
@@ -70,9 +70,9 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-oracle-4.0.pc
+pkgconfig_DATA = libgda-oracle-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-oracle-4.0.pc.in parser.y gen_def.c $(keyword_files)
+EXTRA_DIST = $(xml_in_files) libgda-oracle-5.0.pc.in parser.y gen_def.c $(keyword_files)
DISTCLEANFILES = $(xml_DATA)
CLEANFILES = parser.h parser.c parser.out oracle_token_types.h gen_def$(EXEEXT_FOR_BUILD) \
diff --git a/providers/oracle/libgda-oracle-4.0.pc.in b/providers/oracle/libgda-oracle-5.0.pc.in
similarity index 100%
rename from providers/oracle/libgda-oracle-4.0.pc.in
rename to providers/oracle/libgda-oracle-5.0.pc.in
diff --git a/providers/postgres/Makefile.am b/providers/postgres/Makefile.am
index da6a176..10a1ce3 100644
--- a/providers/postgres/Makefile.am
+++ b/providers/postgres/Makefile.am
@@ -28,11 +28,11 @@ libgda_postgres_la_SOURCES = \
libgda_postgres_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_postgres_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/providers/reuseable/postgres/libgda-postgres.la \
$(LIBGDA_LIBS) $(POSTGRES_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = \
postgres_specs_create_db.xml.in \
postgres_specs_drop_db.xml.in \
@@ -52,7 +52,7 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-postgres-4.0.pc
+pkgconfig_DATA = libgda-postgres-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-postgres-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-postgres-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/postgres/libgda-postgres-4.0.pc.in b/providers/postgres/libgda-postgres-5.0.pc.in
similarity index 100%
rename from providers/postgres/libgda-postgres-4.0.pc.in
rename to providers/postgres/libgda-postgres-5.0.pc.in
diff --git a/providers/reuseable/mysql/Makefile.am b/providers/reuseable/mysql/Makefile.am
index d7bd0ea..b01cc04 100644
--- a/providers/reuseable/mysql/Makefile.am
+++ b/providers/reuseable/mysql/Makefile.am
@@ -42,7 +42,7 @@ libgda_mysql_la_SOURCES = \
mysql_token_types.h
libgda_mysql_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
EXTRA_DIST = $(xml_in_files) parser.y gen_def.c $(keyword_files)
diff --git a/providers/reuseable/postgres/Makefile.am b/providers/reuseable/postgres/Makefile.am
index c6efa21..84bc775 100644
--- a/providers/reuseable/postgres/Makefile.am
+++ b/providers/reuseable/postgres/Makefile.am
@@ -41,7 +41,7 @@ libgda_postgres_la_SOURCES = \
postgres_token_types.h
libgda_postgres_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
EXTRA_DIST = parser.y gen_def.c $(keyword_files)
diff --git a/providers/skel-implementation/capi/Makefile.am b/providers/skel-implementation/capi/Makefile.am
index 10ae6c6..85e9ec8 100644
--- a/providers/skel-implementation/capi/Makefile.am
+++ b/providers/skel-implementation/capi/Makefile.am
@@ -56,10 +56,10 @@ libgda_capi_la_SOURCES = \
libgda_capi_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_capi_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) #$(CAPI_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = \
capi_specs_dsn.xml.in \
capi_specs_create_table.xml.in
@@ -70,10 +70,10 @@ xml_in_files = \
noinst_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-#pkgconfig_DATA = libgda-capi-4.0.pc
-noinst_DATA += libgda-capi-4.0.pc
+#pkgconfig_DATA = libgda-capi-5.0.pc
+noinst_DATA += libgda-capi-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-capi-4.0.pc.in parser.y gen_def.c $(keyword_files)
+EXTRA_DIST = $(xml_in_files) libgda-capi-5.0.pc.in parser.y gen_def.c $(keyword_files)
DISTCLEANFILES = $(noinst_DATA)
CLEANFILES = parser.h parser.c parser.out capi_token_types.h gen_def$(EXEEXT_FOR_BUILD) \
diff --git a/providers/skel-implementation/capi/libgda-capi-4.0.pc.in b/providers/skel-implementation/capi/libgda-capi-5.0.pc.in
similarity index 100%
rename from providers/skel-implementation/capi/libgda-capi-4.0.pc.in
rename to providers/skel-implementation/capi/libgda-capi-5.0.pc.in
diff --git a/providers/skel-implementation/models/Makefile.am b/providers/skel-implementation/models/Makefile.am
index da1fd90..43bb8f3 100644
--- a/providers/skel-implementation/models/Makefile.am
+++ b/providers/skel-implementation/models/Makefile.am
@@ -17,10 +17,10 @@ libgda_models_la_SOURCES = \
libgda_models_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_models_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = models_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -29,9 +29,9 @@ xml_in_files = models_specs_dsn.xml.in
noinst_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-#pkgconfig_DATA = libgda-models-4.0.pc
-noinst_DATA += libgda-models-4.0.pc
+#pkgconfig_DATA = libgda-models-5.0.pc
+noinst_DATA += libgda-models-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-models-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-models-5.0.pc.in
DISTCLEANFILES = $(noinst_DATA)
diff --git a/providers/skel-implementation/models/libgda-models-4.0.pc.in b/providers/skel-implementation/models/libgda-models-5.0.pc.in
similarity index 100%
rename from providers/skel-implementation/models/libgda-models-4.0.pc.in
rename to providers/skel-implementation/models/libgda-models-5.0.pc.in
diff --git a/providers/sqlite/Makefile.am b/providers/sqlite/Makefile.am
index e67d78d..6fe2604 100644
--- a/providers/sqlite/Makefile.am
+++ b/providers/sqlite/Makefile.am
@@ -16,11 +16,11 @@ libgda_sqlite_la_SOURCES = \
libgda_sqlite_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_sqlite_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(sqlitelibs) \
$(LIBGDA_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = \
sqlite_specs_dsn.xml.in \
sqlite_specs_create_db.xml.in \
@@ -39,7 +39,7 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-sqlite-4.0.pc
+pkgconfig_DATA = libgda-sqlite-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-sqlite-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-sqlite-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/sqlite/libgda-sqlite-4.0.pc.in b/providers/sqlite/libgda-sqlite-5.0.pc.in
similarity index 100%
rename from providers/sqlite/libgda-sqlite-4.0.pc.in
rename to providers/sqlite/libgda-sqlite-5.0.pc.in
diff --git a/providers/sybase/Makefile.am b/providers/sybase/Makefile.am
index 847c3e9..20c6dd3 100644
--- a/providers/sybase/Makefile.am
+++ b/providers/sybase/Makefile.am
@@ -22,11 +22,11 @@ libgda_sybase_la_SOURCES = \
libgda_sybase_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
libgda_sybase_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(SYBASE_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = sybase_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -34,9 +34,9 @@ xml_in_files = sybase_specs_dsn.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-sybase-4.0.pc
+pkgconfig_DATA = libgda-sybase-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-sybase-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-sybase-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/sybase/libgda-sybase-4.0.pc.in b/providers/sybase/libgda-sybase-5.0.pc.in
similarity index 100%
rename from providers/sybase/libgda-sybase-4.0.pc.in
rename to providers/sybase/libgda-sybase-5.0.pc.in
diff --git a/providers/web/Makefile.am b/providers/web/Makefile.am
index 2dbb2fb..2d20d07 100644
--- a/providers/web/Makefile.am
+++ b/providers/web/Makefile.am
@@ -34,10 +34,10 @@ libgda_web_la_SOURCES = \
libgda_web_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_web_la_LIBADD = \
$(top_builddir)/providers/reuseable/libreuseable.la \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) $(LIBSOUP_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = \
web_specs_dsn.xml.in \
web_specs_auth.xml.in
@@ -47,9 +47,9 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-web-4.0.pc
+pkgconfig_DATA = libgda-web-5.0.pc
-phpdir = $(datadir)/libgda-4.0/php
+phpdir = $(datadir)/libgda-5.0/php
php_DATA = \
php/README \
php/gda-clean.php \
@@ -63,7 +63,7 @@ php_DATA = \
php/gda-worker.php
-EXTRA_DIST = $(xml_in_files) libgda-web-4.0.pc.in \
+EXTRA_DIST = $(xml_in_files) libgda-web-5.0.pc.in \
$(php_DATA)
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/web/libgda-web-4.0.pc.in b/providers/web/libgda-web-5.0.pc.in
similarity index 100%
rename from providers/web/libgda-web-4.0.pc.in
rename to providers/web/libgda-web-5.0.pc.in
diff --git a/providers/xbase/Makefile.am b/providers/xbase/Makefile.am
index d397386..453ffef 100644
--- a/providers/xbase/Makefile.am
+++ b/providers/xbase/Makefile.am
@@ -17,11 +17,11 @@ libgda_xbase_la_SOURCES = \
libgda_xbase_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
libgda_xbase_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(XBASE_LIBS)
-xmldir = $(datadir)/libgda-4.0
+xmldir = $(datadir)/libgda-5.0
xml_in_files = xbase_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -29,9 +29,9 @@ xml_in_files = xbase_specs_dsn.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-xbase-4.0.pc
+pkgconfig_DATA = libgda-xbase-5.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-xbase-4.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-xbase-5.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/xbase/libgda-xbase-4.0.pc.in b/providers/xbase/libgda-xbase-5.0.pc.in
similarity index 100%
rename from providers/xbase/libgda-xbase-4.0.pc.in
rename to providers/xbase/libgda-xbase-5.0.pc.in
diff --git a/testing/.gitignore b/testing/.gitignore
index 0ac7eb0..b49c67d 100644
--- a/testing/.gitignore
+++ b/testing/.gitignore
@@ -1,4 +1,4 @@
-gda-test-connection-4.*
+gda-test-connection-5.*
gda-test-blob
gda-provider-status
gdaui-test-data-entries
diff --git a/testing/Makefile.am b/testing/Makefile.am
index 15e73ec..09da98a 100644
--- a/testing/Makefile.am
+++ b/testing/Makefile.am
@@ -4,17 +4,17 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
$(LIBGDA_CFLAGS)
-bin_PROGRAMS = gda-test-connection-4.0
+bin_PROGRAMS = gda-test-connection-5.0
if HAVE_UI
UI_PROGS=gdaui-test-data-entries gdaui-test-widget-entry gdaui-test-errors
endif
noinst_PROGRAMS = gda-test-blob gda-provider-status $(UI_PROGS)
-gda_test_connection_4_0_SOURCES = \
+gda_test_connection_5_0_SOURCES = \
gda-test-connection.c
-gda_test_connection_4_0_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+gda_test_connection_5_0_LDADD = \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
@@ -22,7 +22,7 @@ gda_test_blob_SOURCES = \
gda-test-blob.c
gda_test_blob_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
@@ -32,7 +32,7 @@ gda_provider_status_SOURCES = \
gda-provider-status.c
gda_provider_status_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
gdaui_test_data_entries_CFLAGS = $(GTK_CFLAGS)
@@ -40,8 +40,8 @@ gdaui_test_data_entries_SOURCES = \
gdaui-test-data-entries.c
gdaui_test_data_entries_LDADD = \
- $(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 \
$(LIBGDA_LIBS) \
$(GTK_LIBS)
@@ -50,8 +50,8 @@ gdaui_test_widget_entry_SOURCES = \
gdaui-test-widget-entry.c
gdaui_test_widget_entry_LDADD = \
- $(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 \
$(LIBGDA_LIBS) \
$(GTK_LIBS)
@@ -60,9 +60,9 @@ gdaui_test_errors_SOURCES = \
gdaui-test-errors.c
gdaui_test_errors_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS) \
$(GTK_LIBS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ed7576f..a181f84 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda-test-4.0.la
+noinst_LTLIBRARIES = libgda-test-5.0.la
TESTS = test-ddl-creator test-bin-converter test-sql-identifier test-identifiers-quotes test-sql-builder
check_PROGRAMS = test-ddl-creator test-bin-converter test-sql-identifier test-identifiers-quotes test-sql-builder
@@ -16,7 +16,7 @@ AM_CPPFLAGS = \
test_headers = \
gda-ddl-creator.h
-libgda_test_4_0_la_SOURCES = \
+libgda_test_5_0_la_SOURCES = \
$(test_headers) \
gda-ddl-creator.c \
test-cnc-utils.h \
@@ -24,18 +24,18 @@ libgda_test_4_0_la_SOURCES = \
data-model-errors.h \
data-model-errors.c
-libgda_test_4_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
+libgda_test_5_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
-libgda_test_4_0_la_LIBADD = \
+libgda_test_5_0_la_LIBADD = \
$(LIBGDA_LIBS) \
- $(top_builddir)/libgda/libgda-4.0.la
+ $(top_builddir)/libgda/libgda-5.0.la
test_ddl_creator_SOURCES = \
test-ddl-creator.c
test_ddl_creator_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ libgda-test-5.0.la \
$(LIBGDA_LIBS)
@@ -43,29 +43,29 @@ test_bin_converter_SOURCES = \
test-bin-converter.c
test_bin_converter_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ libgda-test-5.0.la \
$(LIBGDA_LIBS)
test_sql_identifier_SOURCES = \
test-sql-identifier.c
test_sql_identifier_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
test_identifiers_quotes_SOURCES = \
test-identifiers-quotes.c
test_identifiers_quotes_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
test_sql_builder_SOURCES = \
test-sql-builder.c
test_sql_builder_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
EXTRA_DIST = dbstruct.xml
\ No newline at end of file
diff --git a/tests/data-models/Makefile.am b/tests/data-models/Makefile.am
index c9b7b69..613dc1a 100644
--- a/tests/data-models/Makefile.am
+++ b/tests/data-models/Makefile.am
@@ -14,7 +14,7 @@ common_sources =
check_model_import_SOURCES = $(common_sources) check_model_import.c
check_model_import_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_virtual_SOURCES = $(common_sources) check_virtual.c
@@ -22,38 +22,38 @@ check_virtual_CFLAGS = \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_srcdir)/libgda/sqlite/virtual
check_virtual_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_data_proxy_SOURCES = $(common_sources) check_data_proxy.c
check_data_proxy_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_model_copy_SOURCES = $(common_sources) check_model_copy.c
check_model_copy_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_pmodel_SOURCES = $(common_sources) check_pmodel.c
check_pmodel_CFLAGS = \
-I$(top_srcdir)/libgda/sqlite
check_pmodel_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_empty_rs_SOURCES = $(common_sources) check_empty_rs.c
check_empty_rs_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_model_errors_SOURCES = $(common_sources) check_model_errors.c
check_model_errors_CFLAGS = \
-I$(top_srcdir)/libgda/sqlite
check_model_errors_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
EXTRA_DIST = \
diff --git a/tests/meta-store/Makefile.am b/tests/meta-store/Makefile.am
index 97fa462..00be66b 100644
--- a/tests/meta-store/Makefile.am
+++ b/tests/meta-store/Makefile.am
@@ -13,22 +13,22 @@ common_sources = common.c common.h
check_meta_store_memory_SOURCES = check_meta_store_memory.c $(common_sources)
check_meta_store_memory_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_meta_store_sqlite_SOURCES = check_meta_store_sqlite.c $(common_sources)
check_meta_store_sqlite_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_meta_store_postgresql_SOURCES = check_meta_store_postgresql.c $(common_sources)
check_meta_store_postgresql_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_meta_store_mysql_SOURCES = check_meta_store_mysql.c $(common_sources)
check_meta_store_mysql_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
EXTRA_DIST = data_builtin_data_types.csv \
diff --git a/tests/multi-threading/Makefile.am b/tests/multi-threading/Makefile.am
index 93e87e6..3c84196 100644
--- a/tests/multi-threading/Makefile.am
+++ b/tests/multi-threading/Makefile.am
@@ -11,27 +11,27 @@ check_PROGRAMS = check_mutex check_parser check_cnc_lock check_threaded_cnc chec
check_mutex_SOURCES = check_mutex.c
check_mutex_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_parser_SOURCES = check_parser.c
check_parser_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_cnc_lock_SOURCES = check_cnc_lock.c common.c common.h
check_cnc_lock_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_threaded_cnc_SOURCES = check_threaded_cnc.c common.c common.h
check_threaded_cnc_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_wrapper_SOURCES = check_wrapper.c dummy-object.c dummy-object.h
check_wrapper_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
EXTRA_DIST = testdb.sql
diff --git a/tests/parser/Makefile.am b/tests/parser/Makefile.am
index d4a7464..bc3c9fc 100644
--- a/tests/parser/Makefile.am
+++ b/tests/parser/Makefile.am
@@ -12,27 +12,27 @@ check_PROGRAMS = check_parser check_validation check_normalization check_dml_com
check_parser_SOURCES = check_parser.c
check_parser_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_validation_SOURCES = check_validation.c
check_validation_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_normalization_SOURCES = check_normalization.c
check_normalization_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_dml_comp_SOURCES = check_dml_comp.c
check_dml_comp_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_script_SOURCES = check_script.c
check_script_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
EXTRA_DIST = testdata.xml testvalid.xml testscripts.xml \
diff --git a/tests/providers/Makefile.am b/tests/providers/Makefile.am
index 61ad899..2765315 100644
--- a/tests/providers/Makefile.am
+++ b/tests/providers/Makefile.am
@@ -83,98 +83,98 @@ common_sources = \
check_sqlite_SOURCES = $(common_sources) check_sqlite.c
check_sqlite_CFLAGS =
check_sqlite_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_bdb_SOURCES = $(common_sources) check_bdb.c
check_bdb_CFLAGS =
check_bdb_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_ibmdb2_SOURCES = $(common_sources) check_ibmdb2.c
check_ibmdb2_CFLAGS =
check_ibmdb2_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_firebird_SOURCES = $(common_sources) check_firebird.c
check_firebird_CFLAGS =
check_firebird_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_mdb_SOURCES = $(common_sources) check_mdb.c
check_mdb_CFLAGS =
check_mdb_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_mysql_SOURCES = $(common_sources) check_mysql.c
check_mysql_CFLAGS =
check_mysql_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_msql_SOURCES = $(common_sources) check_msql.c
check_msql_CFLAGS =
check_msql_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_odbc_SOURCES = $(common_sources) check_odbc.c
check_odbc_CFLAGS =
check_odbc_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_oracle_SOURCES = $(common_sources) check_oracle.c
check_oracle_CFLAGS =
check_oracle_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_postgres_SOURCES = $(common_sources) check_postgres.c
check_postgres_CFLAGS =
check_postgres_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_sybase_SOURCES = $(common_sources) check_sybase.c
check_sybase_CFLAGS =
check_sybase_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_freetds_SOURCES = $(common_sources) check_freetds.c
check_freetds_CFLAGS =
check_freetds_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_xbase_SOURCES = $(common_sources) check_xbase.c
check_xbase_CFLAGS =
check_xbase_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
check_ldap_SOURCES = $(common_sources) check_ldap.c
check_ldap_CFLAGS =
check_ldap_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
- $(top_builddir)/tests/libgda-test-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/tests/libgda-test-5.0.la \
$(LIBGDA_LIBS)
EXTRA_DIST = \
diff --git a/tests/value-holders/Makefile.am b/tests/value-holders/Makefile.am
index 3c6c1d0..05d7b17 100644
--- a/tests/value-holders/Makefile.am
+++ b/tests/value-holders/Makefile.am
@@ -13,17 +13,17 @@ common_sources = common.c common.h
check_holder_SOURCES = check_holder.c $(common_sources)
check_holder_LDADD = $(JSON_GLIB_LIBS) \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_set_SOURCES = check_set.c $(common_sources)
check_set_LDADD = $(JSON_GLIB_LIBS) \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
check_statement_SOURCES = check_statement.c $(common_sources)
check_statement_LDADD = $(JSON_GLIB_LIBS) \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
diff --git a/tools/.gitignore b/tools/.gitignore
index d1e24a3..09a88dd 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,6 +1,6 @@
-gda-sql-4*
-gda-list-config-4*
-gda-list-server-op-4*
+gda-sql-5*
+gda-list-config-5*
+gda-list-server-op-5*
information-schema-doc
information-schema-types
-gda-sql-4.*.1
+gda-sql-5.*.1
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4873813..ac4ea57 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,9 +5,9 @@ endif
SUBDIRS = $(BROWSER_DIR)
bin_PROGRAMS = \
- gda-list-config-4.0 \
- gda-sql-4.0 \
- gda-list-server-op-4.0
+ gda-list-config-5.0 \
+ gda-sql-5.0 \
+ gda-list-server-op-5.0
noinst_PROGRAMS = information-schema-doc information-schema-types
@@ -20,14 +20,14 @@ AM_CPPFLAGS = \
$(LIBGDA_CFLAGS) \
-DROOT_DIR=\""$(top_srcdir)"\"
-gda_list_config_4_0_SOURCES = \
+gda_list_config_5_0_SOURCES = \
gda-list-config.c
-gda_list_config_4_0_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+gda_list_config_5_0_LDADD = \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
-gda_sql_4_0_SOURCES = \
+gda_sql_5_0_SOURCES = \
gda-sql.c \
gda-sql.h \
gda-threader.h \
@@ -40,24 +40,24 @@ gda_sql_4_0_SOURCES = \
$(top_srcdir)/libgda/md5.h \
$(top_srcdir)/libgda/md5c.c
-gda_sql_4_0_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+gda_sql_5_0_LDADD = \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(READLINE_LIB) \
$(HISTORY_LIB)
if LIBSOUP
-gda_sql_4_0_SOURCES += web-server.h web-server.c html-doc.h html-doc.c
+gda_sql_5_0_SOURCES += web-server.h web-server.c html-doc.h html-doc.c
AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
-gda_sql_4_0_LDADD += $(LIBSOUP_LIBS)
+gda_sql_5_0_LDADD += $(LIBSOUP_LIBS)
endif
# setenv() is in libiberty in mingw
if PLATFORM_WIN32
-gda_sql_4_0_LDADD += -liberty
-gda_sql_4_0_SOURCES += gda-sql-res.rc
+gda_sql_5_0_LDADD += -liberty
+gda_sql_5_0_SOURCES += gda-sql-res.rc
endif
.rc.o:
@@ -66,11 +66,11 @@ endif
gda-sql-res.o: gda-sql-res.rc
$(WINDRES) $^ -o $@
-gda_list_server_op_4_0_SOURCES = \
+gda_list_server_op_5_0_SOURCES = \
gda-list-server-op.c
-gda_list_server_op_4_0_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+gda_list_server_op_5_0_LDADD = \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
@@ -78,17 +78,17 @@ information_schema_doc_SOURCES = \
information-schema-doc.c
information_schema_doc_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
information_schema_types_SOURCES = \
information-schema-types.c
information_schema_types_LDADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS)
-webdatadir = $(datadir)/libgda-4.0/web
+webdatadir = $(datadir)/libgda-5.0/web
webdata_DATA = \
cnc.js \
md5.js \
@@ -107,7 +107,7 @@ EXTRA_DIST = \
$(webdata_DATA)
mans = \
- gda-sql-4.0.1
+ gda-sql-5.0.1
man_MANS = \
$(mans)
@@ -144,9 +144,9 @@ install-exec-hook:
if DEFAULT_BINARY
cd $(DESTDIR)$(bindir) \
&& rm -f gda-list-config$(EXEEXT) gda-sql$(EXEEXT) gda-list-server-op$(EXEEXT) \
- && $(LN_S) gda-list-config-4.0$(EXEEXT) gda-list-config$(EXEEXT) \
- && $(LN_S) gda-sql-4.0$(EXEEXT) gda-sql$(EXEEXT) \
- && $(LN_S) gda-list-server-op-4.0$(EXEEXT) gda-list-server-op$(EXEEXT)
+ && $(LN_S) gda-list-config-5.0$(EXEEXT) gda-list-config$(EXEEXT) \
+ && $(LN_S) gda-sql-5.0$(EXEEXT) gda-sql$(EXEEXT) \
+ && $(LN_S) gda-list-server-op-5.0$(EXEEXT) gda-list-server-op$(EXEEXT)
endif
uninstall-local:
diff --git a/tools/browser/.gitignore b/tools/browser/.gitignore
index 51cb8a3..ce62655 100644
--- a/tools/browser/.gitignore
+++ b/tools/browser/.gitignore
@@ -1,5 +1,5 @@
-gda-browser-4.0
-gda-browser-4.*.desktop
+gda-browser-5.0
+gda-browser-5.*.desktop
canvas-example
marshal.c
marshal.h
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index d1f2ba0..ff254a5 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS=gda-browser-4.0
+bin_PROGRAMS=gda-browser-5.0
noinst_LTLIBRARIES = libbrowser.la
SUBDIRS = data common schema-browser query-exec data-manager dummy-perspective
@@ -72,14 +72,14 @@ libbrowser_la_SOURCES=\
browser-stock-icons.c \
browser-stock-icons.h
-gda_browser_4_0_SOURCES=\
+gda_browser_5_0_SOURCES=\
main.c
$(OBJECTS): marshal.c marshal.h
if PLATFORM_WIN32
EXTRALDFLAGS=-mwindows
-gda_browser_4_0_SOURCES += browser-res.rc
+gda_browser_5_0_SOURCES += browser-res.rc
else
EXTRALDFLAGS=
endif
@@ -94,23 +94,23 @@ endif
browser-res.o: browser-res.rc
$(WINDRES) $^ -o $@
-gda_browser_4_0_LDFLAGS = $(EXTRALDFLAGS)
-gda_browser_4_0_LDADD=\
+gda_browser_5_0_LDFLAGS = $(EXTRALDFLAGS)
+gda_browser_5_0_LDADD=\
schema-browser/libperspective.la \
query-exec/libperspective.la \
data-manager/libperspective.la \
libbrowser.la \
$(CANVAS_LDADD) \
common/libcommon.la \
- $(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 \
$(LIBGDA_LIBS) $(GTK_LIBS) $(GTKSOURCEVIEW_LIBS) $(MAC_INTEGRATION_LIBS)
@INTLTOOL_DESKTOP_RULE@
desktopdir=$(datadir)/applications
-Desktop_in_files = gda-browser-4.0.desktop.in
+Desktop_in_files = gda-browser-5.0.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
# canvas example
@@ -122,13 +122,13 @@ canvas_example_SOURCES = \
dnd.h
canvas_example_CFLAGS = -DCANVAS_EXAMPLE
canvas_example_LDFLAGS = \
- $(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 \
$(top_builddir)/tools/browser/canvas/libcanvas.la \
$(top_builddir)/tools/browser/common/libcommon.la
# icons
-iconsdir=$(datadir)/libgda-4.0/pixmaps
+iconsdir=$(datadir)/libgda-5.0/pixmaps
icons_DATA= \
gda-browser.png \
gda-browser-auth.png \
@@ -152,7 +152,7 @@ icons_DATA= \
# app icon
appiconsdir=$(datadir)/pixmaps
appicons_DATA= \
- gda-browser-4.0.png
+ gda-browser-5.0.png
EXTRA_DIST = \
marshal.list \
diff --git a/tools/browser/canvas/Makefile.am b/tools/browser/canvas/Makefile.am
index 48dc28c..31542a4 100644
--- a/tools/browser/canvas/Makefile.am
+++ b/tools/browser/canvas/Makefile.am
@@ -33,7 +33,7 @@ libcanvas_la_SOURCES = \
browser-canvas-utility.h
libcanvas_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(GTK_LIBS) \
$(GOOCANVAS_LIBS) \
diff --git a/tools/browser/common/Makefile.am b/tools/browser/common/Makefile.am
index d345d7d..673876a 100644
--- a/tools/browser/common/Makefile.am
+++ b/tools/browser/common/Makefile.am
@@ -29,11 +29,11 @@ libcommon_la_SOURCES = \
$(OBJECTS): marshal.c marshal.h
libcommon_la_LIBADD = \
- $(top_builddir)/libgda/libgda-4.0.la \
+ $(top_builddir)/libgda/libgda-5.0.la \
$(LIBGDA_LIBS) \
$(GTK_LIBS)
-xmldir=$(datadir)/libgda-4.0
+xmldir=$(datadir)/libgda-5.0
xml_DATA= \
import_encodings.xml
diff --git a/tools/browser/data/Makefile.am b/tools/browser/data/Makefile.am
index bea8cab..ae0df1f 100644
--- a/tools/browser/data/Makefile.am
+++ b/tools/browser/data/Makefile.am
@@ -45,12 +45,12 @@ update-icon-cache:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
for theme in $(public_icons_themes); do \
- $(gtk_update_icon_cache) $(datadir)/libgda-4.0/icons/$$theme; \
+ $(gtk_update_icon_cache) $(datadir)/libgda-5.0/icons/$$theme; \
done; \
else \
echo "*** Icon cache not updated. After (un)install, run this:"; \
for theme in $(public_icons_themes); do \
- echo "*** $(gtk_update_icon_cache) $(datadir)/libgda-4.0/icons/$$theme"; \
+ echo "*** $(gtk_update_icon_cache) $(datadir)/libgda-5.0/icons/$$theme"; \
done; \
fi
@@ -68,8 +68,8 @@ install-icons:
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
- mkdir -p $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
- $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ mkdir -p $(DESTDIR)$(datadir)/libgda-5.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/libgda-5.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done
uninstall-icons:
@@ -85,7 +85,7 @@ uninstall-icons:
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
- rm -f $(DESTDIR)$(datadir)/libgda-4.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ rm -f $(DESTDIR)$(datadir)/libgda-5.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done
install-data-local: install-icons update-icon-cache
diff --git a/tools/browser/doc/Makefile.am b/tools/browser/doc/Makefile.am
index a9d7ee7..fa1e350 100644
--- a/tools/browser/doc/Makefile.am
+++ b/tools/browser/doc/Makefile.am
@@ -41,8 +41,8 @@ GTKDOC_CFLAGS = -I$(top_srcdir) \
GTKDOC_LIBS = $(top_builddir)/tools/browser/data-manager/libperspective.la \
$(top_builddir)/tools/browser/libbrowser.la \
$(top_builddir)/tools/browser/common/libcommon.la \
- $(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 \
$(LIBGDA_LIBS) \
$(GTK_LIBS) \
$(GTKSOURCEVIEW_LIBS)
diff --git a/tools/browser/gda-browser-4.0.desktop.in b/tools/browser/gda-browser-5.0.desktop.in
similarity index 80%
rename from tools/browser/gda-browser-4.0.desktop.in
rename to tools/browser/gda-browser-5.0.desktop.in
index 8cee47b..1d996f1 100644
--- a/tools/browser/gda-browser-4.0.desktop.in
+++ b/tools/browser/gda-browser-5.0.desktop.in
@@ -1,8 +1,8 @@
[Desktop Entry]
_Name=Database browser
_Comment=Browse your database's contents
-Icon=gda-browser-4.0
-Exec=gda-browser-4.0
+Icon=gda-browser-5.0
+Exec=gda-browser-5.0
Terminal=false
Type=Application
Categories=GTK;Development;Database;
diff --git a/tools/browser/gda-browser-4.0.png b/tools/browser/gda-browser-5.0.png
similarity index 100%
rename from tools/browser/gda-browser-4.0.png
rename to tools/browser/gda-browser-5.0.png
diff --git a/tools/gda-list-server-op.c b/tools/gda-list-server-op.c
index e000ca8..9feef40 100644
--- a/tools/gda-list-server-op.c
+++ b/tools/gda-list-server-op.c
@@ -35,7 +35,7 @@ main (int argc, char **argv) {
g_option_context_free (context);
gda_init ();
- xml_dir = gda_gbr_get_file_path (GDA_DATA_DIR, "libgda-4.0", NULL);
+ xml_dir = gda_gbr_get_file_path (GDA_DATA_DIR, "libgda-5.0", NULL);
g_print (_("Using XML descriptions in %s\n"), xml_dir);
if (prov)
g_print ("For provider %s\n", prov);
diff --git a/tools/web-server.c b/tools/web-server.c
index fa1a2be..a381494 100644
--- a/tools/web-server.c
+++ b/tools/web-server.c
@@ -444,7 +444,7 @@ get_file (WebServer *server, SoupMessage *msg, const char *path, GError **error)
GMappedFile *mfile;
gchar *real_path;
- real_path = gda_gbr_get_file_path (GDA_DATA_DIR, "libgda-4.0", "web", path, NULL);
+ real_path = gda_gbr_get_file_path (GDA_DATA_DIR, "libgda-5.0", "web", path, NULL);
if (!real_path)
return FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
