GNOME.org
 

gnomemm r1937 - in libgnomedbmm/trunk: . docs/reference examples libgnomedb libgnomedb/libgnomedbmm libgnomedb/libgnomedbmm/private libgnomedb/src tools/extra_defs_gen tools/m4

Author: murrayc
Date: Sat Jan  3 20:19:32 2009
New Revision: 1937
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1937&view=rev

Log:
2009-01-03  Murray Cumming  <murrayc murrayc com>

* Makefile_web.am_fragment:
* configure.in:
* docs/reference/Makefile.am:
* examples/Makefile.am_fragment:
* libgnomedb/Makefile.am:
* libgnomedb/libgnomedbmm/Makefile.am:
* libgnomedb/libgnomedbmm/private/Makefile.am:
* libgnomedb/src/datacellrendererboolean.hg:
* libgnomedb/src/datacellrendererinfo.hg:
* libgnomedb/src/datacellrenderertextual.hg:
* libgnomedb/src/datasourceselector.hg:
* libgnomedb/src/sqlconsole.hg:
* tools/extra_defs_gen/generate_defs_gnomedb.cc:
* tools/m4/Makefile.am:
* libgnomedb/libgnomedbmm-3.0.pc.in: Renamed to 
* libgnomedb/libgnomedbmm-4.0.pc.in.
Started to depend on libgnomedb-4.0 instead of libgnomedb-3.0, 
creating a parallel-installable libgnomedbmm-4.0 library.
This does not build yet.

This is svn trunk, for libgnomedbmm-4.0. See also the libgnomedbmm-3.0 branch.

Added:
   libgnomedbmm/trunk/libgnomedb/libgnomedbmm-4.0.pc.in   (props changed)
      - copied unchanged from r1936, /libgnomedbmm/trunk/libgnomedb/libgnomedbmm-3.0.pc.in
Removed:
   libgnomedbmm/trunk/libgnomedb/libgnomedbmm-3.0.pc.in
Modified:
   libgnomedbmm/trunk/ChangeLog
   libgnomedbmm/trunk/Makefile_web.am_fragment
   libgnomedbmm/trunk/configure.in
   libgnomedbmm/trunk/docs/reference/Makefile.am
   libgnomedbmm/trunk/examples/Makefile.am_fragment
   libgnomedbmm/trunk/libgnomedb/Makefile.am
   libgnomedbmm/trunk/libgnomedb/libgnomedbmm/Makefile.am
   libgnomedbmm/trunk/libgnomedb/libgnomedbmm/private/Makefile.am
   libgnomedbmm/trunk/libgnomedb/src/datacellrendererboolean.hg
   libgnomedbmm/trunk/libgnomedb/src/datacellrendererinfo.hg
   libgnomedbmm/trunk/libgnomedb/src/datacellrenderertextual.hg
   libgnomedbmm/trunk/libgnomedb/src/datasourceselector.hg
   libgnomedbmm/trunk/libgnomedb/src/sqlconsole.hg
   libgnomedbmm/trunk/tools/extra_defs_gen/generate_defs_gnomedb.cc
   libgnomedbmm/trunk/tools/m4/Makefile.am

Modified: libgnomedbmm/trunk/Makefile_web.am_fragment
==============================================================================
--- libgnomedbmm/trunk/Makefile_web.am_fragment	(original)
+++ libgnomedbmm/trunk/Makefile_web.am_fragment	Sat Jan  3 20:19:32 2009
@@ -1,5 +1,5 @@
 web_host = www.gtkmm.org
-web_path = /home/murrayc/gtkmm.org/docs/libgnomedbmm-3.0/
+web_path = /home/murrayc/gtkmm.org/docs/libgnomedbmm-4.0/
 web_path_docs = $(web_path)docs/
 
 #--delete and --delete-after are causing

Modified: libgnomedbmm/trunk/configure.in
==============================================================================
--- libgnomedbmm/trunk/configure.in	(original)
+++ libgnomedbmm/trunk/configure.in	Sat Jan  3 20:19:32 2009
@@ -83,9 +83,9 @@
 #  Dependancy checks
 #########################################################################
 
-#Note that we depend on all of libgnomedb-3.0, libgnomedb-graph-3.0, and libgnomedb-extra-3.0, all from libgnomedb.
+#Note that we depend on all of libgnomedb-4.0, libgnomedb-graph-4.0, and libgnomedb-extra-4.0, all from libgnomedb.
 #TODO: In future we should instead have separate libgnomedb-graphmm and libgnomedb-extramm shared libraries, in this same module.
-PKG_CHECK_MODULES(LIBGNOMEDBMM, gtkmm-2.4 >= 2.6.0 libgdamm-3.0 >= 2.9.4 libgnomedb-3.0 >= 3.0.0 libgnomedb-graph-3.0 >= 3.0.0 libgnomedb-extra-3.0 >= 3.0.0)
+PKG_CHECK_MODULES(LIBGNOMEDBMM, gtkmm-2.4 >= 2.6.0 libgdamm-4.0 >= 2.9.4 libgnomedb-4.0 >= 3.99.8 libgnomedb-graph-4.0 >= 3.99.8 libgnomedb-extra-4.0 >= 3.99.8)
 AC_SUBST(LIBGNOMEDBMM_CFLAGS)
 AC_SUBST(LIBGNOMEDBMM_LIBS)
 
@@ -131,7 +131,7 @@
   Makefile
 
   libgnomedb/Makefile
-  libgnomedb/libgnomedbmm-3.0.pc
+  libgnomedb/libgnomedbmm-4.0.pc
   libgnomedb/src/Makefile
   libgnomedb/libgnomedbmm/Makefile
   libgnomedb/libgnomedbmm/private/Makefile

Modified: libgnomedbmm/trunk/docs/reference/Makefile.am
==============================================================================
--- libgnomedbmm/trunk/docs/reference/Makefile.am	(original)
+++ libgnomedbmm/trunk/docs/reference/Makefile.am	Sat Jan  3 20:19:32 2009
@@ -21,7 +21,7 @@
 	-rm -rf html
 	doxygen $(doxygen_configfile) \
 	2> doxygen-warnings.txt | tee doxygen-output.txt && cat doxygen-warnings.txt
-	cd html && ./installdox -l gtkmm_doxygen_tags http://www.gtkmm.org/docs/gtkmm-2.4/docs/reference/html -l glibmm_doxygen_tags http://www.gtkmm.org/docs/glibmm-2.4/docs/reference/html -l libgdamm_doxygen_tags http://www.gtkmm.org/docs/libgdamm-3.0/docs/reference/libgdamm/html \
+	cd html && ./installdox -l gtkmm_doxygen_tags http://www.gtkmm.org/docs/gtkmm-2.4/docs/reference/html -l glibmm_doxygen_tags http://www.gtkmm.org/docs/glibmm-2.4/docs/reference/html -l libgdamm_doxygen_tags http://www.gtkmm.org/docs/libgdamm-4.0/docs/reference/libgdamm/html \
 	2>> doxygen-warnings.txt | tee -a doxygen-output.txt && cd ..
 	$(beautify_docs) html 2>> doxygen-warnings.txt | tee -a doxygen-output.txt
 
@@ -33,7 +33,7 @@
 
 referencetopdir = $(libgnomedbmm_docdir)/reference
 referencedir = $(referencetopdir)/html
-devhelpdir = $(datadir)/devhelp/books/libgnomedbmm-3.0
+devhelpdir = $(datadir)/devhelp/books/libgnomedbmm-4.0
 
 install-reference: html/index.html
 	@$(NORMAL_INSTALL)

Modified: libgnomedbmm/trunk/examples/Makefile.am_fragment
==============================================================================
--- libgnomedbmm/trunk/examples/Makefile.am_fragment	(original)
+++ libgnomedbmm/trunk/examples/Makefile.am_fragment	Sat Jan  3 20:19:32 2009
@@ -1,4 +1,4 @@
-local_libgnomedbmm_lib = $(top_builddir)/libgnomedb/libgnomedbmm/libgnomedbmm-3.0.la
+local_libgnomedbmm_lib = $(top_builddir)/libgnomedb/libgnomedbmm/libgnomedbmm-4.0.la
 
 LIBS  = $(local_libgnomedbmm_lib) $(LIBGNOMEDBMM_LIBS)
 

Modified: libgnomedbmm/trunk/libgnomedb/Makefile.am
==============================================================================
--- libgnomedbmm/trunk/libgnomedb/Makefile.am	(original)
+++ libgnomedbmm/trunk/libgnomedb/Makefile.am	Sat Jan  3 20:19:32 2009
@@ -2,14 +2,14 @@
 
 EXTRA_DIST	= README					\
 		  libgnomedbmmconfig.h.in libgnomedbmm.h	\
-		  libgnomedbmm-3.0.pc.in
+		  libgnomedbmm-4.0.pc.in
 
-libgnomedbmm_includedir		= $(includedir)/libgnomedbmm-3.0
+libgnomedbmm_includedir		= $(includedir)/libgnomedbmm-4.0
 libgnomedbmm_include_HEADERS	= libgnomedbmm.h
 
-libgnomedbmm_configdir		= $(libdir)/libgnomedbmm-3.0/include
+libgnomedbmm_configdir		= $(libdir)/libgnomedbmm-4.0/include
 libgnomedbmm_config_DATA	= libgnomedbmmconfig.h
 
 pkgconfigdir		= $(libdir)/pkgconfig
-pkgconfig_DATA		= libgnomedbmm-3.0.pc
+pkgconfig_DATA		= libgnomedbmm-4.0.pc
 

Modified: libgnomedbmm/trunk/libgnomedb/libgnomedbmm/Makefile.am
==============================================================================
--- libgnomedbmm/trunk/libgnomedb/libgnomedbmm/Makefile.am	(original)
+++ libgnomedbmm/trunk/libgnomedb/libgnomedbmm/Makefile.am	Sat Jan  3 20:19:32 2009
@@ -4,7 +4,7 @@
 SUBDIRS			= private
 
 sublib_name		= libgnomedbmm
-sublib_libname = libgnomedbmm-3.0
+sublib_libname = libgnomedbmm-4.0
 sublib_libversion = $(LIBGNOMEDBMM_SO_VERSION)
 sublib_namespace	= Db
 sublib_cflags		= $(LIBGNOMEDBMM_CFLAGS)
@@ -16,8 +16,8 @@
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
 
-lib_LTLIBRARIES			= libgnomedbmm-3.0.la
-libgnomedbmm_3_0_la_SOURCES	= $(files_all_cc)
-libgnomedbmm_3_0_la_LDFLAGS	= $(common_ldflags)
-libgnomedbmm_3_0_la_LIBADD	= $(LIBGNOMEDBMM_LIBS)
+lib_LTLIBRARIES			= libgnomedbmm-4.0.la
+libgnomedbmm_4_0_la_SOURCES	= $(files_all_cc)
+libgnomedbmm_4_0_la_LDFLAGS	= $(common_ldflags)
+libgnomedbmm_4_0_la_LIBADD	= $(LIBGNOMEDBMM_LIBS)
 

Modified: libgnomedbmm/trunk/libgnomedb/libgnomedbmm/private/Makefile.am
==============================================================================
--- libgnomedbmm/trunk/libgnomedb/libgnomedbmm/private/Makefile.am	(original)
+++ libgnomedbmm/trunk/libgnomedb/libgnomedbmm/private/Makefile.am	Sat Jan  3 20:19:32 2009
@@ -4,7 +4,7 @@
 include $(srcdir)/../../src/Makefile_list_of_hg.am_fragment
 files_built_h		= $(files_hg:.hg=_p.h)
 
-private_includedir	= $(includedir)/libgnomedbmm-3.0/libgnomedbmm/private
+private_includedir	= $(includedir)/libgnomedbmm-4.0/libgnomedbmm/private
 private_include_HEADERS	= $(files_built_h)
 
 maintainer-clean-local:

Modified: libgnomedbmm/trunk/libgnomedb/src/datacellrendererboolean.hg
==============================================================================
--- libgnomedbmm/trunk/libgnomedb/src/datacellrendererboolean.hg	(original)
+++ libgnomedbmm/trunk/libgnomedb/src/datacellrendererboolean.hg	Sat Jan  3 20:19:32 2009
@@ -54,6 +54,7 @@
   // Fully-qualify the Value here so that the generated code finds it
   #m4 _CONVERSION(`const GValue*', `const Gnome::Gda::Value&', `Gnome::Gda::Value($3)')
   #m4 _CONVERSION(`const Gnome::Gda::Value&', `const GValue*', `($3).gobj()')
+  #m4 _CONVERSION(`const gchar*', `const Glib::ustring&', `($3)')
   _WRAP_SIGNAL(void changed(const Glib::ustring& path, const Gnome::Gda::Value& new_value), "changed")
 };
 

Modified: libgnomedbmm/trunk/libgnomedb/src/datacellrendererinfo.hg
==============================================================================
--- libgnomedbmm/trunk/libgnomedb/src/datacellrendererinfo.hg	(original)
+++ libgnomedbmm/trunk/libgnomedb/src/datacellrendererinfo.hg	Sat Jan  3 20:19:32 2009
@@ -51,6 +51,7 @@
   // Need to fully-qualiy Gnome::Gda::ValueAttribute so that the generated code finds it
   #m4 _CONVERSION(`GdaValueAttribute',`Gnome::Gda::ValueAttribute',($2)($3))
   #m4 _CONVERSION(`Gnome::Gda::ValueAttribute',`GdaValueAttribute',($2)($3))
+  #m4 _CONVERSION(`const gchar*', `const Glib::ustring&', `($3)')
   _WRAP_SIGNAL(void status_changed(const Glib::ustring& path, Gnome::Gda::ValueAttribute requested_action), "status_changed")
 };
 

Modified: libgnomedbmm/trunk/libgnomedb/src/datacellrenderertextual.hg
==============================================================================
--- libgnomedbmm/trunk/libgnomedb/src/datacellrenderertextual.hg	(original)
+++ libgnomedbmm/trunk/libgnomedb/src/datacellrenderertextual.hg	Sat Jan  3 20:19:32 2009
@@ -51,6 +51,7 @@
   // Fully-qualify the Value here so that the generated code finds it
   #m4 _CONVERSION(`const GValue*', `const Gnome::Gda::Value&', `Gnome::Gda::Value($3)')
   #m4 _CONVERSION(`const Gnome::Gda::Value&', `const GValue*', `($3).gobj()')
+  #m4 _CONVERSION(`const gchar*', `const Glib::ustring&', `($3)')
   _WRAP_SIGNAL(void changed(const Glib::ustring& path, const Gnome::Gda::Value& new_value), "changed")
 };
 

Modified: libgnomedbmm/trunk/libgnomedb/src/datasourceselector.hg
==============================================================================
--- libgnomedbmm/trunk/libgnomedb/src/datasourceselector.hg	(original)
+++ libgnomedbmm/trunk/libgnomedb/src/datasourceselector.hg	Sat Jan  3 20:19:32 2009
@@ -44,7 +44,7 @@
     _WRAP_METHOD(Glib::ustring get_dsn() const, gnome_db_data_source_selector_get_dsn)
     _WRAP_METHOD(void set_dsn(const Glib::ustring& dsn), gnome_db_data_source_selector_set_dsn)
 
-    _WRAP_PROPERTY("source-name", Glib::ustring)
+    //Write-only and construct, so not wrapped: _WRAP_PROPERTY("source-name", Glib::ustring)
 };
 
 } // namespace Db

Modified: libgnomedbmm/trunk/libgnomedb/src/sqlconsole.hg
==============================================================================
--- libgnomedbmm/trunk/libgnomedb/src/sqlconsole.hg	(original)
+++ libgnomedbmm/trunk/libgnomedb/src/sqlconsole.hg	Sat Jan  3 20:19:32 2009
@@ -45,8 +45,9 @@
   _WRAP_METHOD(void clear_history(), gnome_db_sql_console_clear_history)
 
   _WRAP_PROPERTY("dict", Glib::RefPtr<Gda::Dict>)
-  _WRAP_PROPERTY("message", Glib::ustring)
+  //Write-only and construct, so not wrapped: _WRAP_PROPERTY("message", Glib::ustring)
   
+  #m4 _CONVERSION(`const gchar*', `const Glib::ustring&', `($3)')
   _WRAP_SIGNAL(Glib::ustring sql_entered(const Glib::ustring& sql), "sql_entered");
 };
 

Modified: libgnomedbmm/trunk/tools/extra_defs_gen/generate_defs_gnomedb.cc
==============================================================================
--- libgnomedbmm/trunk/tools/extra_defs_gen/generate_defs_gnomedb.cc	(original)
+++ libgnomedbmm/trunk/tools/extra_defs_gen/generate_defs_gnomedb.cc	Sat Jan  3 20:19:32 2009
@@ -24,13 +24,11 @@
 
 int main (int argc, char *argv[])
 {
-    gnome_db_init("generate_extra_defs", "0.1", argc, argv);
+    gnome_db_init();
 
     std::cout << get_defs(GNOME_DB_TYPE_PROVIDER_SELECTOR)
-              << get_defs(GNOME_DB_TYPE_DATA_SOURCE_SELECTOR)
 	      << get_defs(GNOME_DB_TYPE_LOGIN)
 	      << get_defs(GNOME_DB_TYPE_LOGIN_DIALOG)
-	      << get_defs(GNOME_DB_TYPE_DSN_SPEC)
 
 	      << get_defs(GNOME_DB_TYPE_DSN_EDITOR)
 
@@ -52,7 +50,6 @@
 	      << get_defs(GNOME_DB_TYPE_DATA_WIDGET_INFO)
 	      << get_defs(GNOME_DB_TYPE_DATA_STORE)
 	      << get_defs(GNOME_DB_TYPE_SELECTOR)
-	      << get_defs(GNOME_DB_TYPE_DBMS_UPDATE_VIEWER)
 	      << get_defs(GNOME_DB_TYPE_SQL_CONSOLE)
 	      << get_defs(GNOME_DB_TYPE_EDITOR)
 	      << get_defs(GNOME_DB_TYPE_REPORT_EDITOR)
@@ -83,11 +80,7 @@
               //gnomedb-graph stuff:
 	      << get_defs(GNOME_DB_TYPE_CANVAS)
 	      << get_defs(GNOME_DB_TYPE_CANVAS_DB_RELATIONS)
-	      << get_defs(GNOME_DB_TYPE_CANVAS_QUERY_STRUCT)
 	      << get_defs(GNOME_DB_TYPE_CANVAS_ITEM)
-	      << get_defs(GNOME_DB_TYPE_CANVAS_ENTITY)
-	      << get_defs(GNOME_DB_TYPE_CANVAS_JOIN)
-	      << get_defs(GNOME_DB_TYPE_CANVAS_FIELD)
 	      << get_defs(GNOME_DB_TYPE_CANVAS_TIP)
 	      << get_defs(GNOME_DB_TYPE_CANVAS_CURSOR)
 	      << get_defs(GNOME_DB_TYPE_CANVAS_TEXT)

Modified: libgnomedbmm/trunk/tools/m4/Makefile.am
==============================================================================
--- libgnomedbmm/trunk/tools/m4/Makefile.am	(original)
+++ libgnomedbmm/trunk/tools/m4/Makefile.am	Sat Jan  3 20:19:32 2009
@@ -5,5 +5,5 @@
 
 # Install the .m4, files:
 
-tools_m4_includedir = $(libdir)/libgnomedbmm-3.0/proc/m4
+tools_m4_includedir = $(libdir)/libgnomedbmm-4.0/proc/m4
 tools_m4_include_HEADERS = $(files_tools_m4)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]