[libgda] Moved to V6 building
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Moved to V6 building
- Date: Wed, 5 Feb 2014 20:58:19 +0000 (UTC)
commit 7a97b4fc3f3bb4e3f0dd942f06b6a23248f76a06
Author: Vivien Malerba <malerba gnome-db org>
Date: Wed Feb 5 21:44:01 2014 +0100
Moved to V6 building
configure.ac | 63 +-
control-center/.gitignore | 4 +-
control-center/Makefile.am | 18 +-
control-center/data/Makefile.am | 10 +-
...esktop.in => gda-control-center-6.0.desktop.in} | 2 +-
data/Makefile.am | 2 +-
doc/C/.gitignore | 34 +-
doc/C/Makefile.am | 10 +-
doc/C/gda-sql-manual.xml | 2 +-
doc/C/gettingstarted.xml | 2 +-
doc/C/howto.xml | 2 +-
doc/C/installation.xml | 10 +-
.../{libgda-5.0-docs.sgml => libgda-6.0-docs.sgml} | 32 +-
doc/C/packaging.xml | 82 +-
doc/C/packaging_ui.xml | 36 +-
doc/C/prov-notes.xml | 2 +-
doc/C/prov-writing-assembly.xml | 2 +-
doc/mallard/gda-vala/C/Makefile.am | 4 +-
doc/mallard/gobject-introspection/about-gi.page | 2 +-
installers/Windows/gda-browser-tmpl.nsi | 8 +-
installers/Windows/make-zip-setup.sh | 234 +-
.../icons/hicolor/index.theme | 0
libgda-5.0.pc.in => libgda-6.0.pc.in | 0
libgda-report-5.0.pc.in => libgda-report-6.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 | 10 +-
libgda-ui-5.0.pc.in => libgda-ui-6.0.pc.in | 4 +-
libgda-ui/.gitignore | 4 +-
.../{Gdaui-5.0.metadata => Gdaui-6.0.metadata} | 0
libgda-ui/Makefile.am | 38 +-
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-ui/glade/gdaui-catalog.xml | 2 +-
libgda-ui/{libgdaui-5.0.vapi => libgdaui-6.0.vapi} | 14 +-
libgda-xslt-5.0.pc.in => libgda-xslt-6.0.pc.in | 0
libgda-xslt/Makefile.am | 10 +-
libgda/.gitignore | 4 +-
libgda/Gda-5.0.gir |29121 --------------------
libgda/{Gda-5.0.metadata => Gda-6.0.metadata} | 0
libgda/Makefile.am | 52 +-
libgda/binreloc/Makefile.am | 4 +-
libgda/data/.gitignore | 4 +-
libgda/data/GdaData-5.0.gir | 1478 -
libgda/data/Makefile.am | 44 +-
.../{libgdadata-5.0.pc.in => libgdadata-6.0.pc.in} | 2 +-
libgda/gda-config.c | 2 +-
libgda/gda-connection.c | 6 +-
libgda/gda-holder.c | 2 +-
libgda/gda-init.c | 2 +-
libgda/gda-meta-struct.c | 2 +-
libgda/gda-server-provider-extra.c | 2 +-
libgda/handlers/Makefile.am | 4 +-
libgda/libgda-5.0.vapi | 2135 --
libgda/sql-parser/Makefile.am | 6 +-
libgda/sqlite/Makefile.am | 2 +-
libgda/sqlite/virtual/Makefile.am | 6 +-
...-virtual-5.0.pc.in => libgda-virtual-6.0.pc.in} | 0
libgda/thread-wrapper/Makefile.am | 4 +-
po/POTFILES.in | 4 +-
providers/bdb/Makefile.am | 10 +-
.../{libgda-bdb-5.0.pc.in => libgda-bdb-6.0.pc.in} | 0
providers/bdbsql/Makefile.am | 8 +-
...da-bdbsql-5.0.pc.in => libgda-bdbsql-6.0.pc.in} | 0
providers/firebird/Makefile.am | 10 +-
...irebird-5.0.pc.in => libgda-firebird-6.0.pc.in} | 0
providers/jdbc/.gitignore | 4 +-
providers/jdbc/Makefile.am | 20 +-
...libgda-jdbc-5.0.pc.in => libgda-jdbc-6.0.pc.in} | 0
providers/jdbc/libmain.c | 2 +-
providers/ldap/Makefile.am | 8 +-
...libgda-ldap-5.0.pc.in => libgda-ldap-6.0.pc.in} | 0
providers/mdb/Makefile.am | 10 +-
.../{libgda-mdb-5.0.pc.in => libgda-mdb-6.0.pc.in} | 0
providers/mysql/Makefile.am | 8 +-
...bgda-mysql-5.0.pc.in => libgda-mysql-6.0.pc.in} | 0
providers/oracle/Makefile.am | 8 +-
...da-oracle-5.0.pc.in => libgda-oracle-6.0.pc.in} | 0
providers/postgres/Makefile.am | 8 +-
...ostgres-5.0.pc.in => libgda-postgres-6.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-5.0.pc.in => libgda-capi-6.0.pc.in} | 0
providers/skel-implementation/models/Makefile.am | 10 +-
...da-models-5.0.pc.in => libgda-models-6.0.pc.in} | 0
providers/sqlcipher/Makefile.am | 8 +-
...cipher-5.0.pc.in => libgda-sqlcipher-6.0.pc.in} | 0
providers/sqlite/Makefile.am | 8 +-
...da-sqlite-5.0.pc.in => libgda-sqlite-6.0.pc.in} | 0
providers/web/Makefile.am | 10 +-
.../{libgda-web-5.0.pc.in => libgda-web-6.0.pc.in} | 0
samples/CustomUIPlugin/libmain.c | 2 +-
testing/Makefile.am | 42 +-
tests/Makefile.am | 34 +-
tests/data-models/Makefile.am | 22 +-
tests/meta-store/Makefile.am | 8 +-
tests/multi-threading/Makefile.am | 6 +-
tests/parser/Makefile.am | 14 +-
tests/providers/Makefile.am | 28 +-
tests/ui/Makefile.am | 8 +-
tests/vala/Makefile.am | 16 +-
tests/value-holders/Makefile.am | 6 +-
tools/.gitignore | 10 +-
tools/Makefile.am | 44 +-
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-5.0.desktop.in => gda-browser-6.0.desktop.in} | 4 +-
.../{gda-browser-5.0.png => gda-browser-6.0.png} | 0
tools/gda-list-server-op.c | 2 +-
tools/help/C/gda-sql-help.xml | 2 +-
tools/web-server.c | 2 +-
119 files changed, 642 insertions(+), 33385 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 201aeb9..3b385af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define(major, 5)
-m4_define(minor, 2)
-m4_define(micro, 2)
+m4_define(minor, 99)
+m4_define(micro, 0)
m4_define([gda_stable],
m4_if(m4_eval(minor % 2), [0], [yes], [no]))
AC_CONFIG_MACRO_DIR([m4])
@@ -31,7 +31,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, 5)
+AC_SUBST(GDA_ABI_MAJOR_VERSION, 6)
AC_SUBST(GDA_ABI_MINOR_VERSION, 0)
#AC_SUBST(GDA_MICRO_VERSION, micro)
LIBGDA_ABI_VERSION=$GDA_ABI_MAJOR_VERSION.$GDA_ABI_MINOR_VERSION
@@ -130,6 +130,7 @@ AC_SEARCH_LIBS([strerror],[cposix])
AC_PROG_CC
AC_PROG_CXX
AM_PROG_CC_C_O
+AM_PROG_AR
AC_HEADER_STDC
LT_PREREQ([2.2.6])
LT_INIT([disable-static])
@@ -940,10 +941,10 @@ AC_SUBST(COREDEPS_LIBS)
AC_CONFIG_FILES([
Makefile
libgda.spec
-libgda-5.0.pc
-libgda-ui-5.0.pc
-libgda-report-5.0.pc
-libgda-xslt-5.0.pc
+libgda-6.0.pc
+libgda-ui-6.0.pc
+libgda-report-6.0.pc
+libgda-xslt-6.0.pc
po/Makefile.in
libgda/Makefile
libgda/libgda.h
@@ -957,41 +958,41 @@ libgda/sqlite/virtual/libgda-virtual.h
libgda/sqlite/virtual/Makefile
libgda/thread-wrapper/Makefile
libgda/data/Makefile
-libgda/data/libgdadata-5.0.pc
+libgda/data/libgdadata-6.0.pc
providers/Makefile
providers/reuseable/Makefile
providers/reuseable/postgres/Makefile
providers/reuseable/mysql/Makefile
providers/bdb/Makefile
-providers/bdb/libgda-bdb-5.0.pc
+providers/bdb/libgda-bdb-6.0.pc
providers/bdbsql/Makefile
-providers/bdbsql/libgda-bdbsql-5.0.pc
+providers/bdbsql/libgda-bdbsql-6.0.pc
providers/mdb/Makefile
providers/mdb/libmdb-src/Makefile
-providers/mdb/libgda-mdb-5.0.pc
+providers/mdb/libgda-mdb-6.0.pc
providers/mysql/Makefile
-providers/mysql/libgda-mysql-5.0.pc
+providers/mysql/libgda-mysql-6.0.pc
providers/oracle/Makefile
-providers/oracle/libgda-oracle-5.0.pc
+providers/oracle/libgda-oracle-6.0.pc
providers/postgres/Makefile
-providers/postgres/libgda-postgres-5.0.pc
+providers/postgres/libgda-postgres-6.0.pc
providers/firebird/Makefile
-providers/firebird/libgda-firebird-5.0.pc
+providers/firebird/libgda-firebird-6.0.pc
providers/sqlite/Makefile
-providers/sqlite/libgda-sqlite-5.0.pc
+providers/sqlite/libgda-sqlite-6.0.pc
providers/jdbc/Makefile
-providers/jdbc/libgda-jdbc-5.0.pc
+providers/jdbc/libgda-jdbc-6.0.pc
providers/ldap/Makefile
-providers/ldap/libgda-ldap-5.0.pc
+providers/ldap/libgda-ldap-6.0.pc
providers/web/Makefile
-providers/web/libgda-web-5.0.pc
+providers/web/libgda-web-6.0.pc
providers/skel-implementation/Makefile
providers/skel-implementation/capi/Makefile
-providers/skel-implementation/capi/libgda-capi-5.0.pc
+providers/skel-implementation/capi/libgda-capi-6.0.pc
providers/skel-implementation/models/Makefile
-providers/skel-implementation/models/libgda-models-5.0.pc
+providers/skel-implementation/models/libgda-models-6.0.pc
providers/sqlcipher/Makefile
-providers/sqlcipher/libgda-sqlcipher-5.0.pc
+providers/sqlcipher/libgda-sqlcipher-6.0.pc
libgda-report/Makefile
libgda-report/engine/Makefile
libgda-report/DocBook/Makefile
@@ -1011,7 +1012,7 @@ libgda-ui/glade/Makefile
control-center/Makefile
control-center/data/Makefile
tools/Makefile
-tools/gda-sql-5.0.1:tools/gda-sql.1.in
+tools/gda-sql-6.0.1:tools/gda-sql.1.in
tools/cmdtool/Makefile
tools/help/Makefile
tools/help/C/Makefile
@@ -1057,17 +1058,17 @@ mv ${srcdir}/doc/C/version.xml.tmp ${srcdir}/doc/C/version.xml
cp doc/C/builddate.xml ${srcdir}/doc/C/builddate.xml.tmp
mv ${srcdir}/doc/C/builddate.xml.tmp ${srcdir}/doc/C/builddate.xml
-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 ${srcdir}/doc/C/libgda-sections.txt doc/C/libgda-6.0-sections.txt
+echo "" >> doc/C/libgda-6.0-sections.txt
+cat ${srcdir}/doc/C/libgda-ui-sections.txt >> doc/C/libgda-6.0-sections.txt
+cp doc/C/libgda-6.0-sections.txt ${srcdir}/doc/C/libgda-6.0-sections.txt.tmp
+mv ${srcdir}/doc/C/libgda-6.0-sections.txt.tmp ${srcdir}/doc/C/libgda-6.0-sections.txt
-cp doc/C/libgda.types doc/C/libgda-5.0.types
+cp doc/C/libgda.types doc/C/libgda-6.0.types
if test x$have_ui != xno
then
- echo "" >> doc/C/libgda-5.0.types
- cat ${srcdir}/doc/C/libgda-ui.types >> doc/C/libgda-5.0.types
+ echo "" >> doc/C/libgda-6.0.types
+ cat ${srcdir}/doc/C/libgda-ui.types >> doc/C/libgda-6.0.types
fi
diff --git a/control-center/.gitignore b/control-center/.gitignore
index e56ffcb..b170929 100644
--- a/control-center/.gitignore
+++ b/control-center/.gitignore
@@ -1,2 +1,2 @@
-gda-control-center-5.0
-gda-control-center-5.*.desktop
+gda-control-center-6.0
+gda-control-center-6.*.desktop
diff --git a/control-center/Makefile.am b/control-center/Makefile.am
index f688433..3227f36 100644
--- a/control-center/Makefile.am
+++ b/control-center/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS=gda-control-center-5.0
+bin_PROGRAMS=gda-control-center-6.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_5_0_SOURCES=\
+gda_control_center_6_0_SOURCES=\
gdaui-login-dialog.c \
gdaui-login-dialog.h \
gdaui-bar.c \
@@ -35,7 +35,7 @@ gda_control_center_5_0_SOURCES=\
if PLATFORM_WIN32
EXTRALDFLAGS=-mwindows
-gda_control_center_5_0_SOURCES += control-center-res.rc
+gda_control_center_6_0_SOURCES += control-center-res.rc
else
EXTRALDFLAGS=
endif
@@ -46,21 +46,21 @@ endif
control-center-res.o: control-center-res.rc
$(WINDRES) $^ -o $@
-gda_control_center_5_0_LDFLAGS = $(EXTRALDFLAGS)
-gda_control_center_5_0_LDADD=\
+gda_control_center_6_0_LDFLAGS = $(EXTRALDFLAGS)
+gda_control_center_6_0_LDADD=\
$(top_builddir)/libgda-ui/internal/libgda-ui-internal.la \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
$(COREDEPS_LIBS) $(GTK_LIBS)
@INTLTOOL_DESKTOP_RULE@
desktopdir=$(datadir)/applications
-Desktop_in_files = gda-control-center-5.0.desktop.in
+Desktop_in_files = gda-control-center-6.0.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
# icons
-iconsdir=$(datadir)/libgda-5.0/pixmaps
+iconsdir=$(datadir)/libgda-6.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 03fa362..0d13315 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-5.0/icons/$$theme; \
+ $(gtk_update_icon_cache) $(datadir)/libgda-6.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-5.0/icons/$$theme"; \
+ echo "*** $(gtk_update_icon_cache) $(datadir)/libgda-6.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-5.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
- $(INSTALL_DATA) $(srcdir)/$$icon
$(DESTDIR)$(datadir)/libgda-5.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ mkdir -p $(DESTDIR)$(datadir)/libgda-6.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon
$(DESTDIR)$(datadir)/libgda-6.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-5.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ rm -f $(DESTDIR)$(datadir)/libgda-6.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done
install-data-local: install-icons update-icon-cache
diff --git a/control-center/gda-control-center-5.0.desktop.in
b/control-center/gda-control-center-6.0.desktop.in
similarity index 88%
rename from control-center/gda-control-center-5.0.desktop.in
rename to control-center/gda-control-center-6.0.desktop.in
index 6fd5b58..52941d7 100644
--- a/control-center/gda-control-center-5.0.desktop.in
+++ b/control-center/gda-control-center-6.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-5.0
+Exec=gda-control-center-6.0
Terminal=false
Type=Application
Categories=Settings;DesktopSettings;
diff --git a/data/Makefile.am b/data/Makefile.am
index 5e63481..8ce05b9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
# Default global configuration file
-configdir = $(sysconfdir)/libgda-5.0
+configdir = $(sysconfdir)/libgda-6.0
config_DATA = config sales_test.db
EXTRA_DIST = \
diff --git a/doc/C/.gitignore b/doc/C/.gitignore
index 9038aa8..e73634c 100644
--- a/doc/C/.gitignore
+++ b/doc/C/.gitignore
@@ -2,32 +2,32 @@ html
xml
html-build.stamp
html.stamp
-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
+libgda-6.0-decl-list.txt
+libgda-6.0-decl.txt
+libgda-6.0-undocumented.txt
+libgda-6.0-unused.txt
+libgda-6.0.args
+libgda-6.0.hierarchy
+libgda-6.0.signals
scan-build.stamp
sgml-build.stamp
sgml.stamp
tmpl-build.stamp
tmpl.stamp
.libs
-libgda-5.0.prerequisites
-libgda-5.0-decl.txt.bak
-libgda-5.0.interfaces
-libgda-5.0-decl-list.txt.bak
+libgda-6.0.prerequisites
+libgda-6.0-decl.txt.bak
+libgda-6.0.interfaces
+libgda-6.0-decl-list.txt.bak
libgda.types
-libgda-5.0.types
-libgda-5.0-overrides.txt
-libgda-5.0-doc.pdf
+libgda-6.0.types
+libgda-6.0-overrides.txt
+libgda-6.0-doc.pdf
pdf-build.stamp
-libgda-5.0-undeclared.txt
-libgda-5.0-unused.sgml
+libgda-6.0-undeclared.txt
+libgda-6.0-unused.sgml
version.xml
builddate.xml
*.bak
-libgda-5.0-sections.txt
+libgda-6.0-sections.txt
setup-build.stamp
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index c619ae1..0320e7f 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-5.0
+DOC_MODULE=libgda-6.0
# The top-level SGML file.
DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -40,14 +40,14 @@ GTKDOC_CFLAGS = -I$(top_srcdir) \
$(COREDEPS_CFLAGS) \
-DGETTEXT_PACKAGE=\""$(GETTEXT_PACKAGE)"\"
-GTKDOC_LIBS = $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda-report/libgda-report-5.0.la \
+GTKDOC_LIBS = $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-report/libgda-report-6.0.la \
$(COREDEPS_LIBS)
if HAVE_UI
GTKDOC_CFLAGS += $(GTK_CFLAGS)
GTKDOC_LIBS += $(GTK_LIBS) \
- $(top_builddir)/libgda-ui/libgda-ui-5.0.la
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la
endif
# Extra options to supply to gtkdoc-mkdb
@@ -94,7 +94,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-5.0.types libgda-5.0-sections.txt
+DISTCLEANFILES = $(DOC_MODULE)-doc.pdf libgda-6.0.types libgda-6.0-sections.txt
DOC_STAMPS += pdf-build.stamp
CLEANFILES += $(DOC_STAMPS)
diff --git a/doc/C/gda-sql-manual.xml b/doc/C/gda-sql-manual.xml
index f17631d..aaabe31 100644
--- a/doc/C/gda-sql-manual.xml
+++ b/doc/C/gda-sql-manual.xml
@@ -107,7 +107,7 @@ DSN parameters | DB_NAME: Database name. The name of a database to connect to (s
CONNECT_TIMEOUT: Connection timeout. Maximum wait for connection, in seconds. Zero or not
specified means wait indefinitely. It is not
Authentication | USERNAME (string),
PASSWORD (string)
-File | /local/extra/lib/libgda-5.0/providers/libgda-postgres.so
+File | /local/extra/lib/libgda-6.0/providers/libgda-postgres.so
(5 rows)
</programlisting>
</para></listitem>
diff --git a/doc/C/gettingstarted.xml b/doc/C/gettingstarted.xml
index c41d768..3559356 100644
--- a/doc/C/gettingstarted.xml
+++ b/doc/C/gettingstarted.xml
@@ -58,7 +58,7 @@ main (int argc, char **argv)
<para>
&LIBGDA; allows data sources (DSN) to be defined and referred to by a unique name which contains all
the
required information to actually open a connection (except the name and password if they are required);
- see the <link linkend="libgda-5.0-Configuration">Configuration section</link> for more information
about
+ see the <link linkend="libgda-6.0-Configuration">Configuration section</link> for more information
about
how to manage data sources. Of
course it's still possible to open a connection without having defined a DSN, in which case a
<emphasis>connection
string</emphasis> is used to specify all the parameters required to open a connection. For more
information
diff --git a/doc/C/howto.xml b/doc/C/howto.xml
index 9f7f5d6..04fd841 100644
--- a/doc/C/howto.xml
+++ b/doc/C/howto.xml
@@ -41,7 +41,7 @@ else {
<sect1>
<title>Define a data source (DSN)</title>
<para>
- The <link linkend="libgda-5.0-Configuration">Configuration section</link> details how to manage data
sources
+ The <link linkend="libgda-6.0-Configuration">Configuration section</link> details how to manage data
sources
definitions. To define a data source, one needs to create and fill a
<link linkend="GdaDsnInfo">GdaDsnInfo</link> structure, and use the
<link linkend="gda-config-define-dsn">gda_config_define_dsn()</link> function.
diff --git a/doc/C/installation.xml b/doc/C/installation.xml
index e84075d..5f796f8 100644
--- a/doc/C/installation.xml
+++ b/doc/C/installation.xml
@@ -120,8 +120,8 @@
to use the <command>pkg-config</command> command.
</para>
<programlisting>
-<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
+<systemitem class="prompt">$ </systemitem>gcc -c full_example.c `pkg-config --cflags libgda-6.0`
+<systemitem class="prompt">$ </systemitem>gcc -o full_example `pkg-config --libs libgda-6.0` full_example.o
</programlisting>
<para>
or more simply:
@@ -187,8 +187,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-5.0</command> or
- <command>gda-sql-5.0 -L</command> commands will
+ must be compiled an installed: the <command>gda-list-config-6.0</command> or
+ <command>gda-sql-6.0 -L</command> commands will
show a list of the installed and configured database providers.
</para>
<para>
@@ -210,7 +210,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>gda-control-center-5.0</command> tool
+ file manually, it is possible to use the <command>gda-control-center-6.0</command> tool
(part of &LIBGDA;).
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-5.0-docs.sgml b/doc/C/libgda-6.0-docs.sgml
similarity index 98%
rename from doc/C/libgda-5.0-docs.sgml
rename to doc/C/libgda-6.0-docs.sgml
index da5d0fd..b38892f 100644
--- a/doc/C/libgda-5.0-docs.sgml
+++ b/doc/C/libgda-6.0-docs.sgml
@@ -13,10 +13,10 @@
<!ENTITY GDA "<acronym>GDA</acronym>">
<!ENTITY LDAP "<acronym>LDAP</acronym>">
<!ENTITY SQL "<acronym>SQL</acronym>">
-<!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-list-server-op "<command>gda-list-server-op-6.0</command>">
+<!ENTITY gda-list-config "<command>gda-list-config-6.0</command>">
<!ENTITY gda-sql "<command>gda-sql</command>">
-<!ENTITY gda-test-connection "<command>gda-test-connection-5.0</command>">
+<!ENTITY gda-test-connection "<command>gda-test-connection-6.0</command>">
<!ENTITY GdaVala '<emphasis><ulink url="gda-vala/index.html">Gda Vala Extensions</ulink></emphasis>'>
<!ENTITY GI '<emphasis><ulink url="http://live.gnome.org/GObjectIntrospection";>GObject
Introspection</ulink></emphasis>'>
]>
@@ -1214,7 +1214,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-5.0 pgsales PostgreSQL://DB_NAME=sales
+[prompt]> gda-sql-6.0 pgsales PostgreSQL://DB_NAME=sales
Welcome to the GDA SQL console, version 3.99.3
Type: .copyright to show usage and distribution terms
@@ -1240,7 +1240,7 @@ c1>
<para>
Here is another sample session showing how to use variables in statements:
<programlisting><![CDATA[
-[prompt]> gda-sql-5.0 -p SQLite -c "DB_DIR=.;DB_NAME=sales_test"
+[prompt]> gda-sql-6.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
@@ -1278,11 +1278,11 @@ c0> ]]>
<para>
An example output will be:
<programlisting>
-[prompt]> gda-list-config-5.0
+[prompt]> gda-list-config-6.0
=== Installed providers ===
Provider: SQLite
Description: Provider for SQLite databases
-Location: /usr/lib/libgda-5.0/providers/libgda-sqlite.so
+Location: /usr/lib/libgda-6.0/providers/libgda-sqlite.so
Data source's parameters (Name / Type / Description):
DB_NAME / gchararray / Database name
DB_DIR / gchararray / Directory
@@ -1290,7 +1290,7 @@ Data source's parameters (Name / Type / Description):
Provider: Berkeley-DB
Description: Provider for Berkeley databases
-Location: /usr/lib/libgda-5.0/providers/libgda-bdb.so
+Location: /usr/lib/libgda-6.0/providers/libgda-bdb.so
Data source's parameters (Name / Type / Description):
FILE / gchararray / Database file
DATABASE / gchararray / Database name
@@ -1330,8 +1330,8 @@ Data source: Sales
<para>
For example listing all the possible operations (for all the providers) is:
<programlisting>
-[prompt]> gda-list-server-op-5.0 -l
-Using XML descriptions in /usr/share/libgda-5.0
+[prompt]> gda-list-server-op-6.0 -l
+Using XML descriptions in /usr/share/libgda-6.0
Existing operation types:
CREATE_DB
DROP_DB
@@ -1346,8 +1346,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-5.0 -l -p SQLite
-Using XML descriptions in /usr/share/libgda-5.0
+[prompt]> gda-list-server-op-6.0 -l -p SQLite
+Using XML descriptions in /usr/share/libgda-6.0
For provider SQLite
Existing operation types for provider 'SQLite':
CREATE_DB
@@ -1361,8 +1361,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-5.0 -o DROP_COLUMN -p MySQL
-Using XML descriptions in /usr/share/libgda-5.0
+[prompt]> gda-list-server-op-6.0 -o DROP_COLUMN -p MySQL
+Using XML descriptions in /usr/share/libgda-6.0
For provider MySQL
Description for type: DROP_COLUMN
<?xml version="1.0"?>
@@ -1374,8 +1374,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-5.0 -o DROP_COLUMN
-Using XML descriptions in /usr/share/libgda-5.0
+[prompt]> gda-list-server-op-6.0 -o DROP_COLUMN
+Using XML descriptions in /usr/share/libgda-6.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 383a7bc..38d507b 100644
--- a/doc/C/packaging.xml
+++ b/doc/C/packaging.xml
@@ -67,21 +67,21 @@
| |-- trml2pdf.py
| `-- utils.py
|-- etc
-| `-- libgda-5.0
+| `-- libgda-6.0
| |-- config
| `-- sales_test.db
|-- lib
-| |-- 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
+| |-- libgda-6.0.so -> libgda-6.0.so.4.1.0
+| |-- libgda-6.0.so.4 -> libgda-6.0.so.4.1.0
+| |-- libgda-6.0.so.4.1.0
+| |-- libgda-report-6.0.so -> libgda-report-6.0.so.4.1.0
+| |-- libgda-report-6.0.so.4 -> libgda-report-6.0.so.4.1.0
+| |-- libgda-report-6.0.so.4.1.0
+| |-- libgda-xslt-6.0.so -> libgda-xslt-6.0.so.4.1.0
+| |-- libgda-xslt-6.0.so.4 -> libgda-xslt-6.0.so.4.1.0
+| |-- libgda-xslt-6.0.so.4.1.0
`-- share
- `-- libgda-5.0
+ `-- libgda-6.0
|-- dtd
| |-- libgda-array.dtd
| |-- libgda-paramlist.dtd
@@ -108,10 +108,10 @@
<programlisting>
|-- share
| `-- gir-1.0
-| `-- Gda-5.0.gir
+| `-- Gda-6.0.gir
`-- lib
`-- girepository-1.0
- `-- Gda-5.0.typelib
+ `-- Gda-6.0.typelib
</programlisting>
</para>
</sect1>
@@ -129,12 +129,12 @@
<programlisting>
.
`-- bin
- |-- 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
+ |-- gda-list-config -> gda-list-config-6.0
+ |-- gda-list-config-6.0
+ |-- gda-list-jdbc-providers-6.0
+ |-- gda-list-server-op -> gda-list-server-op-6.0
+ |-- gda-list-server-op-6.0
+ `-- gda-test-connection-6.0
</programlisting>
</para>
<para>
@@ -147,14 +147,14 @@
<programlisting>
.
|-- bin
-| `-- gda-sql-5.0
+| `-- gda-sql-6.0
`-- share
|-- gnome
| `-- help
| `-- gda-sql
| |-- C
| `[ยทยทยท]
- |-- libgda-5.0
+ |-- libgda-6.0
| `-- web
| |-- cnc.js
| |-- gda-print.css
@@ -167,8 +167,8 @@
| `-- mouseirb_2.js
`-- man
`-- man1
- |-- gda-sql-5.0.1
- `-- gda-sql.1 -> gda-sql-5.0.1
+ |-- gda-sql-6.0.1
+ `-- gda-sql.1 -> gda-sql-6.0.1
</programlisting>
</para>
<para>
@@ -194,13 +194,13 @@
<programlisting>
.
|-- lib
-| |-- libgda-5.0
+| |-- libgda-6.0
| | `-- providers
| | `-- libgda-postgres.so
| `-- pkgconfig
-| `-- libgda-postgres-5.0.pc
+| `-- libgda-postgres-6.0.pc
`-- share
- `-- libgda-5.0
+ `-- libgda-6.0
|-- postgres_specs_add_column.xml
|-- postgres_specs_create_db.xml
|-- postgres_specs_create_index.xml
@@ -237,14 +237,14 @@
<programlisting>
.
|-- lib
-| |-- libgda-5.0
+| |-- libgda-6.0
| | `-- providers
-| | |-- gdaprovider-5.0.jar
+| | |-- gdaprovider-6.0.jar
| | `-- libgda-jdbc.so
| `-- pkgconfig
-| `-- libgda-jdbc-5.0.pc
+| `-- libgda-jdbc-6.0.pc
`-- share
- `-- libgda-5.0
+ `-- libgda-6.0
|-- jdbc_specs_create_table.xml
`-- jdbc_specs_dsn.xml
</programlisting>
@@ -262,20 +262,20 @@
the static libraries.
<programlisting>
|-- include
-| `-- libgda-5.0
+| `-- libgda-6.0
| [... except the libgdaui/ directory ...]
`-- lib
- |-- 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
+ |-- libgda-6.0
+ |-- libgda-6.0.a
+ |-- libgda-6.0.la
+ |-- libgda-report-6.0.a
+ |-- libgda-report-6.0.la
+ |-- libgda-xslt-6.0.a
+ |-- libgda-xslt-6.0.la
`-- pkgconfig
- |-- libgda-5.0.pc
- |-- libgda-report-5.0.pc
- `-- libgda-xslt-5.0.pc
+ |-- libgda-6.0.pc
+ |-- libgda-report-6.0.pc
+ `-- libgda-xslt-6.0.pc
</programlisting>
</para>
</sect1>
diff --git a/doc/C/packaging_ui.xml b/doc/C/packaging_ui.xml
index 7081692..12f622d 100644
--- a/doc/C/packaging_ui.xml
+++ b/doc/C/packaging_ui.xml
@@ -58,7 +58,7 @@
<programlisting>
.
|-- lib
-| |-- libgda-5.0
+| |-- libgda-6.0
| | |-- plugins
| | | |-- gdaui-entry-filesel-spec.xml
| | | |-- gdaui-entry-password.xml
@@ -66,11 +66,11 @@
| | | |-- gdaui-entry-pict-spec_string.xml
| | | |-- gdaui-entry-text-spec.xml
| | | `-- libgdaui-plugins.so
-| |-- 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
+| |-- libgda-ui-6.0.so -> libgda-ui-6.0.so.4.1.0
+| |-- libgda-ui-6.0.so.4 -> libgda-ui-6.0.so.4.1.0
+| `-- libgda-ui-6.0.so.4.1.0
`-- share
- `-- libgda-5.0
+ `-- libgda-6.0
|-- language-specs
| `-- gda-sql.lang
|-- server_operation.glade
@@ -91,10 +91,10 @@
<programlisting>
|-- share
| `-- gir-1.0
-| `-- Gdaui-5.0.gir
+| `-- Gdaui-6.0.gir
`-- lib
`-- girepository-1.0
- `-- Gdaui-5.0.typelib
+ `-- Gdaui-6.0.typelib
</programlisting>
</para>
</sect1>
@@ -108,11 +108,11 @@
<programlisting>
.
|-- bin
-| `-- gda-control-center-5.0
+| `-- gda-control-center-6.0
`-- share
|-- applications
- | `-- gda-control-center-5.0.desktop
- |-- libgda-5.0
+ | `-- gda-control-center-6.0.desktop
+ |-- libgda-6.0
| `-- pixmaps
| `-- gdaui-generic.png
`-- pixmaps
@@ -130,10 +130,10 @@
<programlisting>
.
|-- bin
-| `-- gda-browser-5.0
+| `-- gda-browser-6.0
`-- share
|-- applications
- | `-- gda-browser-5.0.desktop
+ | `-- gda-browser-6.0.desktop
|-- gnome
| `-- help
| `-- gda-browser
@@ -156,18 +156,18 @@
<programlisting>
.
|-- bin
-| `-- gdaui-demo-5.0
+| `-- gdaui-demo-6.0
|-- include
-| `-- libgda-5.0
+| `-- libgda-6.0
| `-- libgdaui
| [...]
`-- lib
-| |-- libgdaui-5.0.a
-| |-- libgdaui-5.0.la
+| |-- libgda-ui-6.0.a
+| |-- libgda-ui-6.0.la
| `-- pkgconfig
-| `-- libgdaui-5.0.pc
+| `-- libgdaui-6.0.pc
`-- share
- `-- libgda-5.0
+ `-- libgda-6.0
`-- demo
[...]
</programlisting>
diff --git a/doc/C/prov-notes.xml b/doc/C/prov-notes.xml
index 8f0dd73..a9ceefe 100644
--- a/doc/C/prov-notes.xml
+++ b/doc/C/prov-notes.xml
@@ -258,7 +258,7 @@
<para>
To create an encrypted database, you can use the <application>gda-sql</application> and when prompted
enter the requested passphrase, as:
- <programlisting><![CDATA[prompt> gda-sql-5.0 "SQLCipher://DB_NAME=testcrypt"
+ <programlisting><![CDATA[prompt> gda-sql-6.0 "SQLCipher://DB_NAME=testcrypt"
Welcome to the GDA SQL console, version 5.1.0
Type: .copyright to show usage and distribution terms
diff --git a/doc/C/prov-writing-assembly.xml b/doc/C/prov-writing-assembly.xml
index cdb37c7..2a738b4 100644
--- a/doc/C/prov-writing-assembly.xml
+++ b/doc/C/prov-writing-assembly.xml
@@ -36,7 +36,7 @@
<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-5.0.pc.in</filename>: file to be used by
<command>pkg-config</command> to identify
+ <listitem><para><filename>libgda-capi-6.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/mallard/gda-vala/C/Makefile.am b/doc/mallard/gda-vala/C/Makefile.am
index d4c5dcf..c77a5f7 100644
--- a/doc/mallard/gda-vala/C/Makefile.am
+++ b/doc/mallard/gda-vala/C/Makefile.am
@@ -28,7 +28,7 @@ JS_FILES = C.css jquery.js jquery.syntax.js jquery.syntax.brush.clang.js jquery.
C.css jquery.js jquery.syntax.js jquery.syntax.brush.clang.js jquery.syntax.layout.yelp.js
jquery.syntax.core.js yelp.js yelp-note-tip.png: gda.vala.stamp
htmldocdir = \
- $(HTML_DIR)/libgda-5.0/gda-vala
+ $(HTML_DIR)/libgda-6.0/gda-vala
htmldoc_DATA = \
$(HELP_FILES:.page=.html) \
@@ -37,7 +37,7 @@ htmldoc_DATA = \
figures: htmldoc
figuresdir = \
- $(HTML_DIR)/libgda-5.0/gda-vala/figures
+ $(HTML_DIR)/libgda-6.0/gda-vala/figures
figures_DATA = \
$(HELP_MEDIA)
diff --git a/doc/mallard/gobject-introspection/about-gi.page b/doc/mallard/gobject-introspection/about-gi.page
index f35c7f9..a252158 100644
--- a/doc/mallard/gobject-introspection/about-gi.page
+++ b/doc/mallard/gobject-introspection/about-gi.page
@@ -33,7 +33,7 @@
</p>
<p>
The XML and binary file format are Gda-[MajorVersion]-0.gir and Gda-[MajorVersion]-0.typelib
respectively, where
- [MajorVersion] is set to current major version in GDA. For example Gda-5.0.gir, for GDA version 5.x series.
+ [MajorVersion] is set to current major version in GDA. For example Gda-6.0.gir, for GDA version 6.x series.
</p>
<note style="tip">
<p>
diff --git a/installers/Windows/gda-browser-tmpl.nsi b/installers/Windows/gda-browser-tmpl.nsi
index 10b2ee0..eabf27d 100644
--- a/installers/Windows/gda-browser-tmpl.nsi
+++ b/installers/Windows/gda-browser-tmpl.nsi
@@ -4,7 +4,7 @@
!define PRODUCT_NAME "GdaBrowser"
!define PRODUCT_PUBLISHER "Gnome-Db"
!define PRODUCT_WEB_SITE "http://www.gnome-db.org";
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\gda-browser-5.0.exe"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\gda-browser-6.0.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -57,7 +57,7 @@ SetCompressor lzma
; Instfiles page
!insertmacro MUI_PAGE_INSTFILES
; Finish page
-!define MUI_FINISHPAGE_RUN "$INSTDIR\bin\gda-browser-5.0.exe"
+!define MUI_FINISHPAGE_RUN "$INSTDIR\bin\gda-browser-6.0.exe"
!insertmacro MUI_PAGE_FINISH
; Uninstaller pages
@@ -93,10 +93,10 @@ SectionEnd
Section -Post
WriteUninstaller "$INSTDIR\uninst.exe"
- WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\bin\gda-browser-5.0.exe"
+ WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\bin\gda-browser-6.0.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon"
"$INSTDIR\bin\gda-browser-5.0.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon"
"$INSTDIR\bin\gda-browser-6.0.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
diff --git a/installers/Windows/make-zip-setup.sh b/installers/Windows/make-zip-setup.sh
index b8900cb..9e54cf9 100755
--- a/installers/Windows/make-zip-setup.sh
+++ b/installers/Windows/make-zip-setup.sh
@@ -18,7 +18,7 @@
if [ "$1" = "32" ]
then
- depend_path="/usr/i686-w64-mingw32/sys-root/mingw /usr/i686-pc-mingw32/sys-root/mingw /local/Win32.Fedora
/local/Win32Compiled /local/Win32/bdb /local/Win32/mysql /local/Win32/pgsql /local/Win32/ldap
/local/Win32/mdb /local/Win32/oracle"
+ depend_path="/usr/i686-w64-mingw32/sys-root/mingw /usr/i686-pc-mingw32/sys-root/mingw /local/Win32.Fedora
/local/Win32/graphviz /local/Win32/bdb /local/Win32/mysql /local/Win32/pgsql /local/Win32/ldap
/local/Win32/mdb /local/Win32/oracle"
prefix=/local/Win32/Libgda
else
if [ "$1" = "64" ]
@@ -124,7 +124,7 @@ function add_files_to_zip
then
cat $localtmpfile | sed -e "s,^,${tdir}/," >> $tmpfile
else
- echo "File not found, searched in $dir"
+ echo "File(s) not found, searched in $dir"
exit 1
fi
done
@@ -240,8 +240,8 @@ Section "GdaBrowser & Libgda" SEC01
SetOverwrite try
SectionIn 1 RO
CreateDirectory "\$SMPROGRAMS\GdaBrowser"
- CreateShortCut "\$SMPROGRAMS\GdaBrowser\GdaBrowser.lnk" "\$INSTDIR\bin\gda-browser-5.0.exe"
- CreateShortCut "\$DESKTOP\GdaBrowser.lnk" "\$INSTDIR\bin\gda-browser-5.0.exe"
+ CreateShortCut "\$SMPROGRAMS\GdaBrowser\GdaBrowser.lnk" "\$INSTDIR\bin\gda-browser-6.0.exe"
+ CreateShortCut "\$DESKTOP\GdaBrowser.lnk" "\$INSTDIR\bin\gda-browser-6.0.exe"
EOF
cat > prov_mysql.nsh <<EOF
@@ -326,7 +326,7 @@ EOF
#
# dependencies DLLs
#
-files=(libexpat-1.dll libgio-2.*.dll libglib-2.*.dll libgmodule-2.*.dll libgobject-2.*.dll
libgthread-2.*.dll libxml2*.dll libsoup-2.*.dll libgdk_pixbuf-2.*.dll libgdk-3-0.dll libgtk-3-0.dll
libatk-1.*.dll libpng*.dll libpango-1.*.dll libpangocairo-1.*.dll libpangoft2-1.*.dll libpangowin32-1.*.dll
libcairo-2.dll libcairo-gobject-2.dll libfontconfig-1.dll libgoocanvas-*.dll libcdt*.dll libcgraph*.dll
libgvc*.dll libpathplan*.dll libxdot*.dll libfreetype-6.dll libintl-8.dll libpixman-1-0.dll libjasper-1.dll
libjpeg*.dll libtiff*.dll libffi*.dll *readline*.dll iconv.dll libgraph*.dll libgtksourceview*.dll
libtermcap*.dll zlib1.dll)
+files=(libexpat-1.dll libgio-2.*.dll libglib-2.*.dll libgmodule-2.*.dll libgobject-2.*.dll
libgthread-2.*.dll libxml2*.dll libsoup-2.*.dll libgdk_pixbuf-2.*.dll libgdk-3-0.dll libgtk-3-0.dll
libatk-1.*.dll libpng*.dll libpango-1.*.dll libpangocairo-1.*.dll libpangoft2-1.*.dll libpangowin32-1.*.dll
libcairo-2.dll libcairo-gobject-2.dll libfontconfig-1.dll libgoocanvas-*.dll libcdt*.dll libcgraph*.dll
libgvc*.dll libpathplan*.dll libxdot*.dll libfreetype-6.dll libintl-8.dll libpixman-1-0.dll libjasper-1.dll
libjpeg*.dll libffi*.dll *readline*.dll iconv.dll libgraph*.dll libgtksourceview*.dll libtermcap*.dll
zlib1.dll libsqlite3-0.dll)
add_files_to_zip $archive_ext "${depend_path}" bin $files
add_found_files_to_nsh core bin
@@ -358,12 +358,12 @@ add_found_files_to_nsh prov_ldap bin
# Libgda's files
#
files=(information_schema.xml import_encodings.xml)
-add_files_to_zip $archive $prefix share/libgda-5.0 $files
-add_found_files_to_nsh core share/libgda-5.0
+add_files_to_zip $archive $prefix share/libgda-6.0 $files
+add_found_files_to_nsh core share/libgda-6.0
files=(gda-sql.lang)
-add_files_to_zip $archive $prefix share/libgda-5.0/language-specs $files
-add_found_files_to_nsh core share/libgda-5.0/language-specs
+add_files_to_zip $archive $prefix share/libgda-6.0/language-specs $files
+add_found_files_to_nsh core share/libgda-6.0/language-specs
add_all_files_to_zip $archive_ext "${depend_path}" share/gtksourceview-3.0/language-specs
add_found_files_to_nsh core share/gtksourceview-3.0/language-specs
@@ -373,114 +373,114 @@ add_files_to_zip $archive_ext "${depend_path}" share/glib-2.0/schemas $files
add_found_files_to_nsh core share/glib-2.0/schemas
files=(bdb_specs_dsn.xml)
-add_files_to_zip $archive $prefix share/libgda-5.0 $files
-add_found_files_to_nsh prov_bdb share/libgda-5.0
+add_files_to_zip $archive $prefix share/libgda-6.0 $files
+add_found_files_to_nsh prov_bdb share/libgda-6.0
files=(mdb_specs_dsn.xml)
-add_files_to_zip $archive $prefix share/libgda-5.0 $files
-add_found_files_to_nsh prov_mdb share/libgda-5.0
+add_files_to_zip $archive $prefix share/libgda-6.0 $files
+add_found_files_to_nsh prov_mdb share/libgda-6.0
files=(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)
-add_files_to_zip $archive $prefix share/libgda-5.0 $files
-add_found_files_to_nsh prov_mysql share/libgda-5.0
+add_files_to_zip $archive $prefix share/libgda-6.0 $files
+add_found_files_to_nsh prov_mysql share/libgda-6.0
files=(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)
-add_files_to_zip $archive $prefix share/libgda-5.0 $files
-add_found_files_to_nsh prov_postgresql share/libgda-5.0
+add_files_to_zip $archive $prefix share/libgda-6.0 $files
+add_found_files_to_nsh prov_postgresql share/libgda-6.0
files=(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)
-add_files_to_zip $archive $prefix share/libgda-5.0 $files
-add_found_files_to_nsh prov_sqlite share/libgda-5.0
+add_files_to_zip $archive $prefix share/libgda-6.0 $files
+add_found_files_to_nsh prov_sqlite share/libgda-6.0
files=(sqlcipher_specs_auth.xml sqlcipher_specs_add_column.xml sqlcipher_specs_create_db.xml
sqlcipher_specs_create_index.xml sqlcipher_specs_create_table.xml sqlcipher_specs_create_view.xml
sqlcipher_specs_drop_db.xml sqlcipher_specs_drop_index.xml sqlcipher_specs_drop_table.xml
sqlcipher_specs_drop_view.xml sqlcipher_specs_dsn.xml sqlcipher_specs_rename_table.xml)
-add_files_to_zip $archive $prefix share/libgda-5.0 $files
-add_found_files_to_nsh prov_sqlcipher share/libgda-5.0
+add_files_to_zip $archive $prefix share/libgda-6.0 $files
+add_found_files_to_nsh prov_sqlcipher share/libgda-6.0
files=(web_specs_auth.xml web_specs_dsn.xml)
-add_files_to_zip $archive $prefix share/libgda-5.0 $files
-add_found_files_to_nsh prov_web share/libgda-5.0
+add_files_to_zip $archive $prefix share/libgda-6.0 $files
+add_found_files_to_nsh prov_web share/libgda-6.0
files=(oracle_specs_dsn.xml oracle_specs_create_table.xml)
-add_files_to_zip $archive $prefix share/libgda-5.0 $files
-add_found_files_to_nsh prov_oracle share/libgda-5.0
+add_files_to_zip $archive $prefix share/libgda-6.0 $files
+add_found_files_to_nsh prov_oracle share/libgda-6.0
files=(ldap_specs_auth.xml ldap_specs_dsn.xml)
-add_files_to_zip $archive $prefix share/libgda-5.0 $files
-add_found_files_to_nsh prov_ldap share/libgda-5.0
+add_files_to_zip $archive $prefix share/libgda-6.0 $files
+add_found_files_to_nsh prov_ldap share/libgda-6.0
files=(gdaui-generic.png)
-add_files_to_zip $archive $prefix share/libgda-5.0/pixmaps $files
-add_found_files_to_nsh core share/libgda-5.0/pixmaps
+add_files_to_zip $archive $prefix share/libgda-6.0/pixmaps $files
+add_found_files_to_nsh core share/libgda-6.0/pixmaps
#
#copy some Gnome files to be installed on Windows
#
-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_found_files_to_nsh core share/libgda-5.0/pixmaps
-add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/16x16/actions
-add_found_files_to_nsh core share/libgda-5.0/icons/hicolor/16x16/actions
-add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/22x22/actions
-add_found_files_to_nsh core share/libgda-5.0/icons/hicolor/22x22/actions
-add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/24x24/actions
-add_found_files_to_nsh core share/libgda-5.0/icons/hicolor/24x24/actions
-add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/32x32/actions
-add_found_files_to_nsh core share/libgda-5.0/icons/hicolor/32x32/actions
-add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/scalable/actions
-add_found_files_to_nsh core share/libgda-5.0/icons/hicolor/scalable/actions
-add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/16x16/apps
-add_found_files_to_nsh core share/libgda-5.0/icons/hicolor/16x16/apps
-add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/22x22/apps
-add_found_files_to_nsh core share/libgda-5.0/icons/hicolor/22x22/apps
-add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/24x24/apps
-add_found_files_to_nsh core share/libgda-5.0/icons/hicolor/24x24/apps
-add_all_files_to_zip $archive $prefix share/libgda-5.0/icons/hicolor/32x32/apps
-add_found_files_to_nsh core share/libgda-5.0/icons/hicolor/32x32/apps
+cp /usr/share/icons/gnome/16x16/actions/bookmark-new.png $prefix/share/libgda-6.0/icons/hicolor/16x16/actions
+cp /usr/share/icons/gnome/22x22/actions/bookmark-new.png $prefix/share/libgda-6.0/icons/hicolor/22x22/actions
+cp /usr/share/icons/gnome/24x24/actions/bookmark-new.png $prefix/share/libgda-6.0/icons/hicolor/24x24/actions
+cp /usr/share/icons/gnome/32x32/actions/bookmark-new.png $prefix/share/libgda-6.0/icons/hicolor/32x32/actions
+cp /usr/share/icons/gnome/16x16/actions/window-new.png $prefix/share/libgda-6.0/icons/hicolor/16x16/actions
+cp /usr/share/icons/gnome/22x22/actions/window-new.png $prefix/share/libgda-6.0/icons/hicolor/22x22/actions
+cp /usr/share/icons/gnome/24x24/actions/window-new.png $prefix/share/libgda-6.0/icons/hicolor/24x24/actions
+cp /usr/share/icons/gnome/32x32/actions/window-new.png $prefix/share/libgda-6.0/icons/hicolor/32x32/actions
+mkdir -p $prefix/share/libgda-6.0/icons/hicolor/16x16/apps
+mkdir -p $prefix/share/libgda-6.0/icons/hicolor/22x22/apps
+mkdir -p $prefix/share/libgda-6.0/icons/hicolor/24x24/apps
+mkdir -p $prefix/share/libgda-6.0/icons/hicolor/32x32/apps
+cp /usr/share/icons/gnome/16x16/apps/accessories-text-editor.png
$prefix/share/libgda-6.0/icons/hicolor/16x16/apps
+cp /usr/share/icons/gnome/22x22/apps/accessories-text-editor.png
$prefix/share/libgda-6.0/icons/hicolor/22x22/apps
+cp /usr/share/icons/gnome/24x24/apps/accessories-text-editor.png
$prefix/share/libgda-6.0/icons/hicolor/24x24/apps
+cp /usr/share/icons/gnome/32x32/apps/accessories-text-editor.png
$prefix/share/libgda-6.0/icons/hicolor/32x32/apps
+
+add_all_files_to_zip $archive $prefix share/libgda-6.0/pixmaps
+add_found_files_to_nsh core share/libgda-6.0/pixmaps
+add_all_files_to_zip $archive $prefix share/libgda-6.0/icons/hicolor/16x16/actions
+add_found_files_to_nsh core share/libgda-6.0/icons/hicolor/16x16/actions
+add_all_files_to_zip $archive $prefix share/libgda-6.0/icons/hicolor/22x22/actions
+add_found_files_to_nsh core share/libgda-6.0/icons/hicolor/22x22/actions
+add_all_files_to_zip $archive $prefix share/libgda-6.0/icons/hicolor/24x24/actions
+add_found_files_to_nsh core share/libgda-6.0/icons/hicolor/24x24/actions
+add_all_files_to_zip $archive $prefix share/libgda-6.0/icons/hicolor/32x32/actions
+add_found_files_to_nsh core share/libgda-6.0/icons/hicolor/32x32/actions
+add_all_files_to_zip $archive $prefix share/libgda-6.0/icons/hicolor/scalable/actions
+add_found_files_to_nsh core share/libgda-6.0/icons/hicolor/scalable/actions
+add_all_files_to_zip $archive $prefix share/libgda-6.0/icons/hicolor/16x16/apps
+add_found_files_to_nsh core share/libgda-6.0/icons/hicolor/16x16/apps
+add_all_files_to_zip $archive $prefix share/libgda-6.0/icons/hicolor/22x22/apps
+add_found_files_to_nsh core share/libgda-6.0/icons/hicolor/22x22/apps
+add_all_files_to_zip $archive $prefix share/libgda-6.0/icons/hicolor/24x24/apps
+add_found_files_to_nsh core share/libgda-6.0/icons/hicolor/24x24/apps
+add_all_files_to_zip $archive $prefix share/libgda-6.0/icons/hicolor/32x32/apps
+add_found_files_to_nsh core share/libgda-6.0/icons/hicolor/32x32/apps
files=(index.theme)
-add_files_to_zip $archive . share/libgda-5.0/icons/hicolor $files
-add_found_files_to_nsh core share/libgda-5.0/icons/hicolor
+add_files_to_zip $archive . share/libgda-6.0/icons/hicolor $files
+add_found_files_to_nsh core share/libgda-6.0/icons/hicolor
-files=(gda-browser-5.0.png)
+files=(gda-browser-6.0.png)
add_files_to_zip $archive $prefix share/pixmaps $files
add_found_files_to_nsh core share/pixmaps
files=(gda-control-center.png)
-add_files_to_zip $archive $prefix share/libgda-5.0/pixmaps $files
-add_found_files_to_nsh core share/libgda-5.0/pixmaps
+add_files_to_zip $archive $prefix share/libgda-6.0/pixmaps $files
+add_found_files_to_nsh core share/libgda-6.0/pixmaps
files=(gdaui-entry-number.xml gdaui-entry-string.xml)
-add_files_to_zip $archive $prefix share/libgda-5.0/ui $files
-add_found_files_to_nsh core share/libgda-5.0/ui
+add_files_to_zip $archive $prefix share/libgda-6.0/ui $files
+add_found_files_to_nsh core share/libgda-6.0/ui
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-5.0/web $files
-add_found_files_to_nsh core share/libgda-5.0/web
+add_files_to_zip $archive $prefix share/libgda-6.0/web $files
+add_found_files_to_nsh core share/libgda-6.0/web
files=(libgda-paramlist.dtd libgda-array.dtd libgda-server-operation.dtd gdaui-layout.dtd)
-add_files_to_zip $archive $prefix share/libgda-5.0/dtd $files
-add_found_files_to_nsh core share/libgda-5.0/dtd
+add_files_to_zip $archive $prefix share/libgda-6.0/dtd $files
+add_found_files_to_nsh core share/libgda-6.0/dtd
files=(config sales_test.db)
-add_files_to_zip $archive $prefix etc/libgda-5.0 $files
-add_found_files_to_nsh core etc/libgda-5.0
+add_files_to_zip $archive $prefix etc/libgda-6.0 $files
+add_found_files_to_nsh core etc/libgda-6.0
files=(gtk.immodules)
add_files_to_zip $archive_ext "${depend_path}" etc/gtk-3.0 $files
@@ -505,91 +505,91 @@ files=(pango-*.dll)
add_files_to_zip $archive_ext "${depend_path}" lib/pango/1.8.0/modules $files
add_found_files_to_nsh core lib/pango/1.8.0/modules
-files=(gda-sql-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)
+files=(gda-sql-6.0.exe libgda-6.0-4.dll libgda-report-6.0-4.dll libgda-ui-6.0-4.dll gda-browser-6.0.exe
gda-control-center-6.0.exe)
add_files_to_zip $archive $prefix bin $files
add_found_files_to_nsh core bin
-add_all_files_to_zip $archive $prefix share/gnome/help/gda-sql/C
+add_all_files_to_zip $archive $prefix share/libgda-6.0/gda-sql/help/C
-files=(gda-test-connection-5.0.exe)
+files=(gda-test-connection-6.0.exe)
add_files_to_zip $archive $prefix bin $files
files=(gspawn-win32-helper.exe)
add_files_to_zip $archive "${depend_path}" bin $files
add_found_files_to_nsh core bin
-files=(gdaui-demo-5.0.exe)
+files=(gdaui-demo-6.0.exe)
add_files_to_zip $archive_dev $prefix bin $files
files=(libgda-bdb.dll)
-add_files_to_zip $archive $prefix lib/libgda-5.0/providers $files
-add_found_files_to_nsh prov_bdb lib/libgda-5.0/providers
+add_files_to_zip $archive $prefix lib/libgda-6.0/providers $files
+add_found_files_to_nsh prov_bdb lib/libgda-6.0/providers
files=(libgda-mdb.dll)
-add_files_to_zip $archive $prefix lib/libgda-5.0/providers $files
-add_found_files_to_nsh prov_mdb lib/libgda-5.0/providers
+add_files_to_zip $archive $prefix lib/libgda-6.0/providers $files
+add_found_files_to_nsh prov_mdb lib/libgda-6.0/providers
files=(libgda-mysql.dll)
-add_files_to_zip $archive $prefix lib/libgda-5.0/providers $files
-add_found_files_to_nsh prov_mysql lib/libgda-5.0/providers
+add_files_to_zip $archive $prefix lib/libgda-6.0/providers $files
+add_found_files_to_nsh prov_mysql lib/libgda-6.0/providers
files=(libgda-postgres.dll)
-add_files_to_zip $archive $prefix lib/libgda-5.0/providers $files
-add_found_files_to_nsh prov_postgresql lib/libgda-5.0/providers
+add_files_to_zip $archive $prefix lib/libgda-6.0/providers $files
+add_found_files_to_nsh prov_postgresql lib/libgda-6.0/providers
files=(libgda-sqlite.dll)
-add_files_to_zip $archive $prefix lib/libgda-5.0/providers $files
-add_found_files_to_nsh prov_sqlite lib/libgda-5.0/providers
+add_files_to_zip $archive $prefix lib/libgda-6.0/providers $files
+add_found_files_to_nsh prov_sqlite lib/libgda-6.0/providers
files=(libgda-sqlcipher.dll)
-add_files_to_zip $archive $prefix lib/libgda-5.0/providers $files
-add_found_files_to_nsh prov_sqlcipher lib/libgda-5.0/providers
+add_files_to_zip $archive $prefix lib/libgda-6.0/providers $files
+add_found_files_to_nsh prov_sqlcipher lib/libgda-6.0/providers
files=(libgda-web.dll)
-add_files_to_zip $archive $prefix lib/libgda-5.0/providers $files
-add_found_files_to_nsh prov_web lib/libgda-5.0/providers
+add_files_to_zip $archive $prefix lib/libgda-6.0/providers $files
+add_found_files_to_nsh prov_web lib/libgda-6.0/providers
files=(libgda-ldap.dll)
-add_files_to_zip $archive $prefix lib/libgda-5.0/providers $files
-add_found_files_to_nsh prov_ldap lib/libgda-5.0/providers
+add_files_to_zip $archive $prefix lib/libgda-6.0/providers $files
+add_found_files_to_nsh prov_ldap lib/libgda-6.0/providers
files=(libgda-oracle.dll)
-add_files_to_zip $archive $prefix lib/libgda-5.0/providers $files
-add_found_files_to_nsh prov_oracle lib/libgda-5.0/providers
+add_files_to_zip $archive $prefix lib/libgda-6.0/providers $files
+add_found_files_to_nsh prov_oracle lib/libgda-6.0/providers
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-5.0/plugins $files
-add_found_files_to_nsh core lib/libgda-5.0/plugins
+add_files_to_zip $archive $prefix lib/libgda-6.0/plugins $files
+add_found_files_to_nsh core lib/libgda-6.0/plugins
#
# 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-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 libgda-global-variables.h gda-repetitive-statement.h gda-sql-builder.h g
da-tree.h gda-tree-manager.h gda-tree-mgr-columns.h gda-tree-mgr-label.h gda-tree-mgr-schemas.h
gda-tree-mgr-select.h gda-tree-mgr-tables.h gda-tree-node.h gda-tree-mgr-ldap.h gda-data-model-ldap.h)
-add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda $files
+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-decl.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 libgda-global-variables.h gda-repetitive-statement.h gda-sql-builder.h gda-tree.h gda-tree-
manager.h gda-tree-mgr-columns.h gda-tree-mgr-label.h gda-tree-mgr-schemas.h gda-tree-mgr-select.h
gda-tree-mgr-tables.h gda-tree-node.h gda-tree-mgr-ldap.h gda-data-model-ldap.h)
+add_files_to_zip $archive_dev $prefix include/libgda-6.0/libgda $files
files=(gda-sqlite-provider.h)
-add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda/sqlite $files
+add_files_to_zip $archive_dev $prefix include/libgda-6.0/libgda/sqlite $files
-files=(gda-thread-wrapper.h)
-add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda/thread-wrapper $files
+files=(gda-worker.h gda-connect.h)
+add_files_to_zip $archive_dev $prefix include/libgda-6.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-5.0/libgda/handlers $files
+add_files_to_zip $archive_dev $prefix include/libgda-6.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-5.0/libgda-report $files
+add_files_to_zip $archive_dev $prefix include/libgda-6.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-5.0/libgda/providers-support $files
+add_files_to_zip $archive_dev $prefix include/libgda-6.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-5.0/libgda/sql-parser $files
+add_files_to_zip $archive_dev $prefix include/libgda-6.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-5.0/libgda/virtual $files
+add_files_to_zip $archive_dev $prefix include/libgda-6.0/libgda/virtual $files
files=(gdaui-basic-form.h gdaui-data-entry.h gdaui-data-selector.h gdaui-enums.h gdaui-login.h
gdaui-raw-grid.h gdaui-cloud.h gdaui-data-filter.h gdaui-data-store.h gdaui-enum-types.h gdaui-plugin.h
gdaui-server-operation.h gdaui-combo.h gdaui-data-proxy.h gdaui-decl.h gdaui-form.h gdaui-provider-selector.h
gdaui-tree-store.h gdaui-data-cell-renderer-util.h gdaui-data-proxy-info.h gdaui-easy.h gdaui-grid.h
gdaui-raw-form.h gdaui-rt-editor.h libgda-ui.h)
-add_files_to_zip $archive_dev $prefix include/libgda-5.0/libgda-ui $files
+add_files_to_zip $archive_dev $prefix include/libgda-6.0/libgda-ui $files
#
# PC files
@@ -599,19 +599,19 @@ add_all_files_to_zip $archive_dev $prefix lib/pkgconfig
#
# static libs
#
-files=(libgda-5.0.dll.a libgda-5.0.lib libgda-5.0.def libgda-report-5.0.dll.a libgda-report-5.0.lib
libgda-report-5.0.def libgda-ui-5.0.dll.a libgda-ui-5.0.lib libgda-ui-5.0.def)
+files=(libgda-6.0.dll.a libgda-6.0.lib libgda-6.0.def libgda-report-6.0.dll.a libgda-report-6.0.lib
libgda-report-6.0.def libgda-ui-6.0.dll.a libgda-ui-6.0.lib libgda-ui-6.0.def)
add_files_to_zip $archive_dev $prefix lib $files
#
# demo
#
files=(basic_form.c cloud.c combo.c custom_layout.xml data_model_dir.c ddl_queries.c demo_db.db 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 provider_sel.c tree.c)
-add_files_to_zip $archive_dev $prefix share/libgda-5.0/demo $files
+add_files_to_zip $archive_dev $prefix share/libgda-6.0/demo $files
#
# doc
#
-#add_all_files_to_zip $archive_dev $prefix share/gtk-doc/html/libgda-5.0
+#add_all_files_to_zip $archive_dev $prefix share/gtk-doc/html/libgda-6.0
#
# translations
diff --git a/installers/Windows/share/libgda-5.0/icons/hicolor/index.theme
b/installers/Windows/share/libgda-6.0/icons/hicolor/index.theme
similarity index 100%
rename from installers/Windows/share/libgda-5.0/icons/hicolor/index.theme
rename to installers/Windows/share/libgda-6.0/icons/hicolor/index.theme
diff --git a/libgda-5.0.pc.in b/libgda-6.0.pc.in
similarity index 100%
rename from libgda-5.0.pc.in
rename to libgda-6.0.pc.in
diff --git a/libgda-report-5.0.pc.in b/libgda-report-6.0.pc.in
similarity index 100%
rename from libgda-report-5.0.pc.in
rename to libgda-report-6.0.pc.in
diff --git a/libgda-report/DocBook/Makefile.am b/libgda-report/DocBook/Makefile.am
index fb7c174..7db4b9f 100644
--- a/libgda-report/DocBook/Makefile.am
+++ b/libgda-report/DocBook/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda-report-docbook-5.0.la
+noinst_LTLIBRARIES = libgda-report-docbook-6.0.la
AM_CPPFLAGS = \
-I$(top_builddir)/libgda-report \
@@ -12,12 +12,12 @@ AM_CPPFLAGS = \
gda_report_headers = \
gda-report-docbook-document.h
-libgda_report_docbook_5_0_la_SOURCES = \
+libgda_report_docbook_6_0_la_SOURCES = \
$(gda_report_headers) \
gda-report-docbook-document.c
-libgda_report_docbook_5_0_la_LIBADD = $(COREDEPS_LIBS) \
- $(top_builddir)/libgda/libgda-5.0.la
+libgda_report_docbook_6_0_la_LIBADD = $(COREDEPS_LIBS) \
+ $(top_builddir)/libgda/libgda-6.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 74fdef5..64570bd 100644
--- a/libgda-report/Makefile.am
+++ b/libgda-report/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgda-report-5.0.la
+lib_LTLIBRARIES = libgda-report-6.0.la
SUBDIRS = engine DocBook RML
@@ -14,22 +14,22 @@ AM_CPPFLAGS = \
report_headers = \
gda-report-document.h
-libgda_report_5_0_la_SOURCES = \
+libgda_report_6_0_la_SOURCES = \
$(report_headers) \
gda-report-document-private.h \
gda-report-document.c
-libgda_report_5_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
+libgda_report_6_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
$(NO_UNDEFINED) $(LIBTOOL_EXPORT_OPTIONS)
-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_report_6_0_la_LIBADD = engine/libgda-report-engine-6.0.la \
+ DocBook/libgda-report-docbook-6.0.la \
+ RML/libgda-report-rml-6.0.la \
$(COREDEPS_LIBS) \
$(GDKPIXBUF_LIBS)
if PLATFORM_WIN32
-libgda_report_5_0_la_LDFLAGS += -export-symbols $(builddir)/libgda-report.def
-libgda_report_5_0_la_DEPENDENCIES = libgda-report.def
+libgda_report_6_0_la_LDFLAGS += -export-symbols $(builddir)/libgda-report.def
+libgda_report_6_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 21f9ece..a87be2b 100644
--- a/libgda-report/RML/Makefile.am
+++ b/libgda-report/RML/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda-report-rml-5.0.la
+noinst_LTLIBRARIES = libgda-report-rml-6.0.la
SUBDIRS = trml2html trml2pdf
@@ -14,12 +14,12 @@ AM_CPPFLAGS = \
gda_report_headers = \
gda-report-rml-document.h
-libgda_report_rml_5_0_la_SOURCES = \
+libgda_report_rml_6_0_la_SOURCES = \
$(gda_report_headers) \
gda-report-rml-document.c
-libgda_report_rml_5_0_la_LIBADD = $(COREDEPS_LIBS) \
- $(top_builddir)/libgda/libgda-5.0.la
+libgda_report_rml_6_0_la_LIBADD = $(COREDEPS_LIBS) \
+ $(top_builddir)/libgda/libgda-6.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 8db8588..66e3c6f 100644
--- a/libgda-report/engine/Makefile.am
+++ b/libgda-report/engine/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda-report-engine-5.0.la
+noinst_LTLIBRARIES = libgda-report-engine-6.0.la
noinst_PROGRAMS = test-rt-parser
AM_CPPFLAGS = \
@@ -16,19 +16,19 @@ AM_CPPFLAGS = \
gda_report_headers = \
gda-report-engine.h
-libgda_report_engine_5_0_la_SOURCES = \
+libgda_report_engine_6_0_la_SOURCES = \
$(gda_report_headers) \
rt-parser.h \
rt-parser.c \
gda-report-engine.c
-libgda_report_engine_5_0_la_LIBADD = $(COREDEPS_LIBS) \
- $(top_builddir)/libgda/libgda-5.0.la
+libgda_report_engine_6_0_la_LIBADD = $(COREDEPS_LIBS) \
+ $(top_builddir)/libgda/libgda-6.0.la
test_rt_parser_SOURCES = \
test-rt-parser.c
-test_rt_parser_LDADD = libgda-report-engine-5.0.la $(GDKPIXBUF_LIBS)
+test_rt_parser_LDADD = libgda-report-engine-6.0.la $(GDKPIXBUF_LIBS)
gdareportincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-report
gdareportinclude_HEADERS=$(gda_report_headers)
diff --git a/libgda-ui-5.0.pc.in b/libgda-ui-6.0.pc.in
similarity index 85%
rename from libgda-ui-5.0.pc.in
rename to libgda-ui-6.0.pc.in
index a321dad..c9ed419 100644
--- a/libgda-ui-5.0.pc.in
+++ b/libgda-ui-6.0.pc.in
@@ -2,12 +2,12 @@ prefix= prefix@
exec_prefix= exec_prefix@
libdir= libdir@
includedir= includedir@
-pluginsdir= libdir@/libgda-5.0/plugins
+pluginsdir= libdir@/libgda-6.0/plugins
Name: libgda- GDA_ABI_MAJOR_VERSION@ GDA_ABI_MINOR_VERSION@
Description: GDA (GNOME Data Access) library, UI extension
-Requires: libgda-5.0 gtk+-3.0
+Requires: libgda-6.0 gtk+-3.0
Version: @VERSION@
Libs: -L${libdir} -lgda-ui- GDA_ABI_MAJOR_VERSION@ GDA_ABI_MINOR_VERSION@
Cflags: -I${includedir}/libgda- GDA_ABI_MAJOR_VERSION@ GDA_ABI_MINOR_VERSION@ @GDA_DEBUG_FLAGS@
diff --git a/libgda-ui/.gitignore b/libgda-ui/.gitignore
index f2a37e4..1cbcd8e 100644
--- a/libgda-ui/.gitignore
+++ b/libgda-ui/.gitignore
@@ -5,7 +5,7 @@ s-enum-types-h
gdaui-enum-types.c
gdaui-enum-types.h
libgdaui.def
-Gdaui-5.0.gir
-Gdaui-5.0.typelib
+Gdaui-6.0.gir
+Gdaui-6.0.typelib
gdaui-resources.h
gdaui-resources.c
\ No newline at end of file
diff --git a/libgda-ui/Gdaui-5.0.metadata b/libgda-ui/Gdaui-6.0.metadata
similarity index 100%
rename from libgda-ui/Gdaui-5.0.metadata
rename to libgda-ui/Gdaui-6.0.metadata
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index 0f011b0..da8ffe0 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -1,6 +1,6 @@
QUIET_GEN = $(Q:@= echo ' GEN '$@;)
-lib_LTLIBRARIES = libgda-ui-5.0.la
+lib_LTLIBRARIES = libgda-ui-6.0.la
if HAVE_GLADE
GLADECATALOG = . glade
@@ -73,7 +73,7 @@ ui_sources = \
gdaui-tree-store.c \
gdaui-init.c
-libgda_ui_5_0_la_SOURCES = \
+libgda_ui_6_0_la_SOURCES = \
$(libgda_ui_built_cfiles) \
$(ui_sources) \
gdaui-resources.h \
@@ -113,22 +113,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_5_0_la_OBJECTS): gdaui-resources.h gdaui-resources.c $(libgda_ui_built_headers)
$(libgda_ui_built_cfiles)
+$(OBJECTS) $(libgda_ui_6_0_la_OBJECTS): gdaui-resources.h gdaui-resources.c $(libgda_ui_built_headers)
$(libgda_ui_built_cfiles)
-libgda_ui_5_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
+libgda_ui_6_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
$(NO_UNDEFINED) $(LIBTOOL_UI_EXPORT_OPTIONS)
-libgda_ui_5_0_la_LIBADD = \
+libgda_ui_6_0_la_LIBADD = \
marshallers/libgda-ui-marshallers.la \
internal/libgda-ui-internal.la \
data-entries/libgda-ui-data-entries.la \
- ../libgda/libgda-5.0.la \
+ ../libgda/libgda-6.0.la \
$(COREDEPS_LIBS) \
$(GTK_LIBS) \
$(GIO_LIBS)
if PLATFORM_WIN32
-libgda_ui_5_0_la_LDFLAGS += -export-symbols $(builddir)/libgda-ui.def
-libgda_ui_5_0_la_DEPENDENCIES = libgda-ui.def
+libgda_ui_6_0_la_LDFLAGS += -export-symbols $(builddir)/libgda-ui.def
+libgda_ui_6_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
@@ -229,13 +229,13 @@ introspection_sources = \
$(ui_sources) \
$(ui_data_entries_sources)
-Gdaui-5.0.gir: $(lib_LTLIBRARIES)
-Gdaui_5_0_gir_INCLUDES = Gtk-3.0 Gda-5.0
-Gdaui_5_0_gir_CFLAGS = $(GLOBAL_CFLAGS)
-Gdaui_5_0_gir_LIBS = $(lib_LTLIBRARIES) ../libgda/libgda-5.0.la
-Gdaui_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+Gdaui-6.0.gir: $(lib_LTLIBRARIES)
+Gdaui_6_0_gir_INCLUDES = Gtk-3.0 Gda-6.0
+Gdaui_6_0_gir_CFLAGS = $(GLOBAL_CFLAGS)
+Gdaui_6_0_gir_LIBS = $(lib_LTLIBRARIES) ../libgda/libgda-6.0.la
+Gdaui_6_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libgda
-INTROSPECTION_GIRS += Gdaui-5.0.gir
+INTROSPECTION_GIRS += Gdaui-6.0.gir
if ENABLE_GI_SYSTEM_INSTALL
girdir = $(INTROSPECTION_GIRDIR)
@@ -252,16 +252,16 @@ CLEANFILES += $(typelibs_DATA) $(gir_DATA)
if ENABLE_GDAUI_VALA
-vapi: libgdaui-5.0.vapi
+vapi: libgdaui-6.0.vapi
-libgdaui-5.0.vapi: Gdaui-5.0.gir
- $(VAPIGEN) --metadatadir=$(top_srcdir)/libgda-ui --vapidir=$(top_srcdir)/libgda
--girdir=$(top_srcdir)/libgda --library=libgdaui-5.0 --pkg=libxml-2.0 --pkg=libgda-5.0 --pkg=gio-2.0
--pkg=atk --pkg=gtk+-3.0 Gdaui-5.0.gir
+libgdaui-6.0.vapi: Gdaui-6.0.gir
+ $(VAPIGEN) --metadatadir=$(top_srcdir)/libgda-ui --vapidir=$(top_srcdir)/libgda
--girdir=$(top_srcdir)/libgda --library=libgdaui-6.0 --pkg=libxml-2.0 --pkg=libgda-6.0 --pkg=gio-2.0
--pkg=atk --pkg=gtk+-3.0 Gdaui-6.0.gir
vapidir = $(VAPIDIR)
-vapi_DATA=libgdaui-5.0.vapi
+vapi_DATA=libgdaui-6.0.vapi
EXTRA_DIST += \
- Gdaui-5.0.metadata \
+ Gdaui-6.0.metadata \
$(vapi_DATA)
endif
diff --git a/libgda-ui/data-entries/Makefile.am b/libgda-ui/data-entries/Makefile.am
index 094b837..a8c5f54 100644
--- a/libgda-ui/data-entries/Makefile.am
+++ b/libgda-ui/data-entries/Makefile.am
@@ -70,7 +70,7 @@ libgda_ui_data_entries_la_SOURCES = \
gdaui-formatted-entry.c \
gdaui-numeric-entry.c
-xmldir = $(datadir)/libgda-5.0/ui
+xmldir = $(datadir)/libgda-6.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 944aec1..3158e5c 100644
--- a/libgda-ui/data-entries/plugins/Makefile.am
+++ b/libgda-ui/data-entries/plugins/Makefile.am
@@ -54,8 +54,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-ui/libgda-ui-5.0.la \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(LIBGCRYPT_LIBS) \
$(COREDEPS_LIBS) \
$(GTK_LIBS) \
diff --git a/libgda-ui/demos/.gitignore b/libgda-ui/demos/.gitignore
index 44cc7a7..c54ac47 100644
--- a/libgda-ui/demos/.gitignore
+++ b/libgda-ui/demos/.gitignore
@@ -1,3 +1,3 @@
geninclude.pl
demos.h
-gdaui-demo-5.*
+gdaui-demo-6.*
diff --git a/libgda-ui/demos/Makefile.am b/libgda-ui/demos/Makefile.am
index 82a74cf..e41b446 100644
--- a/libgda-ui/demos/Makefile.am
+++ b/libgda-ui/demos/Makefile.am
@@ -47,24 +47,24 @@ AM_CPPFLAGS = \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\"
-bin_PROGRAMS = gdaui-demo-5.0
+bin_PROGRAMS = gdaui-demo-6.0
BUILT_SOURCES = demos.h
demos.h: $(demos) geninclude.pl
(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
-gdaui_demo_5_0_SOURCES = \
+gdaui_demo_6_0_SOURCES = \
$(demos) \
demo-common.h \
main.c \
demos.h
-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 \
+gdaui_demo_6_0_DEPENDENCIES = $(DEPS)
+gdaui_demo_6_0_LDFLAGS = $(EXTRALDFLAGS)
+gdaui_demo_6_0_LDADD = \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
$(COREDEPS_LIBS) $(GTK_LIBS)
democode_DATA = $(demos) $(demofiles)
diff --git a/libgda-ui/glade/gdaui-catalog.xml b/libgda-ui/glade/gdaui-catalog.xml
index c66e23c..14b4e07 100644
--- a/libgda-ui/glade/gdaui-catalog.xml
+++ b/libgda-ui/glade/gdaui-catalog.xml
@@ -1,4 +1,4 @@
-<glade-catalog name="gdaui" library="libgda-ui-5.0.so" depends="gtk+">
+<glade-catalog name="gdaui" library="libgda-ui-6.0.so" depends="gtk+">
<init-function>gdaui_init</init-function>
<glade-widget-classes>
<glade-widget-class name="GdauiGrid" generic-name="gdauigrid" title="Database Grid"/>
diff --git a/libgda-ui/libgdaui-5.0.vapi b/libgda-ui/libgdaui-6.0.vapi
similarity index 98%
rename from libgda-ui/libgdaui-5.0.vapi
rename to libgda-ui/libgdaui-6.0.vapi
index 936f029..b8b2717 100644
--- a/libgda-ui/libgdaui-5.0.vapi
+++ b/libgda-ui/libgdaui-6.0.vapi
@@ -1,6 +1,6 @@
-/* libgdaui-5.0.vapi generated by vapigen-0.18, do not modify. */
+/* libgdaui-6.0.vapi generated by vapigen-0.22, do not modify. */
-[CCode (cprefix = "Gdaui", gir_namespace = "Gdaui", gir_version = "5.0", lower_case_cprefix = "gdaui_")]
+[CCode (cprefix = "Gdaui", gir_namespace = "Gdaui", gir_version = "6.0", lower_case_cprefix = "gdaui_")]
namespace Gdaui {
[CCode (cheader_filename = "libgda-ui/libgda-ui.h", type_id = "gdaui_basic_form_get_type ()")]
public class BasicForm : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
@@ -336,7 +336,7 @@ namespace Gdaui {
[NoWrapper]
public virtual bool is_valid ();
[NoWrapper]
- public virtual GLib.Value real_get_value ();
+ public virtual GLib.Value? real_get_value ();
[NoWrapper]
public virtual void real_set_value (GLib.Value value);
[NoWrapper]
@@ -412,7 +412,7 @@ namespace Gdaui {
public class NumericEntry : Gdaui.Entry, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable,
Gtk.Editable {
[CCode (has_construct_function = false, type = "GtkWidget*")]
public NumericEntry (GLib.Type type);
- public GLib.Value get_value ();
+ public GLib.Value? get_value ();
[NoAccessorMethod]
public char decimal_sep { get; set; }
[NoAccessorMethod]
@@ -584,9 +584,9 @@ namespace Gdaui {
public abstract bool get_editable ();
public abstract unowned Gda.DataHandler get_handler ();
[NoWrapper]
- public abstract GLib.Value get_ref_value ();
- public GLib.Value get_reference_value ();
- public abstract GLib.Value get_value ();
+ public abstract unowned GLib.Value? get_ref_value ();
+ public unowned GLib.Value? get_reference_value ();
+ public abstract unowned GLib.Value? get_value ();
public abstract GLib.Type get_value_type ();
public abstract void grab_focus ();
public abstract void set_attributes (Gda.ValueAttribute attrs, Gda.ValueAttribute mask);
diff --git a/libgda-xslt-5.0.pc.in b/libgda-xslt-6.0.pc.in
similarity index 100%
rename from libgda-xslt-5.0.pc.in
rename to libgda-xslt-6.0.pc.in
diff --git a/libgda-xslt/Makefile.am b/libgda-xslt/Makefile.am
index 70dbfba..4375966 100644
--- a/libgda-xslt/Makefile.am
+++ b/libgda-xslt/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgda-xslt-5.0.la
+lib_LTLIBRARIES = libgda-xslt-6.0.la
AM_CPPFLAGS = \
-I$(top_builddir)/libgda-report \
@@ -12,16 +12,16 @@ AM_CPPFLAGS = \
gda_xslt_headers = \
libgda-xslt.h
-libgda_xslt_5_0_la_SOURCES = \
+libgda_xslt_6_0_la_SOURCES = \
$(gda_xslt_headers) \
sql_backend.h \
sqlexslt.c \
sql_exslt_internal.c \
sql_backend.c
-libgda_xslt_5_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
-libgda_xslt_5_0_la_LIBADD = $(COREDEPS_LIBS) $(LIBXSLT_LIBS)\
- $(top_builddir)/libgda/libgda-5.0.la
+libgda_xslt_6_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
+libgda_xslt_6_0_la_LIBADD = $(COREDEPS_LIBS) $(LIBXSLT_LIBS)\
+ $(top_builddir)/libgda/libgda-6.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 0534d7a..522a0ff 100644
--- a/libgda/.gitignore
+++ b/libgda/.gitignore
@@ -6,8 +6,8 @@ s-enum-types-h
gda-enum-types.c
gda-enum-types.h
libgda.def
-Gda-5.0.gir
-Gda-5.0.typelib
+Gda-6.0.gir
+Gda-6.0.typelib
*.vapi
test-cnc-open
test-cnc-exec
diff --git a/libgda/Gda-5.0.metadata b/libgda/Gda-6.0.metadata
similarity index 100%
rename from libgda/Gda-5.0.metadata
rename to libgda/Gda-6.0.metadata
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index c3ad2c4..e290647 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -1,6 +1,6 @@
QUIET_GEN = $(Q:@= echo ' GEN '$@;)
-lib_LTLIBRARIES = libgda-5.0.la
+lib_LTLIBRARIES = libgda-6.0.la
check_PROGRAMS = test-cnc-open test-cnc-exec test-cnc-meta
TESTS = test-cnc-open test-cnc-exec test-cnc-meta
@@ -234,30 +234,30 @@ 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_5_0_la_OBJECTS): gda-marshal.c $(libgda_built_headers) $(libgda_built_cfiles)
keywords_hash.c
+$(OBJECTS) $(libgda_6_0_la_OBJECTS): gda-marshal.c $(libgda_built_headers) $(libgda_built_cfiles)
keywords_hash.c
-libgda_5_0_la_SOURCES = \
+libgda_6_0_la_SOURCES = \
$(libgda_built_cfiles) \
$(libgda_sources)
-libgda_5_0_la_LDFLAGS = \
+libgda_6_0_la_LDFLAGS = \
-version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) \
-export-dynamic $(NO_UNDEFINED) $(LIBTOOL_EXPORT_OPTIONS) \
$(GDA_DEBUG_LDFLAGS)
-libgda_5_0_la_LIBADD = \
- sql-parser/libgda_sql_parser-5.0.la \
+libgda_6_0_la_LIBADD = \
+ sql-parser/libgda_sql_parser-6.0.la \
providers-support/libgda-psupport.la \
- handlers/libgda_handlers-5.0.la \
- binreloc/libgda_binreloc-5.0.la \
+ handlers/libgda_handlers-6.0.la \
+ binreloc/libgda_binreloc-6.0.la \
sqlite/libgda-sqlite.la \
- thread-wrapper/libgda_threadwrapper-5.0.la \
+ thread-wrapper/libgda_threadwrapper-6.0.la \
$(COREDEPS_LIBS) \
$(GIO_LIBS) $(LIBSECRET_LIBS) $(GNOME_KEYRING_LIBS)
if PLATFORM_WIN32
-libgda_5_0_la_LDFLAGS += -export-symbols $(builddir)/libgda.def
-libgda_5_0_la_DEPENDENCIES = libgda.def
+libgda_6_0_la_LDFLAGS += -export-symbols $(builddir)/libgda.def
+libgda_6_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
@@ -293,7 +293,7 @@ CLEANFILES = $(libgda_built_headers) $(libgda_built_cfiles) \
dist-hook:
cd $(distdir); rm -f $(libgda_built_headers) $(libgda_built_cfiles)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_DATA = information_schema.xml
DTD_FILES = libgda-array.dtd libgda-paramlist.dtd libgda-server-operation.dtd
@@ -351,13 +351,13 @@ introspection_sources = $(gda_sources) \
$(threadwrapper) \
$(sqlparser) \
$(handlers)
-Gda-5.0.gir: $(lib_LTLIBRARIES)
-Gda_5_0_gir_INCLUDES = GObject-2.0 libxml2-2.0
-Gda_5_0_gir_CFLAGS = $(GLOBAL_CFLAGS)
+Gda-6.0.gir: $(lib_LTLIBRARIES)
+Gda_6_0_gir_INCLUDES = GObject-2.0 libxml2-2.0
+Gda_6_0_gir_CFLAGS = $(GLOBAL_CFLAGS)
-Gda_5_0_gir_LIBS = $(lib_LTLIBRARIES)
-Gda_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
-INTROSPECTION_GIRS += Gda-5.0.gir
+Gda_6_0_gir_LIBS = $(lib_LTLIBRARIES)
+Gda_6_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+INTROSPECTION_GIRS += Gda-6.0.gir
if ENABLE_GI_SYSTEM_INSTALL
girdir = $(INTROSPECTION_GIRDIR)
@@ -375,16 +375,16 @@ endif
if ENABLE_VAPIGEN
-vapi: libgda-5.0.vapi
+vapi: libgda-6.0.vapi
-libgda-5.0.vapi: Gda-5.0.gir
- $(VAPIGEN) --metadatadir=$(top_srcdir)/libgda --library libgda-5.0 --pkg libxml-2.0 Gda-5.0.gir
+libgda-6.0.vapi: Gda-6.0.gir
+ $(VAPIGEN) --metadatadir=$(top_srcdir)/libgda --library libgda-6.0 --pkg libxml-2.0 Gda-6.0.gir
vapidir = $(VAPIDIR)
-vapi_DATA=libgda-5.0.vapi
+vapi_DATA=libgda-6.0.vapi
EXTRA_DIST += \
- Gda-5.0.metadata \
+ Gda-6.0.metadata \
$(vapi_DATA)
endif
@@ -397,19 +397,19 @@ clean-local:
test_cnc_open_SOURCES = test-cnc-open.c
test_cnc_open_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
test_cnc_exec_SOURCES = test-cnc-exec.c
test_cnc_exec_CFLAGS = \
-DROOT_DIR=\""$(top_srcdir)"\"
test_cnc_exec_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
test_cnc_meta_SOURCES = test-cnc-meta.c
test_cnc_meta_CFLAGS = \
-DROOT_DIR=\""$(top_srcdir)"\"
test_cnc_meta_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
diff --git a/libgda/binreloc/Makefile.am b/libgda/binreloc/Makefile.am
index 2511514..958b336 100644
--- a/libgda/binreloc/Makefile.am
+++ b/libgda/binreloc/Makefile.am
@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
-DLIBGDASBIN=\""$(sbindir)"\" \
-DLIBGDASYSCONF=\""$(sysconfdir)"\"
-noinst_LTLIBRARIES = libgda_binreloc-5.0.la
+noinst_LTLIBRARIES = libgda_binreloc-6.0.la
binreloc_headers = \
gda-binreloc.h
@@ -22,7 +22,7 @@ binreloc_headers = \
binrelocincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda
binrelocinclude_HEADERS=$(binreloc_headers)
-libgda_binreloc_5_0_la_SOURCES = \
+libgda_binreloc_6_0_la_SOURCES = \
gda-binreloc.c \
$(binreloc_headers)
diff --git a/libgda/data/.gitignore b/libgda/data/.gitignore
index 572461a..754b428 100644
--- a/libgda/data/.gitignore
+++ b/libgda/data/.gitignore
@@ -1,5 +1,5 @@
*.c
*.h
-GdaData-5.0.gir
-GdaData-5.0.typelib
+GdaData-6.0.gir
+GdaData-6.0.typelib
*.stamp
diff --git a/libgda/data/Makefile.am b/libgda/data/Makefile.am
index 36eaef4..cc3f7a4 100644
--- a/libgda/data/Makefile.am
+++ b/libgda/data/Makefile.am
@@ -15,7 +15,7 @@ AM_CFLAGS =\
$(GEE_CFLAGS) \
$(VALA_CFLAGS)
-lib_LTLIBRARIES = libgdadata-5.0.la
+lib_LTLIBRARIES = libgdadata-6.0.la
VALAFLAGS = \
--vapidir=$(top_srcdir)/libgda \
@@ -23,10 +23,10 @@ VALAFLAGS = \
--includedir=$(top_srcdir)/libgda \
--pkg libxml-2.0 \
--pkg gee-0.8 \
- --pkg libgda-5.0 \
+ --pkg libgda-6.0 \
-C -H $(include_headers) \
- --gir=GdaData-5.0.gir \
- --library gdadata-5.0
+ --gir=GdaData-6.0.gir \
+ --library gdadata-6.0
object_persistance_sources = \
DataBase.vala \
@@ -53,25 +53,25 @@ db_collection_sources = \
include_headers = libgdadata.h
-libgdadata_5_0_la_SOURCES = \
+libgdadata_6_0_la_SOURCES = \
NamespaceInfo.vala \
$(object_persistance_sources) \
$(db_collection_sources)
$(include_headers): DataBase.c
-vapi: gdadata-5.0.vapi
+vapi: gdadata-6.0.vapi
vapidir = $(VAPIDIR)
-vapi_DATA = gdadata-5.0.vapi
+vapi_DATA = gdadata-6.0.vapi
-gdadata-5.0.vapi GdaData-5.0.gir: libgdadata-5.0.la
+gdadata-6.0.vapi GdaData-6.0.gir: libgdadata-6.0.la
-CLEANFILES= gdadata-5.0.vapi
+CLEANFILES= gdadata-6.0.vapi
-libgdadata_5_0_la_LDFLAGS =
+libgdadata_6_0_la_LDFLAGS =
-libgdadata_5_0_la_LIBADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+libgdadata_6_0_la_LIBADD = \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(LIBGDA_LIBS) \
$(GEE_LIBS) \
$(VALA_LIBS)
@@ -80,7 +80,7 @@ gdadataincludedir = $(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINO
gdadatainclude_HEADERS = $(include_headers)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgdadata-5.0.pc
+pkgconfig_DATA = libgdadata-6.0.pc
# GObject Introspection
@@ -93,12 +93,12 @@ typelibsdir = $(libdir)/girepository-1.0
endif
# GIR files are generated automatically by Valac then is not necessary to scan source code to generate it
-INTROSPECTION_GIRS = GdaData-5.0.gir
+INTROSPECTION_GIRS = GdaData-6.0.gir
# Extract dlname from libfolks.la; see bug #658002.
# This is what g-ir-scanner does.
libgdadata_dlname = \
- `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libgdadata-5.0.la`
+ `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libgdadata-6.0.la`
INTROSPECTION_COMPILER_ARGS = \
--includedir=. \
--includedir=$(top_srcdir)/libgda \
@@ -107,22 +107,22 @@ INTROSPECTION_COMPILER_ARGS = \
--includedir=$(top_builddir)/libgda/data \
-l $(libgdadata_dlname)
-GdaData-5.0.typelib: $(INTROSPECTION_GIRS)
+GdaData-6.0.typelib: $(INTROSPECTION_GIRS)
$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@
gir_DATA = $(INTROSPECTION_GIRS)
-typelibs_DATA = GdaData-5.0.typelib
+typelibs_DATA = GdaData-6.0.typelib
CLEANFILES += \
$(typelibs_DATA) \
- gdadata-5.0.vapi \
- libgdadata-5.0.pc \
+ gdadata-6.0.vapi \
+ libgdadata-6.0.pc \
$(include_headers) \
- $(libgdadata_5_0_la_VALASOURCES:.vala=.c) \
- $(srcdir)/libgdadata_5_0_la_vala.stamp
+ $(libgdadata_6_0_la_VALASOURCES:.vala=.c) \
+ $(srcdir)/libgdadata_6_0_la_vala.stamp
EXTRA_DIST = \
- libgdadata-5.0.pc \
+ libgdadata-6.0.pc \
$(vapi_DATA) \
$(INTROSPECTION_GIRS) \
$(typelibs_DATA)
diff --git a/libgda/data/libgdadata-5.0.pc.in b/libgda/data/libgdadata-6.0.pc.in
similarity index 94%
rename from libgda/data/libgdadata-5.0.pc.in
rename to libgda/data/libgdadata-6.0.pc.in
index 424a502..2fb612c 100644
--- a/libgda/data/libgdadata-5.0.pc.in
+++ b/libgda/data/libgdadata-6.0.pc.in
@@ -8,6 +8,6 @@ includedir= includedir@
Name: libgdadata- GDA_ABI_MAJOR_VERSION@ GDA_ABI_MINOR_VERSION@
Description: Gda Data Library. Data oriented GObject implementations using Vala and Gee
Version: @VERSION@
-Requires: libgda-5.0 gee-0.8
+Requires: libgda-6.0 gee-0.8
Libs: -L${libdir} -lgdadata- GDA_ABI_MAJOR_VERSION@ GDA_ABI_MINOR_VERSION@
Cflags: -I${includedir}/libgda- GDA_ABI_MAJOR_VERSION@ GDA_ABI_MINOR_VERSION@ @GDA_DEBUG_FLAGS@
diff --git a/libgda/gda-config.c b/libgda/gda-config.c
index 65776ab..38c79e7 100644
--- a/libgda/gda-config.c
+++ b/libgda/gda-config.c
@@ -330,7 +330,7 @@ gda_config_class_init (GdaConfigClass *klass)
*
* File to use for system-wide DSN list. When changed, the whole list of DSN will be reloaded.
*/
- /* To translators: DSN stands for Data Source Name, it's a named connection string defined in
$PREFIX/etc/libgda-5.0/config */
+ /* To translators: DSN stands for Data Source Name, it's a named connection string defined in
$PREFIX/etc/libgda-6.0/config */
g_object_class_install_property (object_class, PROP_SYSTEM_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 bbe94d2..23bf74f 100644
--- a/libgda/gda-connection.c
+++ b/libgda/gda-connection.c
@@ -896,7 +896,7 @@ merge_column_types (const GType *struct_types, const GType *user_types)
*
* 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-5.0 -L" command to
+ * provider (use gda_config_get_provider_info() to get it). Also one can use the "gda-sql-6.0 -L" command to
* list the possible named parameters.
*
* This method may fail with a GDA_CONNECTION_ERROR domain error (see the #GdaConnectionError error codes)
@@ -1021,7 +1021,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-5.0 -L" command
+ * The possible keys depend on the provider, the "gda-sql-6.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
@@ -1042,7 +1042,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-5.0 -L" command to list the possible named parameters.
+ * string, use the "gda-sql-6.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-holder.c b/libgda/gda-holder.c
index 0adfa65..a6a9136 100644
--- a/libgda/gda-holder.c
+++ b/libgda/gda-holder.c
@@ -2027,7 +2027,7 @@ gda_holder_get_attribute (GdaHolder *holder, const gchar *attribute)
* then the string will not be freed at all).
*
* Attributes can have any name, but Libgda proposes some default names,
- * see <link linkend="libgda-5.0-Attributes-manager.synopsis">this section</link>.
+ * see <link linkend="libgda-6.0-Attributes-manager.synopsis">this section</link>.
*
* For example one would use it as:
*
diff --git a/libgda/gda-init.c b/libgda/gda-init.c
index 16d33f7..23cf775 100644
--- a/libgda/gda-init.c
+++ b/libgda/gda-init.c
@@ -257,7 +257,7 @@ 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-5.0" if Libgda is installed in
+ * "/your/prefix/bin/gda-sql-6.0" if Libgda is installed in
* the "/your/prefix" prefix (which would usually be "/usr"), and for the ABI version 5.0.
*
* Returns: (transfer full): the path as a new string, or %NULL if the application cannot be found
diff --git a/libgda/gda-meta-struct.c b/libgda/gda-meta-struct.c
index b9ef9d7..71c7301 100644
--- a/libgda/gda-meta-struct.c
+++ b/libgda/gda-meta-struct.c
@@ -2615,7 +2615,7 @@ _gda_meta_struct_add_db_object (GdaMetaStruct *mstruct, GdaMetaDbObject *dbo, GE
*
* Get the value associated to a named attribute.
*
- * Attributes can have any name, but Libgda proposes some default names, see <link
linkend="libgda-5.0-Attributes-manager.synopsis">this section</link>.
+ * Attributes can have any name, but Libgda proposes some default names, see <link
linkend="libgda-6.0-Attributes-manager.synopsis">this section</link>.
*
* Returns: (transfer none): a read-only #GValue, or %NULL if not attribute named @attribute has been set
for @column
*/
diff --git a/libgda/gda-server-provider-extra.c b/libgda/gda-server-provider-extra.c
index bdfccd1..837bf6b 100644
--- a/libgda/gda-server-provider-extra.c
+++ b/libgda/gda-server-provider-extra.c
@@ -431,7 +431,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-5.0", filename, NULL);
+ file = g_build_filename (inst_dir, "..", "..", "..", "share", "libgda-6.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 d5e89dd..9852f7e 100644
--- a/libgda/handlers/Makefile.am
+++ b/libgda/handlers/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda_handlers-5.0.la
+noinst_LTLIBRARIES = libgda_handlers-6.0.la
AM_CPPFLAGS = \
-I$(top_srcdir) -I$(srcdir)/.. \
@@ -17,7 +17,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_5_0_la_SOURCES = \
+libgda_handlers_6_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 7b5f3bc..400c343 100644
--- a/libgda/sql-parser/Makefile.am
+++ b/libgda/sql-parser/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda_sql_parser-5.0.la
+noinst_LTLIBRARIES = libgda_sql_parser-6.0.la
noinst_PROGRAMS =
AM_CPPFLAGS = \
@@ -72,11 +72,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_5_0_la_OBJECTS): token_types.h
+$(OBJECTS) $(libgda_sql_parser_6_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_5_0_la_SOURCES = \
+libgda_sql_parser_6_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 ce3309c..0b4debf 100644
--- a/libgda/sqlite/Makefile.am
+++ b/libgda/sqlite/Makefile.am
@@ -67,7 +67,7 @@ libgda_sqlite_la_SOURCES = $(sqlitesources)
libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\"
-DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\"
libgda_sqlite_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
libgda_sqlite_la_LIBADD = \
- virtual/libgda-virtual-5.0.la \
+ virtual/libgda-virtual-6.0.la \
$(sqlitelibs) \
$(COREDEPS_LIBS)
diff --git a/libgda/sqlite/virtual/Makefile.am b/libgda/sqlite/virtual/Makefile.am
index 5ded4e2..ae9f9b2 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-5.0.la
+noinst_LTLIBRARIES = libgda-virtual-6.0.la
if LDAP
GDA_LDAP_H=gda-ldap-connection.h
@@ -37,7 +37,7 @@ virtual_headers = \
$(GDA_LDAP_H) \
libgda-virtual.h
-libgda_virtual_5_0_la_SOURCES = \
+libgda_virtual_6_0_la_SOURCES = \
$(virtual_headers) \
gda-vconnection-data-model.c \
gda-vconnection-data-model-private.h \
@@ -51,7 +51,7 @@ libgda_virtual_5_0_la_SOURCES = \
gdaincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/virtual
gdainclude_HEADERS=$(virtual_headers)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files =
@INTLTOOL_XML_RULE@
diff --git a/libgda/sqlite/virtual/libgda-virtual-5.0.pc.in b/libgda/sqlite/virtual/libgda-virtual-6.0.pc.in
similarity index 100%
rename from libgda/sqlite/virtual/libgda-virtual-5.0.pc.in
rename to libgda/sqlite/virtual/libgda-virtual-6.0.pc.in
diff --git a/libgda/thread-wrapper/Makefile.am b/libgda/thread-wrapper/Makefile.am
index 6bf839a..d217548 100644
--- a/libgda/thread-wrapper/Makefile.am
+++ b/libgda/thread-wrapper/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda_threadwrapper-5.0.la
+noinst_LTLIBRARIES = libgda_threadwrapper-6.0.la
TESTS = test-raw-itsignaler test-itsignaler test-blocking-itsignaler test-worker test-connect
check_PROGRAMS = test-raw-itsignaler test-itsignaler test-blocking-itsignaler test-worker test-connect
@@ -27,7 +27,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_5_0_la_SOURCES = \
+libgda_threadwrapper_6_0_la_SOURCES = \
$(libgda_threadwrapper_headers) \
itsignaler.h \
itsignaler.c \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f713390..209b7af 100755
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
control-center/dsn-config.c
control-center/dsn-properties-dialog.c
-control-center/gda-control-center-5.0.desktop.in
+control-center/gda-control-center-6.0.desktop.in
control-center/gdaui-dsn-assistant.c
control-center/gdaui-dsn-editor.c
control-center/gdaui-login-dialog.c
@@ -288,7 +288,7 @@ tools/browser/data-manager/data-widget.c
tools/browser/data-manager/perspective-main.c
tools/browser/data-manager/ui-spec-editor.c
tools/browser/data-manager/xml-spec-editor.c
-tools/browser/gda-browser-5.0.desktop.in
+tools/browser/gda-browser-6.0.desktop.in
tools/browser/ldap-browser/class-properties.c
tools/browser/ldap-browser/entry-properties.c
tools/browser/ldap-browser/filter-editor.c
diff --git a/providers/bdb/Makefile.am b/providers/bdb/Makefile.am
index 51033f8..58c399c 100644
--- a/providers/bdb/Makefile.am
+++ b/providers/bdb/Makefile.am
@@ -18,7 +18,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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
noinst_PROGRAMS = gda-bdb-test
@@ -27,9 +27,9 @@ gda_bdb_test_SOURCES = gda-bdb-test.c
gda_bdb_test_LDADD = \
$(COREDEPS_LIBS) \
$(BDB_LIBS) \
- $(top_builddir)/libgda/libgda-5.0.la
+ $(top_builddir)/libgda/libgda-6.0.la
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files = bdb_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -37,8 +37,8 @@ xml_in_files = bdb_specs_dsn.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-bdb-5.0.pc
+pkgconfig_DATA = libgda-bdb-6.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-bdb-5.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-bdb-6.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/bdb/libgda-bdb-5.0.pc.in b/providers/bdb/libgda-bdb-6.0.pc.in
similarity index 100%
rename from providers/bdb/libgda-bdb-5.0.pc.in
rename to providers/bdb/libgda-bdb-6.0.pc.in
diff --git a/providers/bdbsql/Makefile.am b/providers/bdbsql/Makefile.am
index 95935c0..d9975ad 100644
--- a/providers/bdbsql/Makefile.am
+++ b/providers/bdbsql/Makefile.am
@@ -18,10 +18,10 @@ libgda_bdbsql_la_SOURCES = \
libgda_bdbsql_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
$(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_bdbsql_la_LIBADD = \
$(top_builddir)/libgda/sqlite/libgda-bdbsqlite.la \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files = \
bdbsql_specs_dsn.xml.in \
bdbsql_specs_create_db.xml.in \
@@ -40,7 +40,7 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-bdbsql-5.0.pc
+pkgconfig_DATA = libgda-bdbsql-6.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-bdbsql-5.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-bdbsql-6.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/bdbsql/libgda-bdbsql-5.0.pc.in b/providers/bdbsql/libgda-bdbsql-6.0.pc.in
similarity index 100%
rename from providers/bdbsql/libgda-bdbsql-5.0.pc.in
rename to providers/bdbsql/libgda-bdbsql-6.0.pc.in
diff --git a/providers/firebird/Makefile.am b/providers/firebird/Makefile.am
index c136486..c665133 100644
--- a/providers/firebird/Makefile.am
+++ b/providers/firebird/Makefile.am
@@ -53,17 +53,17 @@ libgda_firebird_client_la_SOURCES = $(firebird_sources) libmain-client.c
libgda_firebird_client_la_CFLAGS = $(FIREBIRD_CLIENT_CFLAGS)
libgda_firebird_client_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
$(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_firebird_client_la_LIBADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS) $(FIREBIRD_CLIENT_LIBS)
libgda_firebird_embed_la_SOURCES = $(firebird_sources) libmain-embed.c
libgda_firebird_embed_la_CFLAGS = -DFIREBIRD_EMBED $(FIREBIRD_EMBED_CFLAGS)
libgda_firebird_embed_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
$(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_firebird_embed_la_LIBADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS) $(FIREBIRD_EMBED_LIBS)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files = \
firebird_specs_dsn.xml.in \
firebird_specs_dsn_emb.xml.in \
@@ -74,9 +74,9 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-firebird-5.0.pc
+pkgconfig_DATA = libgda-firebird-6.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-firebird-5.0.pc.in parser.y gen_def.c
+EXTRA_DIST = $(xml_in_files) libgda-firebird-6.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-5.0.pc.in b/providers/firebird/libgda-firebird-6.0.pc.in
similarity index 100%
rename from providers/firebird/libgda-firebird-5.0.pc.in
rename to providers/firebird/libgda-firebird-6.0.pc.in
diff --git a/providers/jdbc/.gitignore b/providers/jdbc/.gitignore
index 7be24f6..a6513f0 100644
--- a/providers/jdbc/.gitignore
+++ b/providers/jdbc/.gitignore
@@ -1,6 +1,6 @@
*.class
*.jar
-gda-list-jdbc-providers-5.*
+gda-list-jdbc-providers-6.*
gda-jdbc-test
Gda*.h
-jdbc-resources.[ch]
\ No newline at end of file
+jdbc-resources.[ch]
diff --git a/providers/jdbc/Makefile.am b/providers/jdbc/Makefile.am
index 6488d9d..1323e6e 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-5.0
+bin_PROGRAMS = gda-list-jdbc-providers-6.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.
@@ -59,7 +59,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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
# rem: don't link with JAVA_LIBS because we don't want the dependency on it
# (JVM runtime will be loaded when running)
@@ -78,7 +78,7 @@ CLEANFILES = $(resources)
$(jni_headers): $(jdbcprov_classes)
$(JAVAH) -classpath . -d $(builddir) -force `basename $@ | sed -e 's/\.h$$//'`
-jdbcprov_jar = gdaprovider-5.0.jar
+jdbcprov_jar = gdaprovider-6.0.jar
jdbcprov_sources = \
provider.java \
meta.java \
@@ -101,7 +101,7 @@ clean-local:
rm -f $(jni_headers)
rm -f *.class
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files = \
jdbc_specs_dsn.xml.in \
jdbc_specs_create_table.xml.in \
@@ -112,13 +112,13 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-jdbc-5.0.pc
+pkgconfig_DATA = libgda-jdbc-6.0.pc
doc_files = \
doc/structure.dia
EXTRA_DIST = $(xml_in_files) \
- libgda-jdbc-5.0.pc.in \
+ libgda-jdbc-6.0.pc.in \
jdbc-mappings.xml \
jdbc.gresource.xml \
$(jdbcprov_sources) \
@@ -132,11 +132,11 @@ DISTCLEANFILES = $(xml_DATA)
gda_jdbc_test_SOURCES = gda-jdbc-test.c
gda_jdbc_test_LDADD = \
$(COREDEPS_LIBS) \
- $(top_builddir)/libgda/libgda-5.0.la
+ $(top_builddir)/libgda/libgda-6.0.la
-gda_list_jdbc_providers_5_0_SOURCES = gda-list-jdbc-providers.c
-gda_list_jdbc_providers_5_0_LDADD = \
+gda_list_jdbc_providers_6_0_SOURCES = gda-list-jdbc-providers.c
+gda_list_jdbc_providers_6_0_LDADD = \
$(COREDEPS_LIBS) \
- $(top_builddir)/libgda/libgda-5.0.la
+ $(top_builddir)/libgda/libgda-6.0.la
diff --git a/providers/jdbc/libgda-jdbc-5.0.pc.in b/providers/jdbc/libgda-jdbc-6.0.pc.in
similarity index 100%
rename from providers/jdbc/libgda-jdbc-5.0.pc.in
rename to providers/jdbc/libgda-jdbc-6.0.pc.in
diff --git a/providers/jdbc/libmain.c b/providers/jdbc/libmain.c
index ae1555f..64fdeaf 100644
--- a/providers/jdbc/libmain.c
+++ b/providers/jdbc/libmain.c
@@ -472,7 +472,7 @@ load_jvm ()
if (jvm_found) {
gchar *path;
GError *error = NULL;
- path = g_build_filename (module_path, "gdaprovider-5.0.jar", NULL);
+ path = g_build_filename (module_path, "gdaprovider-6.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 df31644..a74f4eb 100644
--- a/providers/ldap/Makefile.am
+++ b/providers/ldap/Makefile.am
@@ -21,11 +21,11 @@ libgda_ldap_la_SOURCES = \
libgda_ldap_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
$(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_ldap_la_LIBADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS) \
$(LDAP_LIBS)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files = ldap_specs_dsn.xml.in ldap_specs_auth.xml.in
@INTLTOOL_XML_RULE@
@@ -33,8 +33,8 @@ xml_in_files = ldap_specs_dsn.xml.in ldap_specs_auth.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-ldap-5.0.pc
+pkgconfig_DATA = libgda-ldap-6.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-ldap-5.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-ldap-6.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/ldap/libgda-ldap-5.0.pc.in b/providers/ldap/libgda-ldap-6.0.pc.in
similarity index 100%
rename from providers/ldap/libgda-ldap-5.0.pc.in
rename to providers/ldap/libgda-ldap-6.0.pc.in
diff --git a/providers/mdb/Makefile.am b/providers/mdb/Makefile.am
index af81c38..d18725a 100644
--- a/providers/mdb/Makefile.am
+++ b/providers/mdb/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
$(COREDEPS_CFLAGS) \
$(COREDEPS_WFLAGS) \
$(extra_mdb_cflags) \
- -DLIBGDA_DATA_DIR=\""$(datadir)/libgda-5.0"\"
+ -DLIBGDA_DATA_DIR=\""$(datadir)/libgda-6.0"\"
libgda_mdb_la_SOURCES = \
gda-mdb-provider.c \
@@ -35,11 +35,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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS) \
$(extra_mdb_ldflags)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files = mdb_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -47,7 +47,7 @@ xml_in_files = mdb_specs_dsn.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-mdb-5.0.pc
+pkgconfig_DATA = libgda-mdb-6.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-mdb-5.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-mdb-6.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/mdb/libgda-mdb-5.0.pc.in b/providers/mdb/libgda-mdb-6.0.pc.in
similarity index 100%
rename from providers/mdb/libgda-mdb-5.0.pc.in
rename to providers/mdb/libgda-mdb-6.0.pc.in
diff --git a/providers/mysql/Makefile.am b/providers/mysql/Makefile.am
index 839ed8c..05d1736 100644
--- a/providers/mysql/Makefile.am
+++ b/providers/mysql/Makefile.am
@@ -42,11 +42,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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(top_builddir)/providers/reuseable/mysql/libgda-mysql.la \
$(COREDEPS_LIBS) $(MYSQL_LIBS)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files = \
mysql_specs_create_db.xml.in \
mysql_specs_drop_db.xml.in \
@@ -69,7 +69,7 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
CLEANFILES = $(genfiles)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-mysql-5.0.pc
+pkgconfig_DATA = libgda-mysql-6.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-mysql-5.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-mysql-6.0.pc.in
DISTCLEANFILES = $(xml_DATA) $(genfiles)
diff --git a/providers/mysql/libgda-mysql-5.0.pc.in b/providers/mysql/libgda-mysql-6.0.pc.in
similarity index 100%
rename from providers/mysql/libgda-mysql-5.0.pc.in
rename to providers/mysql/libgda-mysql-6.0.pc.in
diff --git a/providers/oracle/Makefile.am b/providers/oracle/Makefile.am
index d76f20a..33193d1 100644
--- a/providers/oracle/Makefile.am
+++ b/providers/oracle/Makefile.am
@@ -58,10 +58,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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS) $(ORACLE_LIBS)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files = \
oracle_specs_dsn.xml.in \
oracle_specs_create_table.xml.in
@@ -71,9 +71,9 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-oracle-5.0.pc
+pkgconfig_DATA = libgda-oracle-6.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-oracle-5.0.pc.in parser.y gen_def.c $(keyword_files)
+EXTRA_DIST = $(xml_in_files) libgda-oracle-6.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-5.0.pc.in b/providers/oracle/libgda-oracle-6.0.pc.in
similarity index 100%
rename from providers/oracle/libgda-oracle-5.0.pc.in
rename to providers/oracle/libgda-oracle-6.0.pc.in
diff --git a/providers/postgres/Makefile.am b/providers/postgres/Makefile.am
index 8e69caa..92ad0a2 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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(top_builddir)/providers/reuseable/postgres/libgda-postgres.la \
$(COREDEPS_LIBS) $(POSTGRES_LIBS)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files = \
postgres_specs_create_db.xml.in \
postgres_specs_drop_db.xml.in \
@@ -56,7 +56,7 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-postgres-5.0.pc
+pkgconfig_DATA = libgda-postgres-6.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-postgres-5.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-postgres-6.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/postgres/libgda-postgres-5.0.pc.in b/providers/postgres/libgda-postgres-6.0.pc.in
similarity index 100%
rename from providers/postgres/libgda-postgres-5.0.pc.in
rename to providers/postgres/libgda-postgres-6.0.pc.in
diff --git a/providers/reuseable/mysql/Makefile.am b/providers/reuseable/mysql/Makefile.am
index 2838ecd..47acea0 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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_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 4427f42..4aca29e 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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_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 341c543..f94d09b 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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS) #$(CAPI_LIBS)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.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-5.0.pc
-noinst_DATA += libgda-capi-5.0.pc
+#pkgconfig_DATA = libgda-capi-6.0.pc
+noinst_DATA += libgda-capi-6.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-capi-5.0.pc.in parser.y gen_def.c $(keyword_files)
+EXTRA_DIST = $(xml_in_files) libgda-capi-6.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-5.0.pc.in
b/providers/skel-implementation/capi/libgda-capi-6.0.pc.in
similarity index 100%
rename from providers/skel-implementation/capi/libgda-capi-5.0.pc.in
rename to providers/skel-implementation/capi/libgda-capi-6.0.pc.in
diff --git a/providers/skel-implementation/models/Makefile.am
b/providers/skel-implementation/models/Makefile.am
index c03322f..0930d99 100644
--- a/providers/skel-implementation/models/Makefile.am
+++ b/providers/skel-implementation/models/Makefile.am
@@ -18,10 +18,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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files = models_specs_dsn.xml.in
@INTLTOOL_XML_RULE@
@@ -30,9 +30,9 @@ xml_in_files = models_specs_dsn.xml.in
noinst_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-#pkgconfig_DATA = libgda-models-5.0.pc
-noinst_DATA += libgda-models-5.0.pc
+#pkgconfig_DATA = libgda-models-6.0.pc
+noinst_DATA += libgda-models-6.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-models-5.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-models-6.0.pc.in
DISTCLEANFILES = $(noinst_DATA)
diff --git a/providers/skel-implementation/models/libgda-models-5.0.pc.in
b/providers/skel-implementation/models/libgda-models-6.0.pc.in
similarity index 100%
rename from providers/skel-implementation/models/libgda-models-5.0.pc.in
rename to providers/skel-implementation/models/libgda-models-6.0.pc.in
diff --git a/providers/sqlcipher/Makefile.am b/providers/sqlcipher/Makefile.am
index 21f629a..0a02d16 100644
--- a/providers/sqlcipher/Makefile.am
+++ b/providers/sqlcipher/Makefile.am
@@ -33,11 +33,11 @@ libgda_sqlcipher_la_SOURCES = \
libgda_sqlcipher_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
$(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_sqlcipher_la_LIBADD = \
$(top_builddir)/libgda/sqlite/libgda-sqlcipher.la \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS) \
$(LIBCRYPTO_LIBS)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.0
xml_in_files = \
sqlcipher_specs_auth.xml.in \
sqlcipher_specs_dsn.xml.in \
@@ -57,10 +57,10 @@ xml_in_files = \
xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgda-sqlcipher-5.0.pc
+pkgconfig_DATA = libgda-sqlcipher-6.0.pc
EXTRA_DIST = $(xml_in_files) \
- libgda-sqlcipher-5.0.pc.in \
+ libgda-sqlcipher-6.0.pc.in \
sqlcipher.patch \
COPYING.sqlcipher
diff --git a/providers/sqlcipher/libgda-sqlcipher-5.0.pc.in b/providers/sqlcipher/libgda-sqlcipher-6.0.pc.in
similarity index 100%
rename from providers/sqlcipher/libgda-sqlcipher-5.0.pc.in
rename to providers/sqlcipher/libgda-sqlcipher-6.0.pc.in
diff --git a/providers/sqlite/Makefile.am b/providers/sqlite/Makefile.am
index 25dcc09..3deb38e 100644
--- a/providers/sqlite/Makefile.am
+++ b/providers/sqlite/Makefile.am
@@ -17,10 +17,10 @@ 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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.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-5.0.pc
+pkgconfig_DATA = libgda-sqlite-6.0.pc
-EXTRA_DIST = $(xml_in_files) libgda-sqlite-5.0.pc.in
+EXTRA_DIST = $(xml_in_files) libgda-sqlite-6.0.pc.in
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/sqlite/libgda-sqlite-5.0.pc.in b/providers/sqlite/libgda-sqlite-6.0.pc.in
similarity index 100%
rename from providers/sqlite/libgda-sqlite-5.0.pc.in
rename to providers/sqlite/libgda-sqlite-6.0.pc.in
diff --git a/providers/web/Makefile.am b/providers/web/Makefile.am
index 8de002d..6872e01 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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS) $(LIBSOUP_LIBS)
-xmldir = $(datadir)/libgda-5.0
+xmldir = $(datadir)/libgda-6.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-5.0.pc
+pkgconfig_DATA = libgda-web-6.0.pc
-phpdir = $(datadir)/libgda-5.0/php
+phpdir = $(datadir)/libgda-6.0/php
php_DATA = \
php/README \
php/gda-clean.php \
@@ -64,7 +64,7 @@ php_DATA = \
php/gda-worker.php
-EXTRA_DIST = $(xml_in_files) libgda-web-5.0.pc.in \
+EXTRA_DIST = $(xml_in_files) libgda-web-6.0.pc.in \
$(php_DATA)
DISTCLEANFILES = $(xml_DATA)
diff --git a/providers/web/libgda-web-5.0.pc.in b/providers/web/libgda-web-6.0.pc.in
similarity index 100%
rename from providers/web/libgda-web-5.0.pc.in
rename to providers/web/libgda-web-6.0.pc.in
diff --git a/samples/CustomUIPlugin/libmain.c b/samples/CustomUIPlugin/libmain.c
index 57fe7ec..aa9bd56 100644
--- a/samples/CustomUIPlugin/libmain.c
+++ b/samples/CustomUIPlugin/libmain.c
@@ -46,7 +46,7 @@ plugin_init (GError **error)
plugin->cell_create_func = plugin_cell_renderer_password_create_func;
retlist = g_slist_append (retlist, plugin);
- file = gda_gbr_get_file_path (GDA_LIB_DIR, "libgda-5.0", "plugins", "custom-entry-password.xml",
NULL);
+ file = gda_gbr_get_file_path (GDA_LIB_DIR, "libgda-6.0", "plugins", "custom-entry-password.xml",
NULL);
if (! g_file_test (file, G_FILE_TEST_EXISTS)) {
if (error && !*error)
g_set_error (error, 0, 0, "Missing spec. file '%s'", file);
diff --git a/testing/Makefile.am b/testing/Makefile.am
index 91be38d..aa4e2e2 100644
--- a/testing/Makefile.am
+++ b/testing/Makefile.am
@@ -7,17 +7,17 @@ AM_CPPFLAGS = \
$(COREDEPS_CFLAGS) \
$(COREDEPS_WFLAGS)
-bin_PROGRAMS = gda-test-connection-5.0
+bin_PROGRAMS = gda-test-connection-6.0
if HAVE_UI
UI_PROGS=gdaui-test-data-entries gdaui-test-widget-entry gdaui-test-errors gdaui-test-rt-editor
endif
noinst_PROGRAMS = gda-test-blob virtual-test virtual-test-2 $(UI_PROGS)
-gda_test_connection_5_0_SOURCES = \
+gda_test_connection_6_0_SOURCES = \
gda-test-connection.c
-gda_test_connection_5_0_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+gda_test_connection_6_0_LDADD = \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
@@ -25,31 +25,21 @@ gda_test_blob_SOURCES = \
gda-test-blob.c
gda_test_blob_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(COREDEPS_LIBS)
-
-
-gda_provider_status_SOURCES = \
- html.h \
- html.c \
- gda-provider-status.c
-
-gda_provider_status_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
virtual_test_SOURCES = \
virtual-test.c
virtual_test_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
virtual_test_2_SOURCES = \
virtual-test-2.c
virtual_test_2_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
gdaui_test_data_entries_CFLAGS = $(GTK_CFLAGS)
@@ -57,8 +47,8 @@ gdaui_test_data_entries_SOURCES = \
gdaui-test-data-entries.c
gdaui_test_data_entries_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
$(COREDEPS_LIBS) \
$(GTK_LIBS)
@@ -67,8 +57,8 @@ gdaui_test_widget_entry_SOURCES = \
gdaui-test-widget-entry.c
gdaui_test_widget_entry_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
$(COREDEPS_LIBS) \
$(GTK_LIBS)
@@ -77,9 +67,9 @@ gdaui_test_errors_SOURCES = \
gdaui-test-errors.c
gdaui_test_errors_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
- $(top_builddir)/tests/libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
+ $(top_builddir)/tests/libgda-test-6.0.la \
$(COREDEPS_LIBS) \
$(GTK_LIBS)
@@ -88,8 +78,8 @@ gdaui_test_rt_editor_SOURCES = \
gdaui-test-rt-editor.c
gdaui_test_rt_editor_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
$(COREDEPS_LIBS) \
$(GTK_LIBS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ac3b8ce..8487455 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libgda-test-5.0.la
+noinst_LTLIBRARIES = libgda-test-6.0.la
TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
TESTS = test-ddl-creator test-bin-converter test-sql-identifier test-identifiers-quotes test-sql-builder
test-connection-string-split test-input-parsers test-quark-list test-sql-renderer
@@ -26,7 +26,7 @@ AM_CPPFLAGS = \
test_headers = \
gda-ddl-creator.h
-libgda_test_5_0_la_SOURCES = \
+libgda_test_6_0_la_SOURCES = \
$(test_headers) \
test-errors.h \
test-errors.c \
@@ -36,18 +36,18 @@ libgda_test_5_0_la_SOURCES = \
data-model-errors.h \
data-model-errors.c
-libgda_test_5_0_la_LDFLAGS = $(NO_UNDEFINED)
+libgda_test_6_0_la_LDFLAGS = $(NO_UNDEFINED)
-libgda_test_5_0_la_LIBADD = \
+libgda_test_6_0_la_LIBADD = \
$(COREDEPS_LIBS) \
- $(top_builddir)/libgda/libgda-5.0.la
+ $(top_builddir)/libgda/libgda-6.0.la
test_ddl_creator_SOURCES = \
test-ddl-creator.c
test_ddl_creator_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ libgda-test-6.0.la \
$(COREDEPS_LIBS)
@@ -55,55 +55,55 @@ test_bin_converter_SOURCES = \
test-bin-converter.c
test_bin_converter_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ libgda-test-6.0.la \
$(COREDEPS_LIBS)
test_sql_identifier_SOURCES = \
test-sql-identifier.c
test_sql_identifier_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
test_identifiers_quotes_SOURCES = \
test-identifiers-quotes.c
test_identifiers_quotes_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
test_sql_builder_SOURCES = \
test-sql-builder.c
test_sql_builder_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
test_connection_string_split_SOURCES = \
test-connection-string-split.c
test_connection_string_split_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
test_input_parsers_SOURCES = \
test-input-parsers.c
test_input_parsers_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
test_quark_list_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
test_sql_renderer_SOURCES = \
test-sql-renderer.c
test_sql_renderer_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ libgda-test-6.0.la \
$(COREDEPS_LIBS)
diff --git a/tests/data-models/Makefile.am b/tests/data-models/Makefile.am
index 96b8c43..cff9df1 100644
--- a/tests/data-models/Makefile.am
+++ b/tests/data-models/Makefile.am
@@ -17,7 +17,7 @@ common_sources = \
check_model_import_SOURCES = $(common_sources) check_model_import.c
check_model_import_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_virtual_SOURCES = $(common_sources) check_virtual.c
@@ -25,38 +25,38 @@ check_virtual_CFLAGS = \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_srcdir)/libgda/sqlite/virtual
check_virtual_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_data_proxy_SOURCES = $(common_sources) check_data_proxy.c
check_data_proxy_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_model_copy_SOURCES = $(common_sources) check_model_copy.c
check_model_copy_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_pmodel_SOURCES = $(common_sources) check_pmodel.c
check_pmodel_CFLAGS = \
-I$(top_srcdir)/libgda/sqlite
check_pmodel_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/tests/libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/tests/libgda-test-6.0.la \
$(COREDEPS_LIBS)
check_empty_rs_SOURCES = $(common_sources) check_empty_rs.c
check_empty_rs_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_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-5.0.la \
- $(top_builddir)/tests/libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/tests/libgda-test-6.0.la \
$(COREDEPS_LIBS)
check_vcnc_SOURCES = $(common_sources) check_vcnc.c
@@ -64,7 +64,7 @@ check_vcnc_CFLAGS = \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_srcdir)/libgda/sqlite/vcnc
check_vcnc_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_pivot_SOURCES = $(common_sources) check_pivot.c
@@ -72,7 +72,7 @@ check_pivot_CFLAGS = \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_srcdir)/libgda/sqlite/pivot
check_pivot_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
diff --git a/tests/meta-store/Makefile.am b/tests/meta-store/Makefile.am
index 746dd91..a730150 100644
--- a/tests/meta-store/Makefile.am
+++ b/tests/meta-store/Makefile.am
@@ -14,22 +14,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-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_meta_store_sqlite_SOURCES = check_meta_store_sqlite.c $(common_sources)
check_meta_store_sqlite_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_meta_store_postgresql_SOURCES = check_meta_store_postgresql.c $(common_sources)
check_meta_store_postgresql_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_meta_store_mysql_SOURCES = check_meta_store_mysql.c $(common_sources)
check_meta_store_mysql_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
EXTRA_DIST = data_builtin_data_types.csv \
diff --git a/tests/multi-threading/Makefile.am b/tests/multi-threading/Makefile.am
index 04662e0..b33ab82 100644
--- a/tests/multi-threading/Makefile.am
+++ b/tests/multi-threading/Makefile.am
@@ -18,17 +18,17 @@ common_sources = \
check_mutex_SOURCES = check_mutex.c
check_mutex_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_parser_SOURCES = check_parser.c
check_parser_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_cnc_lock_SOURCES = check_cnc_lock.c $(common_sources)
check_cnc_lock_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
EXTRA_DIST = testdb.sql
diff --git a/tests/parser/Makefile.am b/tests/parser/Makefile.am
index 415b7e1..42ab827 100644
--- a/tests/parser/Makefile.am
+++ b/tests/parser/Makefile.am
@@ -12,37 +12,37 @@ check_PROGRAMS = check_parser check_validation check_normalization check_dml_com
check_parser_SOURCES = check_parser.c
check_parser_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_validation_SOURCES = check_validation.c
check_validation_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_normalization_SOURCES = check_normalization.c
check_normalization_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_dml_comp_SOURCES = check_dml_comp.c
check_dml_comp_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_script_SOURCES = check_script.c
check_script_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_rewrite_for_default_SOURCES = check_rewrite_for_default.c
check_rewrite_for_default_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_rewrite_for_null_SOURCES = check_rewrite_for_null.c
check_rewrite_for_null_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
diff --git a/tests/providers/Makefile.am b/tests/providers/Makefile.am
index 2d33817..e2b6693 100644
--- a/tests/providers/Makefile.am
+++ b/tests/providers/Makefile.am
@@ -51,50 +51,50 @@ common_sources = \
check_sqlite_SOURCES = $(common_sources) check_sqlite.c
check_sqlite_CFLAGS =
check_sqlite_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/tests/libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/tests/libgda-test-6.0.la \
$(COREDEPS_LIBS)
check_bdb_SOURCES = $(common_sources) check_bdb.c
check_bdb_CFLAGS =
check_bdb_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/tests/libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/tests/libgda-test-6.0.la \
$(COREDEPS_LIBS)
check_firebird_SOURCES = $(common_sources) check_firebird.c
check_firebird_CFLAGS =
check_firebird_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/tests/libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/tests/libgda-test-6.0.la \
$(COREDEPS_LIBS)
check_mdb_SOURCES = $(common_sources) check_mdb.c
check_mdb_CFLAGS =
check_mdb_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/tests/libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/tests/libgda-test-6.0.la \
$(COREDEPS_LIBS)
check_mysql_SOURCES = $(common_sources) check_mysql.c
check_mysql_CFLAGS =
check_mysql_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/tests/libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/tests/libgda-test-6.0.la \
$(COREDEPS_LIBS)
check_oracle_SOURCES = $(common_sources) check_oracle.c
check_oracle_CFLAGS =
check_oracle_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/tests/libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/tests/libgda-test-6.0.la \
$(COREDEPS_LIBS)
check_postgres_SOURCES = $(common_sources) check_postgres.c
check_postgres_CFLAGS =
check_postgres_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/tests/libgda-test-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/tests/libgda-test-6.0.la \
$(COREDEPS_LIBS)
EXTRA_DIST = \
diff --git a/tests/ui/Makefile.am b/tests/ui/Makefile.am
index a85ed58..2aff4b9 100644
--- a/tests/ui/Makefile.am
+++ b/tests/ui/Makefile.am
@@ -14,14 +14,14 @@ check_PROGRAMS = check_sets check_raw_grid_model
check_sets_SOURCES = common.c common.h check_sets.c
check_sets_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
$(COREDEPS_LIBS) \
$(GTK_LIBS)
check_raw_grid_model_SOURCES = common.c common.h check_raw_grid_model.c
check_raw_grid_model_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
$(COREDEPS_LIBS) \
$(GTK_LIBS)
diff --git a/tests/vala/Makefile.am b/tests/vala/Makefile.am
index d344b2e..78bbc5c 100644
--- a/tests/vala/Makefile.am
+++ b/tests/vala/Makefile.am
@@ -19,8 +19,8 @@ VALAFLAGS = \
--pkg gee-0.8 \
--pkg gobject-2.0 \
--pkg libxml-2.0 \
- --pkg libgda-5.0 \
- --pkg gdadata-5.0 \
+ --pkg libgda-6.0 \
+ --pkg gdadata-6.0 \
--includedir=$(top_builddir) \
--vapidir=$(top_srcdir)/libgda \
--vapidir=$(top_builddir)/libgda/data \
@@ -36,20 +36,20 @@ check_table_SOURCES = \
CheckTable.vala
check_dataobject_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda/data/libgdadata-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda/data/libgdadata-6.0.la \
$(COREDEPS_LIBS) \
$(GEE_LIBS)
check_datamodeliterator_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda/data/libgdadata-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda/data/libgdadata-6.0.la \
$(COREDEPS_LIBS) \
$(GEE_LIBS)
check_table_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda/data/libgdadata-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda/data/libgdadata-6.0.la \
$(COREDEPS_LIBS) \
$(GEE_LIBS)
diff --git a/tests/value-holders/Makefile.am b/tests/value-holders/Makefile.am
index 9dc736b..e4a1441 100644
--- a/tests/value-holders/Makefile.am
+++ b/tests/value-holders/Makefile.am
@@ -19,17 +19,17 @@ common_sources = \
check_holder_SOURCES = check_holder.c $(common_sources)
check_holder_LDADD = $(JSON_GLIB_LIBS) \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_set_SOURCES = check_set.c $(common_sources)
check_set_LDADD = $(JSON_GLIB_LIBS) \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
check_statement_SOURCES = check_statement.c $(common_sources)
check_statement_LDADD = $(JSON_GLIB_LIBS) \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
diff --git a/tools/.gitignore b/tools/.gitignore
index 4b8d848..3842d9d 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,7 +1,7 @@
-gda-sql-5*
-gda-list-config-5*
-gda-list-server-op-5*
+gda-sql-6*
+gda-list-config-6*
+gda-list-server-op-6*
information-schema-doc
information-schema-types
-gda-sql-5.*.1
-gda-ldap-browser-5*
+gda-sql-6.*.1
+gda-ldap-browser-6*
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2712316..3b3cf5d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -9,9 +9,9 @@ endif
SUBDIRS = cmdtool $(BROWSER_DIR) help
bin_PROGRAMS = \
- gda-list-config-5.0 \
- gda-sql-5.0 \
- gda-list-server-op-5.0
+ gda-list-config-6.0 \
+ gda-sql-6.0 \
+ gda-list-server-op-6.0
noinst_PROGRAMS = information-schema-doc information-schema-types
@@ -28,14 +28,14 @@ AM_CPPFLAGS = \
$(COREDEPS_CFLAGS) \
-DROOT_DIR=\""$(top_srcdir)"\"
-gda_list_config_5_0_SOURCES = \
+gda_list_config_6_0_SOURCES = \
gda-list-config.c
-gda_list_config_5_0_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+gda_list_config_6_0_LDADD = \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
-gda_sql_5_0_SOURCES = \
+gda_sql_6_0_SOURCES = \
tool-utils.h \
tool-utils.c \
config-info.h \
@@ -52,17 +52,17 @@ gda_sql_5_0_SOURCES = \
$(top_srcdir)/libgda/md5.h \
$(top_srcdir)/libgda/md5c.c
-gda_sql_5_0_LDADD = \
+gda_sql_6_0_LDADD = \
cmdtool/libcmdtool.la \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS) \
$(READLINE_LIB) \
$(HISTORY_LIB)
if LIBSOUP
-gda_sql_5_0_SOURCES += web-server.h web-server.c html-doc.h html-doc.c
+gda_sql_6_0_SOURCES += web-server.h web-server.c html-doc.h html-doc.c
AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
-gda_sql_5_0_LDADD += $(LIBSOUP_LIBS)
+gda_sql_6_0_LDADD += $(LIBSOUP_LIBS)
endif
@@ -70,7 +70,7 @@ endif
# setenv() is in libiberty in mingw
if PLATFORM_WIN32
-gda_sql_5_0_SOURCES += gda-sql-res.rc
+gda_sql_6_0_SOURCES += gda-sql-res.rc
endif
.rc.o:
@@ -79,13 +79,13 @@ endif
gda-sql-res.o: gda-sql-res.rc
$(WINDRES) $^ -o $@
-gda_list_server_op_5_0_SOURCES = \
+gda_list_server_op_6_0_SOURCES = \
gda-list-server-op.c \
gda-tree-mgr-xml.c \
gda-tree-mgr-xml.h
-gda_list_server_op_5_0_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+gda_list_server_op_6_0_LDADD = \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
@@ -93,17 +93,17 @@ information_schema_doc_SOURCES = \
information-schema-doc.c
information_schema_doc_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
information_schema_types_SOURCES = \
information-schema-types.c
information_schema_types_LDADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS)
-webdatadir = $(datadir)/libgda-5.0/web
+webdatadir = $(datadir)/libgda-6.0/web
webdata_DATA = \
cnc.js \
md5.js \
@@ -121,7 +121,7 @@ EXTRA_DIST = \
$(webdata_DATA)
mans = \
- gda-sql-5.0.1
+ gda-sql-6.0.1
man_MANS = \
$(mans)
@@ -158,9 +158,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-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)
+ && $(LN_S) gda-list-config-6.0$(EXEEXT) gda-list-config$(EXEEXT) \
+ && $(LN_S) gda-sql-6.0$(EXEEXT) gda-sql$(EXEEXT) \
+ && $(LN_S) gda-list-server-op-6.0$(EXEEXT) gda-list-server-op$(EXEEXT)
endif
uninstall-local:
diff --git a/tools/browser/.gitignore b/tools/browser/.gitignore
index ce62655..5cb2942 100644
--- a/tools/browser/.gitignore
+++ b/tools/browser/.gitignore
@@ -1,5 +1,5 @@
-gda-browser-5.0
-gda-browser-5.*.desktop
+gda-browser-6.0
+gda-browser-6.*.desktop
canvas-example
marshal.c
marshal.h
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index 2c0fd33..3238ca7 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS=gda-browser-5.0
+bin_PROGRAMS=gda-browser-6.0
noinst_LTLIBRARIES = libbrowser.la
SUBDIRS = data common schema-browser query-exec data-manager dummy-perspective
@@ -86,14 +86,14 @@ libbrowser_la_SOURCES=\
text-search.c \
text-search.h
-gda_browser_5_0_SOURCES=\
+gda_browser_6_0_SOURCES=\
main.c
$(OBJECTS): marshal.c marshal.h
if PLATFORM_WIN32
EXTRALDFLAGS=-mwindows
-gda_browser_5_0_SOURCES += browser-res.rc
+gda_browser_6_0_SOURCES += browser-res.rc
else
EXTRALDFLAGS=
endif
@@ -108,8 +108,8 @@ endif
browser-res.o: browser-res.rc
$(WINDRES) $^ -o $@
-gda_browser_5_0_LDFLAGS = $(EXTRALDFLAGS)
-gda_browser_5_0_LDADD=\
+gda_browser_6_0_LDFLAGS = $(EXTRALDFLAGS)
+gda_browser_6_0_LDADD=\
schema-browser/libperspective.la \
query-exec/libperspective.la \
data-manager/libperspective.la \
@@ -118,15 +118,15 @@ gda_browser_5_0_LDADD=\
$(top_builddir)/libgda-ui/internal/libgda-ui-internal.la \
$(CANVAS_LDADD) \
common/libcommon.la \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
$(COREDEPS_LIBS) $(GTK_LIBS) $(GTKSOURCEVIEW_LIBS) $(MAC_INTEGRATION_LIBS)
@INTLTOOL_DESKTOP_RULE@
desktopdir=$(datadir)/applications
-Desktop_in_files = gda-browser-5.0.desktop.in
+Desktop_in_files = gda-browser-6.0.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
# canvas example
@@ -149,12 +149,12 @@ canvas_example_LDADD=\
libbrowser.la \
$(top_builddir)/libgda-ui/internal/libgda-ui-internal.la \
common/libcommon.la \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
$(COREDEPS_LIBS) $(GTK_LIBS)
# icons
-iconsdir=$(datadir)/libgda-5.0/pixmaps
+iconsdir=$(datadir)/libgda-6.0/pixmaps
icons_DATA= \
gda-browser.png \
gda-browser-auth.png \
@@ -188,7 +188,7 @@ icons_DATA= \
# app icon
appiconsdir=$(datadir)/pixmaps
appicons_DATA= \
- gda-browser-5.0.png
+ gda-browser-6.0.png
EXTRA_DIST = \
marshal.list \
diff --git a/tools/browser/canvas/Makefile.am b/tools/browser/canvas/Makefile.am
index ce89645..9d0ccfc 100644
--- a/tools/browser/canvas/Makefile.am
+++ b/tools/browser/canvas/Makefile.am
@@ -35,7 +35,7 @@ libcanvas_la_SOURCES = \
browser-canvas-utility.h
libcanvas_la_LIBADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS) \
$(GTK_LIBS) \
$(GOOCANVAS_LIBS) \
diff --git a/tools/browser/common/Makefile.am b/tools/browser/common/Makefile.am
index 30c40fd..af89d7f 100644
--- a/tools/browser/common/Makefile.am
+++ b/tools/browser/common/Makefile.am
@@ -43,11 +43,11 @@ libcommon_la_SOURCES = \
$(OBJECTS): marshal.c marshal.h
libcommon_la_LIBADD = \
- $(top_builddir)/libgda/libgda-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
$(COREDEPS_LIBS) \
$(GTK_LIBS)
-xmldir=$(datadir)/libgda-5.0
+xmldir=$(datadir)/libgda-6.0
xml_DATA= \
import_encodings.xml
diff --git a/tools/browser/data/Makefile.am b/tools/browser/data/Makefile.am
index 452e3d2..72e4829 100644
--- a/tools/browser/data/Makefile.am
+++ b/tools/browser/data/Makefile.am
@@ -50,12 +50,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-5.0/icons/$$theme; \
+ $(gtk_update_icon_cache) $(datadir)/libgda-6.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-5.0/icons/$$theme"; \
+ echo "*** $(gtk_update_icon_cache) $(datadir)/libgda-6.0/icons/$$theme"; \
done; \
fi
@@ -73,8 +73,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-5.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
- $(INSTALL_DATA) $(srcdir)/$$icon
$(DESTDIR)$(datadir)/libgda-5.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ mkdir -p $(DESTDIR)$(datadir)/libgda-6.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon
$(DESTDIR)$(datadir)/libgda-6.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done
uninstall-icons:
@@ -90,7 +90,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-5.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ rm -f $(DESTDIR)$(datadir)/libgda-6.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 8fdc58c..51c2ab9 100644
--- a/tools/browser/doc/Makefile.am
+++ b/tools/browser/doc/Makefile.am
@@ -59,8 +59,8 @@ GTKDOC_LIBS = \
$(top_builddir)/tools/browser/libbrowser.la \
$(top_builddir)/libgda-ui/internal/libgda-ui-internal.la \
$(top_builddir)/tools/browser/common/libcommon.la \
- $(top_builddir)/libgda/libgda-5.0.la \
- $(top_builddir)/libgda-ui/libgda-ui-5.0.la \
+ $(top_builddir)/libgda/libgda-6.0.la \
+ $(top_builddir)/libgda-ui/libgda-ui-6.0.la \
$(COREDEPS_LIBS) \
$(GTK_LIBS) \
$(GTKSOURCEVIEW_LIBS)
diff --git a/tools/browser/gda-browser-5.0.desktop.in b/tools/browser/gda-browser-6.0.desktop.in
similarity index 80%
rename from tools/browser/gda-browser-5.0.desktop.in
rename to tools/browser/gda-browser-6.0.desktop.in
index 1d996f1..6bd1076 100644
--- a/tools/browser/gda-browser-5.0.desktop.in
+++ b/tools/browser/gda-browser-6.0.desktop.in
@@ -1,8 +1,8 @@
[Desktop Entry]
_Name=Database browser
_Comment=Browse your database's contents
-Icon=gda-browser-5.0
-Exec=gda-browser-5.0
+Icon=gda-browser-6.0
+Exec=gda-browser-6.0
Terminal=false
Type=Application
Categories=GTK;Development;Database;
diff --git a/tools/browser/gda-browser-5.0.png b/tools/browser/gda-browser-6.0.png
similarity index 100%
rename from tools/browser/gda-browser-5.0.png
rename to tools/browser/gda-browser-6.0.png
diff --git a/tools/gda-list-server-op.c b/tools/gda-list-server-op.c
index de478f6..28175f4 100644
--- a/tools/gda-list-server-op.c
+++ b/tools/gda-list-server-op.c
@@ -56,7 +56,7 @@ main (int argc, char **argv) {
g_option_context_free (context);
gda_init ();
- xml_dir = gda_gbr_get_file_path (GDA_DATA_DIR, "libgda-5.0", NULL);
+ xml_dir = gda_gbr_get_file_path (GDA_DATA_DIR, "libgda-6.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/help/C/gda-sql-help.xml b/tools/help/C/gda-sql-help.xml
index 02bfff2..c31aca5 100644
--- a/tools/help/C/gda-sql-help.xml
+++ b/tools/help/C/gda-sql-help.xml
@@ -157,7 +157,7 @@ DSN parameters | DB_NAME: Database name. The name of a database to connect to (s
COMPRESS: Compress. Use compression protocol (boolean)
Authentication | USERNAME (string),
PASSWORD (string)
-File | /usrlib/libgda-5.0/providers/libgda-mysql.so
+File | /usrlib/libgda-6.0/providers/libgda-mysql.so
(5 rows)</raw>
<comment>This output shows all the arguments accepted by the MySQL provider (DB_NAME, HOST, PORT,
...)</comment>
</example>
diff --git a/tools/web-server.c b/tools/web-server.c
index 354749d..a27a7c1 100644
--- a/tools/web-server.c
+++ b/tools/web-server.c
@@ -450,7 +450,7 @@ get_file (G_GNUC_UNUSED WebServer *server, SoupMessage *msg, const char *path, G
GMappedFile *mfile;
gchar *real_path;
- real_path = gda_gbr_get_file_path (GDA_DATA_DIR, "libgda-5.0", "web", path, NULL);
+ real_path = gda_gbr_get_file_path (GDA_DATA_DIR, "libgda-6.0", "web", path, NULL);
if (!real_path)
return FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
