gnomemm r1529 - in libgdamm/branches/libgdamm-4-0: . libgda tools/extra_defs_gen

[jhs svn gnome org]

Author: jhs
Date: Sun May 25 20:20:31 2008
New Revision: 1529
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1529&view=rev

Log:
2008-05-25  Johannes Schmid  <johannes schmid openismus com>

	* configure.in:
	* libgda/libgdamm-3.0.pc.in (removed):
	* libgda/libgdamm-4.0.pc.in:
	* tools/extra_defs_gen/generate_defs_gda.cc:
	
	Update things to use libgda-4.0 instead of 3.0
	
	* ChangeLog:
	* ChangeLog-pre-4.0:
	Cleared old ChangeLog

Added:
   libgdamm/branches/libgdamm-4-0/ChangeLog-pre-4.0
      - copied unchanged from r1528, /libgdamm/branches/libgdamm-4-0/ChangeLog
   libgdamm/branches/libgdamm-4-0/libgda/libgdamm-4.0.pc.in
      - copied, changed from r1528, /libgdamm/branches/libgdamm-4-0/libgda/libgdamm-3.0.pc.in
Removed:
   libgdamm/branches/libgdamm-4-0/libgda/libgdamm-3.0.pc.in
Modified:
   libgdamm/branches/libgdamm-4-0/configure.in
   libgdamm/branches/libgdamm-4-0/tools/extra_defs_gen/generate_defs_gda.cc

Modified: libgdamm/branches/libgdamm-4-0/configure.in
==============================================================================
--- libgdamm/branches/libgdamm-4-0/configure.in	(original)
+++ libgdamm/branches/libgdamm-4-0/configure.in	Sun May 25 20:20:31 2008
@@ -16,7 +16,7 @@
 #########################################################################
 #We use pushdef here because we can't use shell variables before AC_INIT, but we want to use a variable with AC_INIT:
 pushdef([LIBGDAMM_MAJOR_VERSION],     [3])
-pushdef([LIBGDAMM_MINOR_VERSION],     [0])
+pushdef([LIBGDAMM_MINOR_VERSION],     [99])
 pushdef([LIBGDAMM_MICRO_VERSION],     [0])
 pushdef([LIBGDAMM_EXTRA_VERSION],     [])
 pushdef([LIBGDAMM_VERSION], LIBGDAMM_MAJOR_VERSION.LIBGDAMM_MINOR_VERSION.LIBGDAMM_MICRO_VERSION[]LIBGDAMM_EXTRA_VERSION)
@@ -112,7 +112,7 @@
 #########################################################################
 #  Dependancy checks
 #########################################################################
-PKG_CHECK_MODULES(LIBGDAMM, glibmm-2.4 >= 2.12.8 libgda-3.0 >= 3.0.0)
+PKG_CHECK_MODULES(LIBGDAMM, glibmm-2.4 >= 2.12.8 libgda-4.0 >= 3.99.3)
 AC_SUBST(LIBGDAMM_CFLAGS)
 AC_SUBST(LIBGDAMM_LIBS)
 
@@ -167,7 +167,7 @@
   Makefile
 
   libgda/Makefile
-  libgda/libgdamm-3.0.pc
+  libgda/libgdamm-4.0.pc
   libgda/src/Makefile
   libgda/libgdamm/Makefile
   libgda/libgdamm/private/Makefile

Copied: libgdamm/branches/libgdamm-4-0/libgda/libgdamm-4.0.pc.in (from r1528, /libgdamm/branches/libgdamm-4-0/libgda/libgdamm-3.0.pc.in)
==============================================================================
--- /libgdamm/branches/libgdamm-4-0/libgda/libgdamm-3.0.pc.in	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/libgdamm-4.0.pc.in	Sun May 25 20:20:31 2008
@@ -5,7 +5,7 @@
 
 Name: libgdamm
 Description: C++ wrapper for libgda
-Requires: glibmm-2.4 libgda-3.0
+Requires: glibmm-2.4 libgda-4.0
 Version: @VERSION@
-Libs: -L${libdir} -lgdamm-3.0
-Cflags: -I${includedir}/libgdamm-3.0 -I${libdir}/libgdamm-3.0/include
+Libs: -L${libdir} -lgdamm-4.0
+Cflags: -I${includedir}/libgdamm-4.0 -I${libdir}/libgdamm-4.0/include

Modified: libgdamm/branches/libgdamm-4-0/tools/extra_defs_gen/generate_defs_gda.cc
==============================================================================
--- libgdamm/branches/libgdamm-4-0/tools/extra_defs_gen/generate_defs_gda.cc	(original)
+++ libgdamm/branches/libgdamm-4-0/tools/extra_defs_gen/generate_defs_gda.cc	Sun May 25 20:20:31 2008
@@ -25,47 +25,33 @@
 
 int main (int argc, char *argv[])
 {
-    gda_init("generate_extra_defs", "0.1", argc, argv);
+    gda_init();
 
-    std::cout << get_defs(GDA_TYPE_CLIENT)
-                 << get_defs(GDA_TYPE_COLUMN)
-                 << get_defs(GDA_TYPE_COLUMN_INDEX)
-                 << get_defs(GDA_TYPE_CONNECTION)
-                 << get_defs(GDA_TYPE_CONNECTION_EVENT)
-                 << get_defs(GDA_TYPE_DATA_MODEL_ARRAY)
-		 << get_defs(GDA_TYPE_DATA_MODEL_ROW)
-		 << get_defs(GDA_TYPE_DATA_MODEL_ITER)
-//                 << get_defs(GDA_TYPE_DATA_MODEL_INDEX)
-                 << get_defs(GDA_TYPE_DATA_MODEL)
-		 << get_defs(GDA_TYPE_DATA_PROXY)
-                 << get_defs(GDA_TYPE_DICT)
-                 << get_defs(GDA_TYPE_DICT_TYPE)
-                 << get_defs(GDA_TYPE_DICT_AGGREGATE)
-                 << get_defs(GDA_TYPE_DICT_CONSTRAINT)
-                 << get_defs(GDA_TYPE_DICT_DATABASE)
-                 << get_defs(GDA_TYPE_DICT_FIELD)
-//                 << get_defs(GDA_TYPE_DATA_MODEL_COLUMN_ATTRIBUTES)
-//                 << get_defs(GDA_TYPE_EXPORT)
-                 << get_defs(GDA_TYPE_GRAPH)
-                 << get_defs(GDA_TYPE_OBJECT)
-                 << get_defs(GDA_TYPE_PARAMETER)
-                 << get_defs(GDA_TYPE_PARAMETER_LIST)
-//                 << get_defs(GDA_TYPE_RECORDSET)
-                 << get_defs(GDA_TYPE_QUERY)
-                 << get_defs(GDA_TYPE_QUERY_OBJECT)
-                 << get_defs(GDA_TYPE_QUERY_FIELD)
-                 << get_defs(GDA_TYPE_QUERY_TARGET)
-                 << get_defs(GDA_TYPE_QUERY_CONDITION)
-                 << get_defs(GDA_TYPE_QUERY_JOIN)
-                 << get_defs(GDA_TYPE_QUERY_FIELD_AGG)
-                 << get_defs(GDA_TYPE_QUERY_FIELD_ALL)
-                 << get_defs(GDA_TYPE_QUERY_FIELD_FIELD)
-                 << get_defs(GDA_TYPE_QUERY_FIELD_FUNC)
-                 << get_defs(GDA_TYPE_QUERY_FIELD_VALUE);
-//                 << get_defs(GDA_TYPE_SERVER_CONNECTION)
-//                 << get_defs(GDA_TYPE_SERVER_PROVIDER)
-//                 << get_defs(GDA_TYPE_SERVER_RECORDSET_MODEL)
-//                 << get_defs(GDA_TYPE_SERVER_RECORDSET)
-//                 << get_defs(GDA_TYPE_SERVER)
+    std::cout << get_defs (GDA_TYPE_COLUMN)
+    << get_defs (GDA_TYPE_CONNECTION_EVENT) 
+    << get_defs (GDA_TYPE_CONNECTION) 
+    << get_defs (GDA_TYPE_DATA_COMPARATOR) 
+    << get_defs (GDA_TYPE_DATA_MODEL_ARRAY) 
+    << get_defs (GDA_TYPE_DATA_MODEL_BDB) 
+    << get_defs (GDA_TYPE_DATA_MODEL_QUERY) 
+    << get_defs (GDA_TYPE_DATA_MODEL) 
+    << get_defs (GDA_TYPE_DATA_MODEL_ITER) 
+    << get_defs (GDA_TYPE_DATA_MODEL_IMPORT) 
+    << get_defs (GDA_TYPE_DATA_MODEL_DIR) 
+    << get_defs (GDA_TYPE_DATA_ACCESS_WRAPPER) 
+    << get_defs (GDA_TYPE_DATA_PROXY) 
+    << get_defs (GDA_TYPE_ROW) 
+    << get_defs (GDA_TYPE_SERVER_OPERATION) 
+    << get_defs (GDA_TYPE_SERVER_PROVIDER)
+    << get_defs (GDA_TYPE_THREADER)
+    << get_defs (GDA_TYPE_TRANSACTION_STATUS)
+    << get_defs (GDA_TYPE_DATA_HANDLER)
+    << get_defs (GDA_TYPE_META_STORE)
+    << get_defs (GDA_TYPE_META_STRUCT)
+    << get_defs (GDA_TYPE_STATEMENT)
+    << get_defs (GDA_TYPE_BATCH)
+    << get_defs (GDA_TYPE_HOLDER)
+    << get_defs (GDA_TYPE_SET)    
+    << std::endl;
     return 0;
 }