libgda r3306 - in trunk: . doc/C/tmpl libgda/binreloc tools

[vivien svn gnome org]

Author: vivien
Date: Sun Feb  1 17:46:34 2009
New Revision: 3306
URL: http://svn.gnome.org/viewvc/libgda?rev=3306&view=rev

Log:
2009-02-01  Vivien Malerba <malerba gnome-db org>

        * configure.in:
        * libgda/binreloc/gda-binreloc.c: fix for MacOS X
        * tools/gda-sql.c: ignore unknown arguments on the command line


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/doc/C/tmpl/gda-meta-struct.sgml
   trunk/doc/C/tmpl/gda-set.sgml
   trunk/doc/C/tmpl/gda-sql-statement.sgml
   trunk/doc/C/tmpl/gda-vconnection-hub.sgml
   trunk/libgda/binreloc/gda-binreloc.c
   trunk/tools/gda-sql.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Feb  1 17:46:34 2009
@@ -181,6 +181,7 @@
     LIBTOOL_EXPORT_OPTIONS=$EXPORT_SYM_REGEX
     LIBTOOL_PROV_EXPORT_OPTIONS=$EXPORT_PROV_SYM_REGEX
     AC_DEFINE(HAVE_CARBON)
+    LIBGDA_LIBS="$LIBGDA_LIBS -framework Carbon"
     dnl SO_SUFFIX=dylib
   ;;
 *)

Modified: trunk/doc/C/tmpl/gda-meta-struct.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-meta-struct.sgml	(original)
+++ trunk/doc/C/tmpl/gda-meta-struct.sgml	Sun Feb  1 17:46:34 2009
@@ -243,7 +243,7 @@
 
 </para>
 
- holder: 
+ column: 
 @attribute: 
 @value: 
 

Modified: trunk/doc/C/tmpl/gda-set.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-set.sgml	(original)
+++ trunk/doc/C/tmpl/gda-set.sgml	Sun Feb  1 17:46:34 2009
@@ -225,7 +225,7 @@
 </para>
 
 @set: 
- param: 
+ holder: 
 @Returns: 
 
 
@@ -257,7 +257,7 @@
 </para>
 
 @set: 
- param: 
+ holder: 
 @Returns: 
 
 
@@ -275,7 +275,7 @@
 </para>
 
 @set: 
- param: 
+ holder: 
 @Returns: 
 
 

Modified: trunk/doc/C/tmpl/gda-sql-statement.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-sql-statement.sgml	(original)
+++ trunk/doc/C/tmpl/gda-sql-statement.sgml	Sun Feb  1 17:46:34 2009
@@ -970,7 +970,7 @@
 
 </para>
 
- scase: 
+ sc: 
 
 
 <!-- ##### FUNCTION gda_sql_case_copy ##### -->
@@ -978,7 +978,7 @@
 
 </para>
 
- scase: 
+ sc: 
 @Returns: 
 
 
@@ -987,7 +987,7 @@
 
 </para>
 
- scase: 
+ sc: 
 @Returns: 
 
 

Modified: trunk/doc/C/tmpl/gda-vconnection-hub.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-vconnection-hub.sgml	(original)
+++ trunk/doc/C/tmpl/gda-vconnection-hub.sgml	Sun Feb  1 17:46:34 2009
@@ -72,7 +72,7 @@
 
 </para>
 
- cnc: 
+ hub: 
 @ns: 
 @Returns: 
 

Modified: trunk/libgda/binreloc/gda-binreloc.c
==============================================================================
--- trunk/libgda/binreloc/gda-binreloc.c	(original)
+++ trunk/libgda/binreloc/gda-binreloc.c	Sun Feb  1 17:46:34 2009
@@ -199,9 +199,14 @@
 		if ((GetCurrentProcess (&myProcess) == noErr) &&
 		    (GetProcessBundleLocation (&myProcess, &bundleLocation) == noErr) &&
 		    (FSRefMakePath (&bundleLocation, bundlePath, MAXLEN) == noErr)) {
-			prefix = g_path_get_dirname ((const char*) bundlePath);
-			if (g_str_has_suffix (prefix, "bin"))
-				prefix [strlen (prefix) - 3] = 0;
+			if (g_str_has_suffix ((const gchar*) bundlePath, ".app"))
+				prefix = g_strdup_printf ("%s/Contents/Resources", (const gchar*) bundlePath);
+			else {
+				prefix = g_path_get_dirname ((const char*) bundlePath);
+				if (g_str_has_suffix (prefix, "bin"))
+					prefix [strlen (prefix) - 3] = 0;
+			}
+			/*g_print ("BUNDLE=%s, prefix=%s\n", bundlePath, prefix);*/
 		}
 		else
 			g_warning ("Could not get PREFIX (using Mac OS X Carbon)");

Modified: trunk/tools/gda-sql.c
==============================================================================
--- trunk/tools/gda-sql.c	(original)
+++ trunk/tools/gda-sql.c	Sun Feb  1 17:46:34 2009
@@ -162,6 +162,7 @@
 
 	context = g_option_context_new (_("[DSN|connection string]..."));        
 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+	g_option_context_set_ignore_unknown_options (context, TRUE);
         if (!g_option_context_parse (context, &argc, &argv, &error)) {
                 g_fprintf  (stderr, "Can't parse arguments: %s\n", error->message);
 		return EXIT_FAILURE;
@@ -249,6 +250,9 @@
 		GdaDsnInfo *info = NULL;
 		gchar *str;
 
+		if (*argv[i] == '-')
+			continue;
+
                 info = gda_config_get_dsn_info (argv[i]);
 		if (info)
 			str = g_strdup (info->name);