anjuta r4347 - in branches/gnome-2-24: . plugins/build-basic-autotools plugins/debug-manager

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Fri Oct 17 20:33:04 2008
New Revision: 4347
URL: http://svn.gnome.org/viewvc/anjuta?rev=4347&view=rev

Log:
	* plugins/debug-manager/start.c,
	plugins/build-basic-autotools/plugin.c:
	Debugger was unable to start if build and source directory are
	different


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/plugins/build-basic-autotools/plugin.c
   branches/gnome-2-24/plugins/debug-manager/start.c

Modified: branches/gnome-2-24/plugins/build-basic-autotools/plugin.c
==============================================================================
--- branches/gnome-2-24/plugins/build-basic-autotools/plugin.c	(original)
+++ branches/gnome-2-24/plugins/build-basic-autotools/plugin.c	Fri Oct 17 20:33:04 2008
@@ -1364,10 +1364,8 @@
 	gchar *target;
 	BuildProgram *prog;
 	
-		
-	src_dir = g_path_get_dirname (filename);
-	build_dir = build_dir_from_source (plugin, src_dir);
-	g_free (src_dir);
+	/* the file of this command is a target, no need to use source directory */		
+	build_dir = g_path_get_dirname (filename);
 	target = g_path_get_basename (filename);
 
 	prog = build_program_new_with_command (build_dir,

Modified: branches/gnome-2-24/plugins/debug-manager/start.c
==============================================================================
--- branches/gnome-2-24/plugins/debug-manager/start.c	(original)
+++ branches/gnome-2-24/plugins/debug-manager/start.c	Fri Oct 17 20:33:04 2008
@@ -908,9 +908,9 @@
 		/* Up to date, start debugger */
 		load_target (this, this->build_target);
 	}
-	else if (err->code == IANJUTA_BUILDER_FAILED)
+	else
 	{
-		/* Target is not up to date */
+		/* Target is not up to date or an error happens with make -q */
 		this->build_handle = ianjuta_builder_build (IANJUTA_BUILDER (builder), this->build_target, on_build_finished, this, NULL);
 		return;
 	}